#2846 creaMaracasVisu Bug New Normal - HistogramDialogComboBox not finding good...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / pPlotter / HistogramDialogComboBox.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
index e987f8c1b495c424e8993225607d4f0ea6508527..15d4495e401a6649a3f87145554f3c633854fcd7 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
@@ -282,6 +282,7 @@ void HistogramDialogComboBox::InitCurrentPathColorsFuntion()
       _currentpathColorsFuntion = "";
 #ifdef WIN32
        _currentpathColorsFuntion = crea::System::GetDllAppPath("bbcreaMaracasVisu");
+       _currentpathColorsFuntion.append("/data/");
 #endif
 #ifdef LINUX
        _currentpathColorsFuntion = crea::System::GetExecutablePath();
@@ -398,13 +399,13 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
                {
                        item = new HistogramDialogComboBoxItem();
                }else if((int)(line.find("<greyValue>"))!=-1) {
-                       int pos1=line.find(">");
+            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());
                        greyvecttransfunct.push_back(gvtransfer);
                }else if((int)(line.find("<intensity>"))!=-1) {
-                       int pos1=line.find(">");
+            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());
@@ -478,10 +479,11 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
 **/
 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]);
-       }
+       } // for i
 }
 
 /**
@@ -493,10 +495,12 @@ void HistogramDialogComboBox::GetValuesColorPointsFunction(std::vector<double>&
                                                                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]);
-       }
+       } // for i
 }
+