*** empty log message ***

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
index 4730763c14a87ca48b1c1c69414c7d7a683c04eb..edd43e33126f898837e80ef1ae28a00c5e4a26c5 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
@@ -11,10 +11,10 @@
 HistogramDialogComboBox::HistogramDialogComboBox(wxWindow* parent)
 : wxPanel(parent)
 {
-       _img                    = NULL; 
+       _img                    = NULL;
        _bitmapcombo            = NULL;
        _slidercolor            = NULL;
-       _sliderwindowlevel      = NULL; 
+       _sliderwindowlevel      = NULL;
        colorBar_Bitmap         = NULL;
        _bitmapsizer            = NULL;
 
@@ -22,16 +22,16 @@ HistogramDialogComboBox::HistogramDialogComboBox(wxWindow* parent)
        _img                    = NULL;
        _currentitem            = -1;
        _maxgreyvalue           = 0;
-printf("EED HistogramDialogComboBox\n");       
+printf("EED HistogramDialogComboBox\n");
 #ifdef LINUX
        std::string currentpath = crea::System::GetExecutablePath();
-       currentpath.append("/data/");
+       currentpath.append("../share/creaMaracasVisu/data/");
        crea::System::createDirectory(currentpath.c_str());
 #endif
 }
 
 HistogramDialogComboBox::~HistogramDialogComboBox()
-{      
+{
 }
 
 void HistogramDialogComboBox::SetColors(std::vector<double> greyvect, std::vector<double> redvect, std::vector<double> greenvect, std::vector<double> bluevect)
@@ -39,7 +39,7 @@ void HistogramDialogComboBox::SetColors(std::vector<double> greyvect, std::vecto
        _greyvect       = greyvect;
        _redvect        = redvect;
        _greenvect      = greenvect;
-       _bluevect       = bluevect;     
+       _bluevect       = bluevect;
 }
 
 wxSizer* HistogramDialogComboBox::getBitmapCombo()
@@ -51,9 +51,9 @@ wxSizer* HistogramDialogComboBox::getBitmapCombo()
        _bitmapcombo = getBitmapComboElements();
 
        wxBitmap bitmap1(Edit_xpm);
-       wxBitmapButton* edit = new wxBitmapButton(this, -1, bitmap1,wxDefaultPosition,wxSize(30,30));   
-       Connect(edit->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&HistogramDialogComboBox::OnEditBitmapCombo);                       
-       
+       wxBitmapButton* edit = new wxBitmapButton(this, -1, bitmap1,wxDefaultPosition,wxSize(30,30));
+       Connect(edit->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&HistogramDialogComboBox::OnEditBitmapCombo);
+
        comboeditsizer->Add(_bitmapcombo,wxSizerFlags().Center().FixedMinSize());
        comboeditsizer->Add(edit,wxSizerFlags().Center());
 
@@ -84,7 +84,7 @@ double HistogramDialogComboBox::GetWindowLevel()
 {
    double val(0.0);
    if(_sliderwindowlevel != NULL)
-      val= _sliderwindowlevel->GetValue();     
+      val= _sliderwindowlevel->GetValue();
    return val; // JPR
 }
 
@@ -93,7 +93,7 @@ double HistogramDialogComboBox::GetColorLevel()
    double val(0.0);
    if(_slidercolor != NULL)
       val = _slidercolor->GetValue();
-   return val; // JPR   
+   return val; // JPR
 }
 
 void HistogramDialogComboBox::OnColorLevelChanged(wxCommandEvent& event)
@@ -137,14 +137,14 @@ void HistogramDialogComboBox::OnEditBitmapCombo(wxCommandEvent& event)
        {
                bool createaddandremovecontrols = true;
                HistogramDialog* dialog = new HistogramDialog(this,_T("Color Configuration"),createaddandremovecontrols);
-               dialog->initializeHistogram(_img);              
+               dialog->initializeHistogram(_img);
                dialog->setInfoPanExtraControls(_bitmapsitems);
 
                if(dialog->ShowModal()==wxID_OK)
                {
                        dialog->UpdateCurrentComboElement();
                        _bitmapsitems = dialog->getComboBoxItems();
-                       
+
                        //std::string currentpath = crea::System::GetDllAppPath("bbcreaMaracasVisu"); // JPR
                        std::string dllLastName;
                        std::string currentpath;
@@ -154,7 +154,7 @@ void HistogramDialogComboBox::OnEditBitmapCombo(wxCommandEvent& event)
                        #endif
                        #ifdef LINUX
                        currentpath = crea::System::GetExecutablePath();
-                       currentpath.append("/data/");
+                       currentpath.append("../share/creaMaracasVisu/data/");
                        #endif
                        currentpath.append(FILENAME);
 
@@ -168,20 +168,20 @@ void HistogramDialogComboBox::OnEditBitmapCombo(wxCommandEvent& event)
                        }
                        _bitmapsitems.clear();
                        _bitmapcombo = getBitmapComboElements();
-                       if(_bitmapsizer->Replace(tempbitmapcombo,_bitmapcombo)){                
-                               
+                       if(_bitmapsizer->Replace(tempbitmapcombo,_bitmapcombo)){
+
                                tempbitmapcombo->Destroy();
                        }
                        this->Layout();
-               }       
+               }
                dialog->Destroy();
        }
 }
 
 void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDialogComboBoxItem*>& itembitmaps,std::string filename)
 {
-       std::ofstream file;     
-       file.open(  (const char*) (filename.c_str()) ); 
+       std::ofstream file;
+       file.open(  (const char*) (filename.c_str()) );
        double gv=-1,red=-1,gr=-1,bl=-1;
        int in=-1;
 
@@ -200,8 +200,8 @@ void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDial
                                if(j==0){
                                        file << " <TransferenceFunction>"<< std::endl;
                                }
-                               file << "               <Transferencepoint>" << std::endl;                              
-                               file << "                       <greyValue>" << vecttransfer[j] << "</greyValue>" <<std::endl;                          
+                               file << "               <Transferencepoint>" << std::endl;
+                               file << "                       <greyValue>" << vecttransfer[j] << "</greyValue>" <<std::endl;
                                file << "                       <intensity>" << value[j] << "</intensity> "<<std::endl;
                                file << "               </Transferencepoint>" << std::endl;
                                if(j==vecttransfer.size()-1){
@@ -213,7 +213,7 @@ void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDial
                        std::vector<double> green = item->getGreenVector();
                        std::vector<double> blue = item->getBlueVector();
                        for(int j = 0; j < greyv.size();j++)
-                       {                                                       
+                       {
                                if(j==0){
                                        file << "       <Colors>" << std::endl;
                                }
@@ -222,14 +222,14 @@ void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDial
                                file << "                       <red>" << red[j] << "</red>" <<std::endl;
                                file << "                       <green>" << green[j] << "</green>" <<std::endl;
                                file << "                       <blue>" << blue[j] << "</blue>" <<std::endl;
-                               file << "               </greyValueRGBpoint>" << std::endl;     
+                               file << "               </greyValueRGBpoint>" << std::endl;
                                if(j==greyv.size()-1){
                                        file << "       </Colors>" << std::endl;
                                }
                        }
-                       file << "       </ComboBoxItem>"<< std::endl;           
+                       file << "       </ComboBoxItem>"<< std::endl;
                }
-               file << "</ComboBoxData>" << std::endl; 
+               file << "</ComboBoxData>" << std::endl;
        }
        file.close();
 }
@@ -238,18 +238,18 @@ wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements()
 {
        std::string currentpath = "";
 #ifdef WIN32
-       currentpath = crea::System::GetDllAppPath("bbcreaMaracasVisu"); 
+       currentpath = crea::System::GetDllAppPath("bbcreaMaracasVisu");
 #endif
 #ifdef LINUX
        currentpath = crea::System::GetExecutablePath();
-       currentpath.append("/data/");
+       currentpath.append("../share/CreaMaracasVisu/data/");
 #endif
        currentpath.append(FILENAME);
-       
+
        std::cout<<"current file name " <<currentpath<<std::endl;
 
        std::vector<HistogramDialogComboBoxItem*> bitmapsitems;
-       OnLoadComboBoxData(bitmapsitems, currentpath);  
+       OnLoadComboBoxData(bitmapsitems, currentpath);
        _bitmapsitems = bitmapsitems;
        wxString* choices;
        choices = new wxString[bitmapsitems.size()];
@@ -260,7 +260,7 @@ wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements()
        wxBitmapComboBox* bitmapcombo = new wxBitmapComboBox(this, -1, _T(""), wxDefaultPosition, wxDefaultSize, bitmapsitems.size(),choices);
        bitmapcombo->SetSize(65,30);
 
-       Connect(bitmapcombo->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction)&HistogramDialogComboBox::OnBitmapComboItemSelected);                     
+       Connect(bitmapcombo->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction)&HistogramDialogComboBox::OnBitmapComboItemSelected);
 
        for(int i = 0; i < bitmapsitems.size(); i++)
        {
@@ -270,7 +270,7 @@ wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements()
 }
 
 void HistogramDialogComboBox::OnBitmapComboItemSelected(wxCommandEvent& event)
-{              
+{
        if(_bitmapcombo!=NULL)
        {
                _currentitem = event.GetInt();
@@ -285,31 +285,31 @@ void HistogramDialogComboBox::OnBitmapComboItemSelected(wxCommandEvent& event)
                        _value  = currentconfig->getValueVector();
                        wxCommandEvent newevent(wxEVT_COMMAND_COMBOBOX_SELECTED,this->GetId());
             ProcessEvent(newevent);
-               }       
+               }
        }
 }
 
 void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComboBoxItem*>& itembitmaps, std::string filename)
-{      
+{
        std::vector<double> redvect, greenvect, bluevect;
        std::vector<double> greyvect, greyvecttransfunct, value;
 
-       redvect.clear(); 
-       greenvect.clear(); 
+       redvect.clear();
+       greenvect.clear();
        bluevect.clear();
-       greyvect.clear(); 
-       greyvecttransfunct.clear(); 
+       greyvect.clear();
+       greyvecttransfunct.clear();
        value.clear();
 
-       std::ifstream file;     
-       file.open(  (const char*) (filename.c_str()) ); 
+       std::ifstream file;
+       file.open(  (const char*) (filename.c_str()) );
        double gv=-1,gvtransfer=-1,intensity=-1,red=-1,gr=-1,bl=-1;
        int in=-1;
 
        //std::cout<<filename<<std::endl;
        itembitmaps.clear();
        if(file.is_open())
-       {       
+       {
                bool add = false;
                HistogramDialogComboBoxItem* item=NULL;
                while(!file.eof())
@@ -324,13 +324,13 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
                        int pos1=line.find(">");
                        int pos2=line.find("<",pos1+1);
                        std::string x=line.substr(pos1+1,pos2-pos1-1);
-                       gvtransfer=atof(x.c_str());                             
+                       gvtransfer=atof(x.c_str());
                        greyvecttransfunct.push_back(gvtransfer);
                }else if((int)(line.find("<intensity>"))!=-1) {
                        int pos1=line.find(">");
                        int pos2=line.find("<",pos1+1);
                        std::string x=line.substr(pos1+1,pos2-pos1-1);
-                       intensity=atof(x.c_str());                                      
+                       intensity=atof(x.c_str());
                        value.push_back(intensity);
                }
                else if( (int)(line.find("<RGBgreyValue>"))!=-1)
@@ -338,8 +338,8 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
                        int pos1=line.find(">");
                        int pos2=line.find("<",pos1+1);
                        std::string x=line.substr(pos1+1,pos2-pos1-1);
-                       gv=atof(x.c_str());                             
-                       greyvect.push_back(gv);                         
+                       gv=atof(x.c_str());
+                       greyvect.push_back(gv);
                }
                else if( (int)(line.find("<red>"))!=-1)
                {
@@ -347,7 +347,7 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
                        int pos2=line.find("<",pos1+1);
                        std::string x=line.substr(pos1+1,pos2-pos1-1);
                        red=atof(x.c_str());
-                       redvect.push_back(red);                         
+                       redvect.push_back(red);
                }
                else if( (int)(line.find("<green>"))!=-1)
                {
@@ -362,9 +362,9 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
                        int pos1=line.find(">");
                        int pos2=line.find("<",pos1+1);
                        std::string x=line.substr(pos1+1,pos2-pos1-1);
-                       bl=atof(x.c_str());     
+                       bl=atof(x.c_str());
                        bluevect.push_back(bl);
-                               
+
                }else if( (int)(line.find("</ComboBoxItem>"))!=-1 ) {
 
                        item->SetColors(greyvect,redvect,greenvect,bluevect);
@@ -379,7 +379,7 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
                                        std::cout<<greenvect[i]<<std::endl;
                                        std::cout<<bluevect[i]<<std::endl;
                        }*/
-                               
+
                        itembitmaps.push_back(item);
 
                        greyvecttransfunct.clear();
@@ -391,19 +391,19 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
                }
                line.clear();
        }
-       file.close();                   
+       file.close();
        //std::cout<<itembitmaps.size()<<std::endl;
-     }         
+     }
 }
 
 /**
 **     Returns two vectors, the grey level of the point and its value, the value is between [0,1]
 **/
 void HistogramDialogComboBox::GetValuesPointsFunction(std::vector<double>& greylevel,std::vector<double>& value)
-{      
-       for(int i = 0; i < _greyvecttransfer.size();i++) {              
+{
+       for(int i = 0; i < _greyvecttransfer.size();i++) {
                greylevel.push_back(_greyvecttransfer[i]*_maxgreyvalue);
-               value.push_back(_value[i]);     
+               value.push_back(_value[i]);
        }
 }
 
@@ -415,11 +415,11 @@ void HistogramDialogComboBox::GetValuesColorPointsFunction(std::vector<double>&
                                                                std::vector<double>& red,
                                                                std::vector<double>& green,
                                                                std::vector<double>& blue)
-{      
-       for(int i = 0; i < _greyvect.size();i++) {              
+{
+       for(int i = 0; i < _greyvect.size();i++) {
                greylevel.push_back(_greyvect[i]*_maxgreyvalue);
                red.push_back(_redvect[i]);
                green.push_back(_greenvect[i]);
-               blue.push_back(_bluevect[i]);           
+               blue.push_back(_bluevect[i]);
        }
 }