From e628a3dc4645cb347ebf060b145e626cc31a65f4 Mon Sep 17 00:00:00 2001
From: corredor <>
Date: Mon, 19 Apr 2010 08:52:39 +0000
Subject: [PATCH] Now the contour is created from the center of the initial
 port

---
 .../bbsKernelEditorGraphic/Observable.cxx     |  4 ++--
 .../bbsKernelEditorGraphic/Observable.h       |  2 +-
 .../bbsKernelEditorGraphic/Observer.cxx       |  2 +-
 .../bbsKernelEditorGraphic/Observer.h         |  2 +-
 .../wxVtkSceneManager.cxx                     | 23 +++++++++++++++++--
 .../wxVtkSceneManager.h                       |  2 +-
 .../vtkGBlackBoxView.cxx                      |  2 +-
 .../bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h |  2 +-
 .../bbsVtkGUIEditorGraphic/vtkGObjectView.cxx |  2 +-
 .../bbsVtkGUIEditorGraphic/vtkGObjectView.h   |  2 +-
 .../bbsVtkGUIEditorGraphic/vtkGPortView.cxx   |  2 +-
 .../bbsVtkGUIEditorGraphic/vtkGPortView.h     |  2 +-
 12 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.cxx
index c52934c..cf21b32 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.cxx
@@ -59,14 +59,14 @@ namespace bbtk
 
 	//=========================================================================
 	
-	void Observable::notifyObservers(int idObservable,int command)
+	void Observable::notifyObservers(int idController,int command)
 	{
 		if(_changed)
 		{
 			int i;
 			for(i=0;i<_observers.size();i++)
 			{
-				_observers[i]->update(idObservable,command);
+				_observers[i]->update(idController,command);
 			}
 			_changed=false;
 		}
diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.h
index a165b9e..18fad74 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.h
@@ -71,7 +71,7 @@ namespace bbtk
 
 		bool hasChanged();
 
-		void notifyObservers(int idObservable=-1,int command=REPAINT);
+		void notifyObservers(int idController=-1,int command=REPAINT);
                     
 		void setChanged();
 
diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observer.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observer.cxx
index 80dd23b..d4e9f59 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observer.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observer.cxx
@@ -52,7 +52,7 @@ namespace bbtk
 	}
 	//=========================================================================
 
-	void Observer::update(int idObservable,int command) //virtual
+	void Observer::update(int idController,int command) //virtual
 	{
 		//virtual
 	}
diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observer.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observer.h
index 9b9fa8c..f5c10e9 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observer.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observer.h
@@ -59,7 +59,7 @@ namespace bbtk
 		~Observer();
 		
 		//Public methods
-		virtual void update(int idObservable,int command);
+		virtual void update(int idController,int command);
 		
 		
 	private:
diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
index 23ea678..a95d229 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
@@ -351,6 +351,25 @@ namespace bbtk
 
 		manViewerContour->RefreshContour();
 
+
+		double x,y,z;
+		startPort->getCenter(x,y,z);
+
+		manContourControl->SetState(1);
+		manContourModel->SetCloseContour(false);
+		
+		manContourModel->AddPoint(x,y,z);
+		manViewerContour->AddPoint();
+
+		manContourModel->AddPoint(x,y,z);
+		manViewerContour->AddPoint();
+
+		int bak= manContourControl->GetNumberOfPointsManualContour() - 1;
+		manContourControl->_bakIdPoint=bak;
+		manViewerContour->Refresh();
+
+		manContourControl->SetMoving( false );
+
 		registerController((InteractorStyleMaracas*) manContourControl);
 
 	}
@@ -385,12 +404,12 @@ namespace bbtk
 
 	//=========================================================================
 	
-	void wxVtkSceneManager::update(int idObservable,int command)
+	void wxVtkSceneManager::update(int idController,int command)
 	{
 		
 		if(command==INIT_CREATION_CONTOUR)
 		{	
-			GObjectController* cont = _controllers[idObservable];
+			GObjectController* cont = _controllers[idController];
 			if(cont->getGObjectType() == GPORT)
 			{
 				GPortController* controller = (GPortController*)cont;
diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
index f539e92..38552db 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.h
@@ -100,7 +100,7 @@ namespace bbtk
 		
 		virtual bool OnMouseMove();
 
-		virtual void update(int idObservable,int command);
+		virtual void update(int idController,int command);
 		
 	private:
 
diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
index fbdd952..65dbf1a 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx
@@ -51,7 +51,7 @@ namespace bbtk
 	}
 
 	//=========================================================================
-	void vtkGBlackBoxView::update(int idObservable,int command)
+	void vtkGBlackBoxView::update(int idController,int command)
 	{
 
 		updateColors();
diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h
index b64ce17..a38f8f4 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h
@@ -98,7 +98,7 @@ namespace bbtk
 		//Protected Methods
 		virtual void addVtkActors();
 		virtual void createVtkObjects();
-		virtual void update(int idObservable,int command);
+		virtual void update(int idController,int command);
 		virtual void updateColors();
 	};
 
diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx
index db905de..85b2616 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx
@@ -56,7 +56,7 @@ namespace bbtk
 	}
 	//=========================================================================
 
-	void vtkGObjectView::update(int idObservable,int command)//virtual
+	void vtkGObjectView::update(int idController,int command)//virtual
 	{
 		//virtual
 	}
diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
index ce1e4ce..d07a3fd 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h
@@ -83,7 +83,7 @@ namespace bbtk
 		virtual bool isPointInside(int X,int Y);
 		virtual void moveObject(int X, int Y);
 
-		virtual void update(int idObservable,int command);
+		virtual void update(int idController,int command);
 		void isStartDragging(bool param);
 
 		void setState(int state);
diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
index 42dcd21..0359978 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx
@@ -51,7 +51,7 @@ namespace bbtk
 	}
 
 	//=========================================================================
-	void vtkGPortView::update(int idObservable,int command)
+	void vtkGPortView::update(int idController,int command)
 	{
 		updateColors();
 		
diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.h
index acbf772..b66f529 100644
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.h
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.h
@@ -76,7 +76,7 @@ namespace bbtk
 		~vtkGPortView();
 		
 		//Public methods
-		virtual void update(int idObservable,int command);
+		virtual void update(int idController,int command);
 
 	private:
 
-- 
2.45.0