Now the contour is created from the center of the initial port

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.cxx
index c52934c2c3cfa1e1128a9a0f77811b2f69b5fb31..cf21b32e9990b87f06c58d19d23c45c006d67203 100644 (file)
--- 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 a165b9eb0e41f84be363abcf83f5597341452b43..18fad74b5f1977ccf91a29a59d9f38b4adcea33d 100644 (file)
--- 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 80dd23b1ff62fe49372a608ce21bf122f4b6cd41..d4e9f596f1a742bb956e784f27280955ad8f83da 100644 (file)
--- 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 9b9fa8c26e93f0c41fc87d198d9180db14630c70..f5c10e9bf853c2941a77c7a30b003d152b1e426b 100644 (file)
--- 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 23ea678c0a0d21ca6bfe58265e8a10e5256724d4..a95d229934a5fdb81b3d3ccd6b6bdcd654c30fa3 100644 (file)
--- 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 f539e92ea3732e2fa315c59baad635c6839b2d4e..38552dbe7fe0e3ff0860a1168fb190097becddaa 100644 (file)
--- 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 fbdd9524ce5652cd95c5635b7da3a7598cb3dc4e..65dbf1ae932fa757d2678ad53e9aee7f8dc524a4 100644 (file)
--- 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 b64ce178d010cf228cff1eac2b258780f95b0cd2..a38f8f46da984b0882706db2768ddadef8cf4021 100644 (file)
--- 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 db905de37425c75e0cf4bce7efa68893e5fd6353..85b2616c90b026d100a03569d1a72ec651e39cb2 100644 (file)
--- 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 ce1e4ce8f432875bfc7378d71f473a1578f811a3..d07a3fd7def5884e6ed6e2b5241b15009ea07276 100644 (file)
--- 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 42dcd2129435116f877e273e0821bc528510728a..035997846f91ad441ceacce710bff85237ea08af 100644 (file)
--- 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 acbf772d0e860372d487d67bdc01b1ef66e9c867..b66f52952d5a2facc29a46b31d0596a099acafa8 100644 (file)
--- 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: