v1.1.0 BUG: 1400

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsVtkGUIEditorGraphic / manualConnectorContourController.cxx

diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/manualConnectorContourController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/manualConnectorContourController.cxx
index 0a352646e70a6e3d9d6a279def8c2232808c94fa..bc02755b508876a5ef62dbfedd2d30319617e943 100644 (file)
--- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/manualConnectorContourController.cxx
+++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/manualConnectorContourController.cxx
@@ -46,9 +46,42 @@ namespace bbtk
        }
 
        //=========================================================================
+       
        manualConnectorContourController::~manualConnectorContourController()
        {
        }
+
+       //=========================================================================
+
+       void manualConnectorContourController::MouseMove(int x, int y) // virtual
+       {
+               
+               int z=GetZ();
+                               
+               printf("EED MACHETE con int z=-GetZ(); en manualConnectorContourController::MouseMove z=%d\n", z );
+               z=-z;
+               
+               GetManualViewBaseContour()->SelectPosiblePoint(x,y,z);
+               GetManualViewBaseContour()->SelectPosibleContour(x,y,z);
+               if (GetState()==1){     SetPoint( _bakIdPoint , x , y ,z); }
+               if (GetState()==5){     SetPoint( _bakIdPoint , x , y ,z); }
+               if ( GetState()==6 && !IsEditable() && GetPosibleToMove() &&IsMoving() )
+               {
+                       //GetManualViewBaseContour()->MoveContour(x,y,z);
+               }
+               if (GetState()!=7 || GetManualViewBaseContour()->GetPosibleSelected() ){
+                       GetManualViewBaseContour()->Refresh();
+                       this->_vtkInteractorStyleBaseView->SetRefresh_waiting();
+               }
+               if (!IsEditable())
+               {
+                       GetManualViewBaseContour()->RemoveControlPoints();
+                       GetManualViewBaseContour()->Refresh();
+                       this->_vtkInteractorStyleBaseView->SetRefresh_waiting();
+               }
+
+       }
+
        //=========================================================================
 
        void manualConnectorContourController::MouseClickRight(int x, int y)
@@ -60,20 +93,36 @@ namespace bbtk
                SetEditable( false );
                SetPosibleToMove( false );
                SetState(0);
-
-               if(!_created)
-               {
-                       //DeleteContour();
-               }
+               
        }
 
        //=========================================================================
-       void manualConnectorContourController::MouseClickLeft(int x, int y){
+
+       void manualConnectorContourController::MouseClickLeft(int x, int y)
+       {
 
                bool ok = false;
-               int z   = GetZ();
+               int z   = -GetZ();
                int size= GetManualViewBaseContour()->GetNumberOfPoints();
 
+               
+               printf("\nEED manualConnectorContourController::MouseClickLeft   z=%d   estado=%d\n", z,GetState());
+               if (IsEditable())
+               {
+                       printf(" Editable\n");
+               } else          {
+                       printf(" NO Editable\n");
+               }
+               
+                
+               if (GetManualViewBaseContour()->GetPosibleSelected())
+               {
+                       printf(" PosibleSelected\n");
+               } else          {
+                       printf(" NO PosibleSelected\n");
+               }
+               
+               
                // Insert a Control Point with shift+ClickLeft
                vtkRenderWindowInteractor *vtkrenderwindowinteractor = _vtkInteractorStyleBaseView->GetInteractor();
                if( IsEditable() )
@@ -97,14 +146,7 @@ namespace bbtk
                        if ((GetState()==1) && (_easyCreation==true) && GetNumberOfPointsManualContour()==2)
                        {
                                ok=true;
-
-                               SetCompleteCreation( true );
-                               SetKeyBoardMoving( false );
-                               GetManualContourModel()->SetCloseContour(false);
-
-                               SetEditable( false );
-                               SetPosibleToMove( false );
-                               SetState(0);
+                               endContourCreation();
                        }
 
                        // Continue to Insert Control Points with ClickLeft (After being empty the contour)
@@ -152,11 +194,28 @@ namespace bbtk
                        GetManualViewBaseContour()->InitMove(x,y,z);
                        SetState(6);
                }
+               
                if (ok==true)
                {
                        GetManualViewBaseContour()->Refresh();
-               }
+               }// ok
+               
        }
+       
+       //=========================================================================
+       
+       void manualConnectorContourController::endContourCreation()
+       {
+               SetCompleteCreation( true );
+               SetKeyBoardMoving( false );
+               GetManualContourModel()->SetCloseContour(false);
+
+               SetEditable( false );
+               SetPosibleToMove( false );
+               SetState(0);
+       }
+
+
        //=========================================================================
 
 }  // EO namespace bbtk