From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Sun, 21 Feb 2016 12:05:43 +0000 (+0100)
Subject: #2846 creaMaracasVisu Bug New Normal  -  HistogramDialogComboBox not finding good... 
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=622932e16dd25f4a3160552ab96c92975df59b81;p=creaMaracasVisu.git

#2846 creaMaracasVisu Bug New Normal  -  HistogramDialogComboBox not finding good path for configuration in windows
---

diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
index b4922c6..90d5de2 100644
--- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
+++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
@@ -102,6 +102,7 @@ void ColorLayerImageView::bbUserSetDefaultValues()
     firsttime=true;
     bbSetInputIn(NULL);
     bbSetInputActive(true);
+    bbSetInputPlainOrGradientColor(false);
     bbSetInputTypeControlsInterface(1);
     bbSetInputWxVtkBaseView(NULL);
     bbSetInputWxVtkBaseView1(NULL);
diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h
index f608f9d..7191b72 100644
--- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h
+++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.h
@@ -88,7 +88,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ColorLayerImageView,bbtk::WxBlackBox);
   BBTK_INPUT(ColorLayerImageView,lstRangeForColorBar,"??? EED ",std::vector<double>,"");
 
 
-  BBTK_INPUT(ColorLayerImageView,PlainOrGradientColor,"Choose between Plain (true) or Gradient (false) colors. Default is false.",bool,"");
+  BBTK_INPUT(ColorLayerImageView,PlainOrGradientColor,"true=Plane false=Gradient (Default false)",bool,"");
   BBTK_INPUT(ColorLayerImageView,FittingMode,"Choose the fitting mode between the images, the transformation can be either by Dimension (1), by Spacing (2) or by Pixel (3). If you want to make the choice through a dialog box, choose (-1). Default is by Pixel (3).",int,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ColorLayerImageView);
 //=====
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
index e987f8c..15d4495 100644
--- 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
 }
+