X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxVtkBaseView_SceneManager.h;h=93a2d866cb62a8b492ecc9eee2473cac4c5fec53;hb=64a6730d769e99153ff422062673e6b39f6a277d;hp=32362276d2ff19f94e4bce6686bc5793af6ccd22;hpb=a654abbc209ed3104e98553cb381ef1c2845937a;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h
index 3236227..93a2d86 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h
@@ -24,7 +24,17 @@
 #include "wxVtkBaseView.h"
 #include <iostream>
 #include <map>
-#include <manualContour.h>
+#include "manualContourModel.h"
+#include "manualRoiControler.h"
+#include "manualContourBaseControler.h"
+#include "manualCircleControler.h"
+#include "manualLineControler.h"
+#include "manualViewBaseContour.h"
+#include "manualViewBullEye.h"
+#include "manualViewCircle.h"
+#include "manualViewLine.h"
+#include "manualViewPoints.h"
+#include "manualViewRoi.h"
 #include <wx/event.h>
 
 //------------------------------------------------------------------------------------------------------------
@@ -83,7 +93,25 @@ class wxVtkBaseView_SceneManager : public InteractorStyleMaracas {
 	void setWxVtkViewBase( wxVtkBaseView * theBaseView );
 	void setWxEventHandler( wxEvtHandler * theEventHandler );
 	wxVtkBaseView * getWxVtkViewBase();
-	void configureViewControlTo( std::string theKeyName, manualContourModel * manContourControl, double * spc ,int typeContour);
+
+	//
+	// Method which creates and associates view and controller to the contour model type pointed in parameter.
+	// The possible contour types are:
+	// 0-spline
+	// 1-spline
+	// 2-rectangle
+	// 3-circle
+	// 4-BullEye
+	// 5-BullEyeSector
+	// 6-Line
+	// 7-Points
+	// NOTE: The model is created in the KernelManagerContour class, factoryManualContourModel method
+	// @param typeContour - int
+	// @param theKeyName - string
+	// @param manContourControl - manualBaseModel
+	// @param spc - double*  3-pos Array 
+	void configureViewControlTo( std::string theKeyName, manualBaseModel * manContourControl, double * spc ,int typeContour);
+
 	void configureSelectionROI( double * spc );
 	ContourWrap_ViewControl * insertWrap( std::string theKeyName, manualContourBaseControler * manContourControl, manualViewBaseContour  * manViewerContour ); 
 	void desconfigureViewControlOf( std::string theKeyName );
@@ -107,7 +135,7 @@ class wxVtkBaseView_SceneManager : public InteractorStyleMaracas {
 	//  Other functional methods
 	//------------------------------------------------------------------------------------------------------------
 
-	void createCopyContourOf( std::string anExistingKName, std::string cloneName, manualContourModel * manualModel, bool append = false );
+	void createCopyContourOf( std::string anExistingKName, std::string cloneName, manualBaseModel * manualModel, bool append = false );
 	void removeFromScene( ContourWrap_ViewControl * contourWRP, bool visualization = true, bool control = true );
 	void removeFromScene( std::string theKeyName, bool visualization = true, bool control = true );
 	void removeSceneContours( );
@@ -181,9 +209,9 @@ private:
 	
 	std::map<std::string, ContourWrap_ViewControl *> * _contours_ViewControl;
 	std::map<std::string, ContourWrap_ViewControl *> * _sceneContours_ViewControl;
-	wxVtkBaseView			*_wxVtk_BaseView;
-	wxEvtHandler			*_eventHandler;
-	ContourWrap_ViewControl *_lastInteraction;
+	wxVtkBaseView				*_wxVtk_BaseView;
+	wxEvtHandler				*_eventHandler;
+	ContourWrap_ViewControl 		*_lastInteraction;
 	std::string				_lastInteractionName;
 	std::map<std::string, ContourWrap_ViewControl *> * _workingGroup;
 	bool					_creatingMULT_ROI;
@@ -191,19 +219,20 @@ private:
 	bool					_toIncludeAtInteractionGroup;
 	bool					_waiting;
 	bool					_creatingROI;
-	int						_enventID;
-	int						_leftClickCount;
-	int						_rigthClickCount;
-	int						clickX;
-	int						clickY;
+	int					_enventID;
+	int					_leftClickCount;
+	int					_rigthClickCount;
+	int					clickX;
+	int					clickY;
 	char					_lastKeyCode;
 	long int				onCharCallBackTimeEnd;
 	long int				onCharNeeded;
 	bool					_drawingSelectionROI;
-	manualRoiControler		*_controlerSelectionROI;
-	manualViewRoi			*_viewerSelectionROI;
-	manualContourModel		*_modelSelectionROI;
+	manualRoiControler			*_controlerSelectionROI;
+	manualViewRoi				*_viewerSelectionROI;
+	manualBaseModel				*_modelSelectionROI;
 	double					_widthOfContour;
+	double					_widthOfControlPoint;
 
 	bool _ctrlKey;
 	bool _shiftKey;