X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxInstantChooserPanel.cxx;h=b40caf42caf7c3af1c31a7f6a1f748b01d83960b;hb=6e3c929c883c405e0075fa8df10b12a935979367;hp=e3bc789e5e8dcffa6471d430c907bbd3b9c4407a;hpb=7e39ed1fa75cd57dfea770353f5286bdcee23c24;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
index e3bc789..b40caf4 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxInstantChooserPanel.cxx
@@ -5,7 +5,7 @@
 #include "wxContourMainFrame.h"
 
 //Test JCP 13-10-08
-#include "wxContourEventHandler.h"
+//#include "wxContourEventHandler.h"
 //Test JCP 13-10-08
 
 //----------------------------------------------------------------------------------------------------------------
@@ -56,7 +56,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 		sizer->Add( _outSizer, 1, wxEXPAND| wxGROW );
 		sizer->Add( resolutionSizer, 1, wxEXPAND | wxGROW );
 		SetSizer( sizer );
-		Connect( wxID_ANY,  wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxInstantChooserPanel:: onChechBoxClicked ); 		
+		Connect( wxID_ANY,  wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxInstantChooserPanel:: onCheckBoxClicked ); 		
 
 	}
 
@@ -79,7 +79,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 		sizer->Add( _outSizer, 1, wxEXPAND| wxGROW );
 		sizer->Add( _resolutionSlider, 1, wxEXPAND | wxGROW );
 		SetSizer( sizer );
-		Connect( wxID_ANY,  wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxInstantChooserPanel:: onChechBoxClicked ); 		
+		Connect( wxID_ANY,  wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &wxInstantChooserPanel:: onCheckBoxClicked ); 		
 	}
 
 	wxInstantChooserPanel :: ~wxInstantChooserPanel()
@@ -161,9 +161,9 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 
 	}
 	//------------------------------------------------------------------------------------------------------------
-	void wxInstantChooserPanel :: onChechBoxClicked( wxCommandEvent& event )
+	void wxInstantChooserPanel :: onCheckBoxClicked( wxCommandEvent& event )
 	{
-		int groupID = (int)event.GetClientData();
+		/*int groupID = (int)event.GetClientData();
 		wxConceptControl * eventConcept = (wxConceptControl *)event.GetEventObject();
 		if ( eventConcept->getIfChecked( groupID ) )
 		{
@@ -186,6 +186,33 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 					}					
 				}
 			}					
+		}*/
+
+		int groupID = (int)event.GetClientData();
+		wxConceptControl * eventConcept = (wxConceptControl *)event.GetEventObject();
+		if ( eventConcept->getIfChecked( groupID ) )
+		{
+			int size = _concepts->size();
+			wxConceptControl * aConcept = NULL;
+			int accum = 0;
+
+			for(int i = 0; i < eventConcept->getNumCheckBox();i++){
+				if(i!=groupID){
+					eventConcept->clearCheckAt(i);
+				}
+			}
+			for(int i=0; i<size; i++)
+			{
+				aConcept = (*_concepts)[i]; 
+				if( aConcept!= eventConcept )
+				{
+					if( aConcept->getIfChecked( groupID ) )
+					{	
+						aConcept->clearCheckAt( groupID );
+					}					
+				}
+			}		
+			
 		}
 	}
 
@@ -201,7 +228,11 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 		//-------------------------------------------------
 		wxCommandEvent newevent(wxINSTANT_CHOOSER_CHANGE,GetId());  
 		//this->onChangeInstant(newevent);
-		((wxContourEventHandler*)_eventHandler)->onChangeInstant(newevent);
+		ConceptDataWrap * dataConcept = getLastConceptData(); 
+		if(getIfConceptCheckedAt( dataConcept->getName(), 0 )){
+			wxContourMainFrame::getInstance()->onChangeInstantInstantPanel(dataConcept->getName(), dataConcept->getActualValue(), dataConcept->getMinShowedValue(), dataConcept->getMaxShowedValue());
+		}
+		//((wxContourEventHandler*)_eventHandler)->onChangeInstant(newevent);
 		//_eventHandler->ProcessEvent(newevent);
 	}
 
@@ -456,3 +487,16 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHOOSER_CHANGE )
 	}
 	 
 	 
+	void wxInstantChooserPanel::addConcepts(std::vector<std::string> conceptNameVect,std::vector<int> conceptSizeVect){
+		int i=0;
+		int max = conceptNameVect.size();			
+		for( ; i<max; i++)
+		{
+			if( conceptNameVect[i].compare("Axe Depth") == 0 )
+			{
+				addConcept( conceptNameVect[i], 0, conceptSizeVect[i], 1);					
+			} else {
+				addConcept( conceptNameVect[i], 1, conceptSizeVect[i], 1);
+			} // if
+		}
+	}
\ No newline at end of file