X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FHistogramDialogComboBox.cxx;h=2809b4e7c5c17c6bd1a99a7fdb8bf7bf3fb0bb98;hb=e60eea9083457889b9603a815db80af918f983da;hp=3a997d5d22b75a6a63546958fa5a60b258f6d709;hpb=6a3077638c3045db3888c8c5641d141ff078c8dc;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
index 3a997d5..2809b4e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramDialogComboBox.cxx
@@ -11,7 +11,6 @@
 HistogramDialogComboBox::HistogramDialogComboBox(wxWindow* parent)
 : wxPanel(parent)
 {
-
 	_img = NULL;	
 	_bitmapcombo=NULL;
 	_slidercolor=NULL;
@@ -25,10 +24,9 @@ HistogramDialogComboBox::HistogramDialogComboBox(wxWindow* parent)
 	_maxgreyvalue=0;
 }
 
-HistogramDialogComboBox::~HistogramDialogComboBox(){
-	
-	
+HistogramDialogComboBox::~HistogramDialogComboBox(){	
 }
+
 void HistogramDialogComboBox::SetColors(std::vector<double> greyvect, std::vector<double> redvect, std::vector<double> greenvect, std::vector<double> bluevect){
 
 	_greyvect=greyvect;
@@ -38,7 +36,6 @@ void HistogramDialogComboBox::SetColors(std::vector<double> greyvect, std::vecto
 	
 }
 
-
 wxSizer* HistogramDialogComboBox::getBitmapCombo(){
 	//_bitmapsizer = new wxBoxSizer(wxVERTICAL);
 	_bitmapsizer = new wxBoxSizer(wxVERTICAL);
@@ -77,7 +74,6 @@ wxSizer* HistogramDialogComboBox::getSlidersWlCo(){
 	Connect(_sliderwindowlevel->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction)&HistogramDialogComboBox::OnWindowLevelChanged);
 
 	return sizersliders;
-
 }
 
 double HistogramDialogComboBox::GetWindowLevel(){
@@ -85,6 +81,7 @@ double HistogramDialogComboBox::GetWindowLevel(){
 		return _sliderwindowlevel->GetValue();
 	}
 }
+
 double HistogramDialogComboBox::GetColorLevel(){
     if(_slidercolor != NULL){
 		return _slidercolor->GetValue();
@@ -105,6 +102,7 @@ void HistogramDialogComboBox::OnWindowLevelChanged(wxCommandEvent& event){
     ProcessEvent(newevent);
 
 }
+
 void HistogramDialogComboBox::setImageData(vtkImageData* img){
 	_maxgreyvalue = img->GetScalarRange()[1];
 	_img = img;
@@ -112,6 +110,7 @@ void HistogramDialogComboBox::setImageData(vtkImageData* img){
 	setSlidersValue();
 
 }
+
 void HistogramDialogComboBox::setSlidersValue(){
 	if(_img!=NULL){
 		if(_slidercolor!=NULL){
@@ -124,13 +123,14 @@ void HistogramDialogComboBox::setSlidersValue(){
 		}
 	}
 }
+
 void HistogramDialogComboBox::OnEditBitmapCombo(wxCommandEvent& event){
 	
 	if(_img!=NULL){
 
 		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){
@@ -160,10 +160,8 @@ void HistogramDialogComboBox::OnEditBitmapCombo(wxCommandEvent& event){
 		}	
 		dialog->Destroy();
 	}
-	
-
-	
 }
+
 void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDialogComboBoxItem*>& itembitmaps,std::string filename){
 
 	std::ofstream file;	
@@ -171,8 +169,6 @@ void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDial
 	double gv=-1,red=-1,gr=-1,bl=-1;
 	int in=-1;
 
-	
-
 	if(file.is_open())
 	{
 		file << "<ComboBoxData>" << std::endl;
@@ -213,12 +209,9 @@ void HistogramDialogComboBox::saveCurrentConfiguration(std::vector<HistogramDial
 					file << "	</Colors>" << std::endl;
 				}
 			}
-
 			file << "	</ComboBoxItem>"<< std::endl;		
-
 		}
-		file << "</ComboBoxData>" << std::endl;
-		
+		file << "</ComboBoxData>" << std::endl;	
 	}
 	file.close();
 
@@ -241,13 +234,9 @@ wxBitmapComboBox* HistogramDialogComboBox::getBitmapComboElements(){
 
 	Connect(bitmapcombo->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction)&HistogramDialogComboBox::OnBitmapComboItemSelected);			
 
-    	
-
 	for(int i = 0; i < bitmapsitems.size(); i++){
         bitmapcombo->SetItemBitmap(i, bitmapsitems[i]->GetBitmap());
 	}
-
-	
 	return 	bitmapcombo;
 }
 void HistogramDialogComboBox::OnBitmapComboItemSelected(wxCommandEvent& event){
@@ -265,12 +254,8 @@ 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)
@@ -353,7 +338,7 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
 
 				item->SetColors(greyvect,redvect,greenvect,bluevect);
 				item->SetTransferFunction(greyvecttransfunct,value);
-				for(int i = 0; i < greyvecttransfunct.size();i++){
+				/*for(int i = 0; i < greyvecttransfunct.size();i++){
 					std::cout<<"HistogramDialogComboBox::OnLoadComboBoxData("<<greyvecttransfunct[i]<<std::endl;
 					std::cout<<value[i]<<std::endl;
 				}
@@ -362,26 +347,22 @@ void HistogramDialogComboBox::OnLoadComboBoxData(std::vector<HistogramDialogComb
 					std::cout<<redvect[i]<<std::endl;
 					std::cout<<greenvect[i]<<std::endl;
 					std::cout<<bluevect[i]<<std::endl;
-				}
+				}*/
 				
 				itembitmaps.push_back(item);
 
-
 				greyvecttransfunct.clear();
 				value.clear();
 				greyvect.clear();
 				redvect.clear();
 				greenvect.clear();
 				bluevect.clear();
-
 			}
-			
 			line.clear();
 		}
 		file.close();			
 		//std::cout<<itembitmaps.size()<<std::endl;
-     }	
-	
+     }		
 }
 
 /**
@@ -391,9 +372,7 @@ void HistogramDialogComboBox::GetValuesPointsFunction(std::vector<double>& greyl
 {	
 	for(int i = 0; i < _greyvecttransfer.size();i++){		
 		greylevel.push_back(_greyvecttransfer[i]*_maxgreyvalue);
-		value.push_back(_value[i]);
-
-		
+		value.push_back(_value[i]);	
 	}
 }
 
@@ -405,12 +384,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++){		
 		greylevel.push_back(_greyvect[i]*_maxgreyvalue);
 		red.push_back(_redvect[i]);
 		green.push_back(_greenvect[i]);
 		blue.push_back(_bluevect[i]);		
 	}
-}
\ No newline at end of file
+}