X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourViewPanel.cxx;h=e0aa08666d0f7fa419996ebb333867fdaefada3b;hb=532e76344aea0ee609187d05b871ddcb755f4d35;hp=bab1268753b706ef7a756cef7f45b29cc41a2f60;hpb=bd4e97f732f7c8154aafbf1bf419c6115e9560c7;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
index bab1268..e0aa086 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.cxx
@@ -91,7 +91,6 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 	:wxPanel(parent, -1, pos, size, style)		
 	{		
 		theShowingImage->GetSpacing(last_spacing);
-		
 		showingVID = theShowingImage;
 		int gapH = 20;
 		int gapV = 10;
@@ -153,7 +152,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 
 	wxContourViewPanel :: ~wxContourViewPanel()
 	{
-		
+		delete _sceneManager;
 	}
 
 	void wxContourViewPanel::initializeScenceManager(){
@@ -214,8 +213,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 	void wxContourViewPanel::createViewPanel()
 	{		
 		std::vector<int> * numViews = new std::vector<int> ();
-		numViews->push_back(2);
-		theViewPanel					= new wxMaracas_N_ViewersWidget( this, showingVID, numViews );
+		numViews->push_back(0);
+		theViewPanel = new wxMaracas_N_ViewersWidget( this, showingVID, numViews );
 		SetVisibleAxis(false);
 
 		theViewPanel->SetBackgroundColour(wxColour(0,0,0));
@@ -305,7 +304,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 
 		//}
 		//JCP 26 - 11 - 08
-	}
+	} 
 	/**
 	* Handles the event wxEVT_TSBAR_START from the horizontal bar	
 	*/
@@ -325,7 +324,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 	*/
 	void wxContourViewPanel :: onSelectionEnd_Horizontal(wxCommandEvent& event)
 	{
-		
+	 
 	}
 	/**
 	* Handles the event wxEVT_TSBAR_MOVED from the horizontal bar	
@@ -379,14 +378,14 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 	*/
 	void wxContourViewPanel :: onStartChange_Bar_Vertical(wxCommandEvent& event)
 	{
-		int nxStart_v = getStartVertical();
+//		int nxStart_v = getStartVertical();
 	}
 	/**
 	* Handles the event wxEVT_TSBAR_END from the vertical bar	
 	*/
 	void wxContourViewPanel :: onEndChange_Bar_Vertical(wxCommandEvent& event)
 	{
-		int nxEnd_v = getEndVertical();
+//		int nxEnd_v = getEndVertical();
 	}
 	/**
 	* Handles the event wxEVT_SELECTION_END from the vertical bar	
@@ -400,8 +399,8 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 	*/
 	void wxContourViewPanel :: onMovedBar_Vertical(wxCommandEvent& event)
 	{
-		int nxStart_v = getStartVertical();
-		int nxEnd_v = getEndVertical();
+//		int nxStart_v = getStartVertical();
+//		int nxEnd_v = getEndVertical();
 	}	
 
 
@@ -672,6 +671,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 		}	
 		wxContourMainFrame::getInstance()->changeInstant();
 	}
+
 	void wxContourViewPanel::onCreateMultipleROI (wxCommandEvent& event){
 	}
 	void wxContourViewPanel::onCreateROI (wxCommandEvent& event){
@@ -694,7 +694,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 
 		
 		std::vector<std::string> currentSelection = _sceneManager->getSelectedObjects();
-		int elementsSelected = currentSelection.size();
+//		int elementsSelected = currentSelection.size();
 		bool ctrlKey = _sceneManager->isCtrlPressed();
 		char toolCommand = _sceneManager->getLastKeyCode();
 
@@ -753,7 +753,7 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 		return _sceneManager->GetImageData();
 	}
 
-	void wxContourViewPanel::configureViewControlTo(std::string theName,manualContourModel* manModelContour,double* spc,int typeofcontour){
+	void wxContourViewPanel::configureViewControlTo(std::string theName,manualBaseModel* manModelContour,double* spc,int typeofcontour){
 		_sceneManager->configureViewControlTo(theName, manModelContour, spc, typeofcontour);
 	}
 
@@ -806,6 +806,9 @@ DEFINE_EVENT_TYPE( wxINSTANT_CHANGE )
 	}
 
 	void wxContourViewPanel::setImageSlice(int z){
-		_sceneManager->getWxVtkViewBase()->GetInteractorStyleBaseView()->GetWxVtk2DBaseView()->SetActualSlice(z);
+		vtkInteractorStyleBaseView* stylebaseview = (vtkInteractorStyleBaseView*) _sceneManager->getWxVtkViewBase()->GetInteractorStyleBaseView();
+		wxVtk2DBaseView* baseview = (wxVtk2DBaseView*)stylebaseview->GetWxVtk2DBaseView();
+		baseview->SetActualSlice(z);
 		RefreshInterface();
-	}
\ No newline at end of file
+	}
+