#3578 manual contour controler new version of ifTouchContour

diff --git a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
index 07692b4fc3d0bce31dcc25f6a5cf78b5ff1bd4b2..47ebd804efdd1f2ba4f49cf34b65228c0469138c 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
@@ -623,7 +623,7 @@ void ManualContourModel_Box::RedistributionPointsAllContours_SIN(   std::vector<do
                ExtractContour(lstOutX,lstOutY,lstOutZ,lstIndexsOut, iContour+1 , &lstTmp3X,&lstTmp3Y,&lstTmp3Z);
 //             sizeContour2    = SizeContour( &lstTmp2X, &lstTmp2Y, &lstTmp2Z );
                sizeContour2    = lstSizeContours[ iContour  ];
-               printf("EED Warnning!  ManualContourModel_Box::RedistributionPointsAllContours_SIN  wave3 posible inconsistent contour y=%f  iContour=%d\n", lstTmp2Y[0], iContour );
+               printf("EED Warnning!  ManualContourModel_Box::RedistributionPointsAllContours_SIN  wave3 possible inconsistent contour y=%f  iContour=%d\n", lstTmp2Y[0], iContour );
                lstInconsistentContourY.push_back( lstTmp2Y[0] );
                lstInconsistentContourID.push_back( iContour );
                findAlphaBetaSinDistribution( &lstTmp2X,&lstTmp2Y,&lstTmp2Z ,sizeContour2,  &lstTmp1X,&lstTmp1Y,&lstTmp1Z,  &alpha1,&beta1);

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualCircleControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualCircleControler.cpp
index 5743dac1bcd4c290797e74b1a86362e992e88988..52eae6fa10c5994ce3255a8d7233c877fbb98cdd 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualCircleControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualCircleControler.cpp
@@ -77,7 +77,7 @@ void manualCircleControler::MouseClickLeft(int x, int y){
        }// IsEditable
        
        // move contour
-       if ((GetState()==0) && (GetManualViewBaseContour()->GetPosibleSelected()==true))        {
+       if ((GetState()==0) && (GetManualViewBaseContour()->GetPossibleSelected()==true))       {
                GetManualViewBaseContour()->InitMove(x,y,z);
                SetState(6);
        }
@@ -116,8 +116,8 @@ void manualCircleControler::MouseMove(int x, int y) // virtual
        int z=GetZ();
 //     this->_vtkInteractorStyleBaseView->
 
-       GetManualViewBaseContour()->SelectPosibleContour(x,y,z);
-       GetManualViewBaseContour()->SelectPosiblePoint(x,y,z);
+       GetManualViewBaseContour()->SelectPossibleContour(x,y,z);
+       GetManualViewBaseContour()->SelectPossiblePoint(x,y,z);
 
        if (GetState()==1){     SetPoint( bakIdPoint , x , y ,z); }
        if (GetState()==5){     SetPoint( bakIdPoint , x , y ,z); }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3VControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3VControler.cpp
index 1de4a5c5768414d4923ce11718e188d90b186a99..3b8b368142dcf37099ed7bb0acbe521ec0cd599e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3VControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3VControler.cpp
@@ -282,9 +282,9 @@ void manualContour3VControler::MouseMove_Others(int id) // virtual
                mvbc->SelectAllPossibleSelected(false);
                if (id!=-1)
                {
-                       mvbc->SetPointPosibleSelected(id,true);
+                       mvbc->SetPointPossibleSelected(id,true);
                }
-               mvbc->SetPosibleSelected  (  GetManualViewBaseContour()->GetPosibleSelected()  );
+               mvbc->SetPossibleSelected  (  GetManualViewBaseContour()->GetPossibleSelected()  );
                mvbc->Refresh();
        }
 
@@ -295,13 +295,13 @@ void manualContour3VControler::MouseMove_Others(int id) // virtual
                _manViewBaseCont2->SelectAllPossibleSelected(false);
                _manViewBaseCont3->SelectAllPossibleSelected(false);
                if (id!=-1){
-                       _manViewBaseCont1->SetPointPosibleSelected(id,true);
-                       _manViewBaseCont2->SetPointPosibleSelected(id,true);
-                       _manViewBaseCont3->SetPointPosibleSelected(id,true);
+                       _manViewBaseCont1->SetPointPossibleSelected(id,true);
+                       _manViewBaseCont2->SetPointPossibleSelected(id,true);
+                       _manViewBaseCont3->SetPointPossibleSelected(id,true);
                }
-               _manViewBaseCont1->SetPosibleSelected  (  GetManualViewBaseContour()->GetPosibleSelected()  );
-               _manViewBaseCont2->SetPosibleSelected  (  GetManualViewBaseContour()->GetPosibleSelected()  );
-               _manViewBaseCont3->SetPosibleSelected  (  GetManualViewBaseContour()->GetPosibleSelected()  );
+               _manViewBaseCont1->SetPossibleSelected  (  GetManualViewBaseContour()->GetPossibleSelected()  );
+               _manViewBaseCont2->SetPossibleSelected  (  GetManualViewBaseContour()->GetPossibleSelected()  );
+               _manViewBaseCont3->SetPossibleSelected  (  GetManualViewBaseContour()->GetPossibleSelected()  );
 
                _manViewBaseCont1->Refresh();
                _manViewBaseCont2->Refresh();

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
index 969d1fa4a992c9664f5e97bc4b4d28f07dc0da02..9302a585a018fa561d0d62b313e31e99dcdf43b6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
@@ -41,7 +41,7 @@ manualContourBaseControler::manualContourBaseControler()
        _z                                      = -900;
        
        _editable                       = true;
-       _posibleToMove          = true;
+       _possibleToMove         = true;
        _moving                         = false;
        _created                        = false;
        _keyBoardMoving         = false;
@@ -68,7 +68,7 @@ void manualContourBaseControler::CopyAttributesTo( manualContourBaseControler *
        cloneObject->SetZ( this->GetZ() );
        cloneObject->SetState( this->GetState() );
        cloneObject->SetEditable( this->IsEditable() );
-       cloneObject->SetPosibleToMove( this->GetPosibleToMove() );
+       cloneObject->SetPossibleToMove( this->GetPossibleToMove() );
        cloneObject->SetMoving( this->IsMoving() );
        cloneObject->SetCompleteCreation( this->GetIfCompleteCreation() );
        cloneObject->SetKeyBoardMoving( this->GetKeyBoardMoving() );
@@ -94,7 +94,7 @@ bool manualContourBaseControler::OnChar()
                // Delete Point
                if ((keyCode==8) || (keyCode==127))
                {
-                       if ( (GetState()==0) &&  (!GetManualViewBaseContour()->GetPosibleSelected()==true))
+                       if ( (GetState()==0) &&  (!GetManualViewBaseContour()->GetPossibleSelected()==true))
                        {
                                DeleteActualMousePoint(X,Y);
             }
@@ -308,7 +308,7 @@ void manualContourBaseControler::MouseClickRight(int x, int y)
 //             _state=0;
 //     }
        SetEditable( false );
-       SetPosibleToMove( false );
+       SetPossibleToMove( false );
        _state = 0;
 //EED 24Avril2009      _state=7;
 }
@@ -323,11 +323,11 @@ void manualContourBaseControler::MouseReleaseLeft(int x, int y)
     if ((_state!=7) && (_state!=8))
     {
         SetMoving( false );
-        GetManualViewBaseContour()->SelectPosibleContour(x,y,GetZ());
-        if( GetIfCompleteCreation() && IsEditable() && !GetManualViewBaseContour()->GetPosibleSelected() && (GetManualViewBaseContour()->GetIdPoint(x,y,GetZ())==-1)  )
+        GetManualViewBaseContour()->SelectPossibleContour(x,y,GetZ());
+        if( GetIfCompleteCreation() && IsEditable() && !GetManualViewBaseContour()->GetPossibleSelected() && (GetManualViewBaseContour()->GetIdPoint(x,y,GetZ())==-1)  )
         {
             SetEditable( false );
-            SetPosibleToMove( false );
+            SetPossibleToMove( false );
         }
     } else {
         _state = 0;
@@ -370,9 +370,9 @@ void manualContourBaseControler::MouseDLeft(int x, int y )
        if (_state==0)
        {
                int z=GetZ();
-               /*bool temp = */ _manViewBaseCont->SelectPosibleContour(x,y,z);
-               _manViewBaseCont->SelectPosiblePoint(x,y,z);
-               if ( _manViewBaseCont->GetPosibleSelected() )
+               /*bool temp = */ _manViewBaseCont->SelectPossibleContour(x,y,z);
+               _manViewBaseCont->SelectPossiblePoint(x,y,z);
+               if ( _manViewBaseCont->GetPossibleSelected() )
                {
                        _editable = true;
                }
@@ -416,15 +416,15 @@ void manualContourBaseControler::SetEditable(  bool condition  )
 }
 
 // ----------------------------------------------------------------------------
-bool manualContourBaseControler::GetPosibleToMove()
+bool manualContourBaseControler::GetPossibleToMove()
 {
-       return _posibleToMove;
+       return _possibleToMove;
 }
 
 // ----------------------------------------------------------------------------
-void manualContourBaseControler::SetPosibleToMove( bool condition )
+void manualContourBaseControler::SetPossibleToMove( bool condition )
 {
-       _posibleToMove = condition;
+       _possibleToMove = condition;
 }
 
 // ----------------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h
index 01d3596043d6718fdcb168a25c8152a8479b8121..5fcabe033251eb893a70677009d3c3f38013d81e 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.h
@@ -103,8 +103,8 @@ public:
        int                     GetState();
        bool            IsEditable();
        virtual void    SetEditable(  bool condition  );
-       bool            GetPosibleToMove();
-       void            SetPosibleToMove(  bool condition  );
+       bool            GetPossibleToMove();
+       void            SetPossibleToMove(  bool condition  );
        bool            IsMoving();
        void            SetMoving(  bool condition  );
        void            SetCompleteCreation( bool condition );
@@ -151,7 +151,7 @@ protected:
        int                                     _z;
        int                                     _state;
        bool                            _editable;
-       bool                            _posibleToMove;
+       bool                            _possibleToMove;
        bool                            _moving;
        bool                            _created;
        bool                            _keyBoardMoving;

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourControler.cpp
index fd9ec40aca04eeb9269ee0150930627bd1cfb320..3fc8822c7aa176a72c0d152ddddb0d461b7f3aeb 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourControler.cpp
@@ -76,13 +76,11 @@ void manualContourControler::MouseClickLeft(int x, int y)
 
        // Insert a Control Point with shift+ClickLeft
        vtkRenderWindowInteractor *vtkrenderwindowinteractor = _vtkInteractorStyleBaseView->GetInteractor();
-
-    int ps = GetManualViewBaseContour()->GetPosibleSelected();
     
        if( IsEditable() )
        {
         // Insert Point with shift + click
-               if ( (_vtkInteractorStyleBaseView!=NULL) && (GetState()==0) && ( (vtkrenderwindowinteractor!=NULL) && (vtkrenderwindowinteractor->GetShiftKey()==1) )   &&  (GetManualViewBaseContour()->GetPosibleSelected()==false) &&  (GetManualViewBaseContour()->GetIdPoint(x,y,z)==-1) )
+               if ( (_vtkInteractorStyleBaseView!=NULL) && (GetState()==0) && ( (vtkrenderwindowinteractor!=NULL) && (vtkrenderwindowinteractor->GetShiftKey()==1) )   &&  (GetManualViewBaseContour()->GetPossibleSelected()==false) &&  (GetManualViewBaseContour()->GetIdPoint(x,y,z)==-1) )
                {
                        ok=true;
                        InsertPoint(x,y,z);
@@ -105,7 +103,7 @@ void manualContourControler::MouseClickLeft(int x, int y)
                }
         
                // Insert Control Points IF Contour is Selected
-               if ((GetState()==0) && GetManualViewBaseContour()->GetPosibleSelected()  && (vtkrenderwindowinteractor->GetShiftKey()==0) )
+               if ((GetState()==0) && GetManualViewBaseContour()->GetPossibleSelected()  && (vtkrenderwindowinteractor->GetShiftKey()==0) )
                {
                        ok=true;
                        InsertPoint(x,y,z);
@@ -141,11 +139,11 @@ void manualContourControler::MouseClickLeft(int x, int y)
             } // point selected
         }
        }else{
-               SetPosibleToMove( true );
-               GetManualViewBaseContour()->SetSelected( GetManualViewBaseContour()->GetPosibleSelected() );
+               SetPossibleToMove( true );
+               GetManualViewBaseContour()->SetSelected( GetManualViewBaseContour()->GetPossibleSelected() );
        } // IsEditable
 
-       if ( GetState() == 0 && GetManualViewBaseContour()->GetPosibleSelected() )
+       if ( GetState() == 0 && GetManualViewBaseContour()->GetPossibleSelected() )
        {
                SetMoving( true );
                ok=true;
@@ -165,9 +163,10 @@ void manualContourControler::MouseMove(int x, int y) // virtual
     int shiftKey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
     if (shiftKey==0)
     {
-        GetManualViewBaseContour()->SelectPosiblePoint(x,y,z);
+        GetManualViewBaseContour()->SelectPossiblePoint(x,y,z);
     }
-       GetManualViewBaseContour()->SelectPosibleContour(x,y,z);
+    
+       GetManualViewBaseContour()->SelectPossibleContour(x,y,z);
        if (GetState()==1)
     {  
         SetPoint( _bakIdPoint , x , y ,z);
@@ -175,11 +174,11 @@ void manualContourControler::MouseMove(int x, int y) // virtual
     }
        if (GetState()==5){     SetPoint( _bakIdPoint , x , y ,z); }
     if (GetState()==9){ GetManualViewBaseContour()->SetNewPositionGroupSelectedPoints( x,y,z );  }
-       if ( GetState()==6 && !IsEditable() && GetPosibleToMove() &&IsMoving() )
+       if ( GetState()==6 && !IsEditable() && GetPossibleToMove() &&IsMoving() )
        {
                GetManualViewBaseContour()->MoveContour(x,y,z);
        } // if State 6
-       if (GetState()!=7 || GetManualViewBaseContour()->GetPosibleSelected() )
+       if (GetState()!=7 || GetManualViewBaseContour()->GetPossibleSelected() )
     {
                GetManualViewBaseContour()->Refresh();
                this->_vtkInteractorStyleBaseView->SetRefresh_waiting();

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualLineControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualLineControler.cpp
index 6d5afc7fd642d1acef938bab16b4ac6812ffe234..0f42694b5dcdb50f7768ab5fa1a991614ffc257c 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualLineControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualLineControler.cpp
@@ -72,7 +72,7 @@ void manualLineControler::MouseClickLeft(int x, int y){
        } //IsEditable
        
        // move contour
-       if ((GetState()==0) && (GetManualViewBaseContour()->GetPosibleSelected()==true))        { 
+       if ((GetState()==0) && (GetManualViewBaseContour()->GetPossibleSelected()==true))       { 
                GetManualViewBaseContour()->InitMove(x,y,z);
                SetState(6);
        }
@@ -111,8 +111,8 @@ void manualLineControler::MouseMove(int x, int y) // virtual
 {
        int z=GetZ();
 
-       GetManualViewBaseContour()->SelectPosibleContour(x,y,z);
-       GetManualViewBaseContour()->SelectPosiblePoint(x,y,z);
+       GetManualViewBaseContour()->SelectPossibleContour(x,y,z);
+       GetManualViewBaseContour()->SelectPossiblePoint(x,y,z);
 
        if (GetState()==1) { SetPoint( bakIdPoint , x , y ,z); }
        if (GetState()==5) { SetPoint( bakIdPoint , x , y ,z); }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualRoiControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualRoiControler.cpp
index 19115fb287394016ebb2a7279eda7bc812ae8a13..97c17a565a949a960bb7a0f3f52138c2243b3f56 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualRoiControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualRoiControler.cpp
@@ -76,7 +76,7 @@ void manualRoiControler::MouseClickLeft(int x, int y){
        } // IsEditable
 
        // Move contour
-       if ((GetState()==0) && (GetManualViewBaseContour()->GetPosibleSelected()==true))        {
+       if ((GetState()==0) && (GetManualViewBaseContour()->GetPossibleSelected()==true))       {
                GetManualViewBaseContour()->InitMove(x,y,z);
                SetState(6);
        }
@@ -125,8 +125,8 @@ void manualRoiControler::MouseMove(int x, int y) // virtual
 //     this->_vtkInteractorStyleBaseView->
 
 
-       GetManualViewBaseContour()->SelectPosibleContour(x,y,z);
-       GetManualViewBaseContour()->SelectPosiblePoint(x,y,z);
+       GetManualViewBaseContour()->SelectPossibleContour(x,y,z);
+       GetManualViewBaseContour()->SelectPossiblePoint(x,y,z);
 
 
        if ( (GetState()==5) || (GetState()==1) ){

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualRotationToolControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualRotationToolControler.cpp
index f78d6d53d4d4a137ab5a9906b88cb596236a69d1..ac5c24ae85ca1b729b76542598c76db30fe3b1c3 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualRotationToolControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualRotationToolControler.cpp
@@ -80,7 +80,7 @@ void manualRotationToolControler::MouseClickLeft(int x, int y)
        }// IsEditable
        
        // move contour
-       if ((GetState()==0) && (GetManualViewBaseContour()->GetPosibleSelected()==true))        {
+       if ((GetState()==0) && (GetManualViewBaseContour()->GetPossibleSelected()==true))       {
                GetManualViewBaseContour()->InitMove(x,y,z);
                SetState(6);
        }
@@ -105,8 +105,8 @@ void manualRotationToolControler::MouseMove(int x, int y) // virtual
 {
        int z=GetZ();
 
-       GetManualViewBaseContour()->SelectPosibleContour(x,y,z);
-       GetManualViewBaseContour()->SelectPosiblePoint(x,y,z);
+       GetManualViewBaseContour()->SelectPossibleContour(x,y,z);
+       GetManualViewBaseContour()->SelectPossiblePoint(x,y,z);
 
        if (GetState()==1){     SetPoint( bakIdPoint , x , y ,z); }
        if (GetState()==5){     SetPoint( bakIdPoint , x , y ,z); }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3DContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3DContour.cpp
index c54f2c947dd774f2420c46d78c14adbb18a4b7af..0e89380c58978981a8864aeec44d63e0829c356f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3DContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3DContour.cpp
@@ -109,13 +109,13 @@ int manualView3DContour::GetIdPoint2(int x, int y)
        return id;
 }
 // ----------------------------------------------------------------------------
-int manualView3DContour::SelectPosiblePoint ( int x, int y, int z )// virtual
+int manualView3DContour::SelectPossiblePoint ( int x, int y, int z )// virtual
 {
        SelectAllPossibleSelected(false);
        int id=GetIdPoint2(x,y);
        if (id!=-1)
        {
-               SetPointPosibleSelected(id,true);
+               SetPointPossibleSelected(id,true);
        }
        return id;
 }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3DContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3DContour.h
index 7d3fd17f255d130cf69b2934c1d7fb550cd0b360..dd60a6e72629e507ff97331f2768f297ef380020 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3DContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3DContour.h
@@ -44,7 +44,7 @@ public:
        virtual void    TransfromCoordViewWorld(double &X, double &Y, double &Z, int type);
                        void    SetVtkMPRBaseData(vtkMPRBaseData *vtkmprbasedata);
 
-       virtual int             SelectPosiblePoint ( int x, int y, int z );     
+       virtual int             SelectPossiblePoint ( int x, int y, int z );    
                        void    SetDimensions(int w, int h, int d);
 
                        int             GetIdPoint2(int x, int y);

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
index cf42458b80f5f2cbf8fde08c76dd4bf94102a5ea..eed4e2caec4629847466c1ef9e38f458198f979b 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.cpp
@@ -37,7 +37,7 @@ manualViewBaseContour::manualViewBaseContour()
        _manContModel           = NULL;
        _wxvtkbaseview          = NULL;
        _selected                       = false;
-       _posibleSelected        = false;
+       _possibleSelected       = false;
        _viewControlPoints      = false;
        _pts                            = NULL;
        _pd                                     = NULL;
@@ -146,7 +146,7 @@ void manualViewBaseContour::CopyAttributesTo( manualViewBaseContour * cloneObjec
 
        cloneObject-> SetWxVtkBaseView( this->_wxvtkbaseview );
        cloneObject-> SetSelected( this->GetSelected() );
-       cloneObject-> SetPosibleSelected( this->GetPosibleSelected() );
+       cloneObject-> SetPossibleSelected( this->GetPossibleSelected() );
        cloneObject-> SetIfViewControlPoints( this->GetIfViewControlPoints() );
        cloneObject-> SetRange( this->GetRange() );
        cloneObject-> SetZ( this->GetZ() );
@@ -478,9 +478,9 @@ void manualViewBaseContour::SetSelected(bool selected)
     
 }
 // ----------------------------------------------------------------------------
-void manualViewBaseContour::SetPosibleSelected(bool posibleSelected)
+void manualViewBaseContour::SetPossibleSelected(bool possibleSelected)
 {
-       _posibleSelected=posibleSelected;
+       _possibleSelected = possibleSelected;
 }
 
 // ----------------------------------------------------------------------------
@@ -502,9 +502,9 @@ bool manualViewBaseContour::GetSelected()
 }
 
 // ----------------------------------------------------------------------------
-bool manualViewBaseContour::GetPosibleSelected()
+bool manualViewBaseContour::GetPossibleSelected()
 {
-       return _posibleSelected;
+       return _possibleSelected;
 }
 
 // ----------------------------------------------------------------------------
@@ -585,9 +585,9 @@ bool manualViewBaseContour:: GetIfViewControlPoints()
 }
 
 // ----------------------------------------------------------------------------
-void manualViewBaseContour::SetPointPosibleSelected(int id,bool select)
+void manualViewBaseContour::SetPointPossibleSelected(int id,bool select)
 {
-       _lstViewPoints[id]->SetPosibleSelected(select);
+       _lstViewPoints[id]->SetPossibleSelected(select);
 }
 
 // ----------------------------------------------------------------------------
@@ -601,42 +601,42 @@ void manualViewBaseContour::SelectAllPossibleSelected(bool select)
 {
        int i,size=_lstViewPoints.size();
        for (i=0;i<size;i++){
-               SetPointPosibleSelected(i,select);
+               SetPointPossibleSelected(i,select);
        }
 }
 
 // ----------------------------------------------------------------------------
-int manualViewBaseContour::SelectPosiblePoint(int x, int y, int z)  // virtual
+int manualViewBaseContour::SelectPossiblePoint(int x, int y, int z)  // virtual
 {
        SelectAllPossibleSelected(false);
 
     int id = GetIdPoint(x,y,z);
        if (id!=-1)
        {
-               SetPointPosibleSelected(id,true);
+               SetPointPossibleSelected(id,true);
        }
        return id;
 }
 
 // ----------------------------------------------------------------------------
-bool manualViewBaseContour::SelectPosibleContour(int x, int y, int z)
+bool manualViewBaseContour::SelectPossibleContour(int x, int y, int z)
 {
        bool result=false;
-       SetPosibleSelected(result);
+       SetPossibleSelected(result);
     int id = GetIdPoint(x,y,z);
 
 /* EED 2023-07-29
     if( !GetEditable() && !_selected && id!= -1)
        {
                result           = true;
-               _posibleSelected = true;
+               _possibleSelected = true;
        }else{
         if ( (GetEditable()==true) && (id==-1 ) && (this->_lstViewPoints.size()>=2) )
                {
                        if (ifTouchContour(x,y,z)==true)
                        {
                                result = true;
-                               SetPosibleSelected(result);
+                               SetPossibleSelected(result);
                        } // ifTouchContour
                }
                if (GetEditable()==false)
@@ -644,7 +644,7 @@ bool manualViewBaseContour::SelectPosibleContour(int x, int y, int z)
                        if (ifTouchContour(x,y,z)==true)
                        {
                                result = true;
-                               SetPosibleSelected(result);
+                               SetPossibleSelected(result);
                        } // ifTouchContor
                } // if GetEditable
        } // if !GetEditable() && !_selected && id!= -1
@@ -656,7 +656,7 @@ bool manualViewBaseContour::SelectPosibleContour(int x, int y, int z)
                 if (ifTouchContour(x,y,z)==true)
                 {
                     result = true;
-                    SetPosibleSelected(result);
+                    SetPossibleSelected(result);
                 } // ifTouchContour
             }
             if (GetEditable()==false)
@@ -664,7 +664,7 @@ bool manualViewBaseContour::SelectPosibleContour(int x, int y, int z)
                 if (ifTouchContour(x,y,z)==true)
                 {
                     result = true;
-                    SetPosibleSelected(result);
+                    SetPossibleSelected(result);
                 } // ifTouchContor
             } // if GetEditable
     
@@ -845,14 +845,28 @@ void manualViewBaseContour::UpdateColorActor()
        {
                _contourVtkActor->GetProperty()->SetLineWidth( _widthline );
                _contourVtkActor->GetProperty()->SetDiffuseColor( _coulorNormal_r , _coulorNormal_g , _coulorNormal_b );
-               if (_posibleSelected || (_posibleSelected && GetEditable() ) )
+        /*
+               if (_possibleSelected || (_possibleSelected && GetEditable() ) )
                {
                        _contourVtkActor->GetProperty()->SetDiffuseColor( _coulorEdit_r , _coulorEdit_g , _coulorEdit_b );
                }
+*/
+        if ( GetEditable()  )
+        {
+            _contourVtkActor->GetProperty()->SetDiffuseColor( _coulorEdit_r , _coulorEdit_g , _coulorEdit_b );
+        }
+
+        
                if( _selected )
                {
                        _contourVtkActor->GetProperty()->SetDiffuseColor( _coulorSelection_r , _coulorSelection_g , _coulorSelection_b );
                }
+        
+        if (_possibleSelected  )
+        {
+            _contourVtkActor->GetProperty()->SetDiffuseColor( _coulorEdit_r+0.25 , _coulorEdit_g+0.25 , _coulorEdit_b+0.25 );
+        }
+
        }
 }
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
index 83726938aa5cec7d4656c3a5ec7c4867dacb117c..f7fab5c1dbfc6145f72fc1c5ec6e1ee0634deea7 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewBaseContour.h
@@ -89,12 +89,12 @@ public:
        virtual void    UpdateViewPoint(int id);
        virtual void    UpdateViewPoints();
        void            SetSelected(bool selected);
-       void            SetPosibleSelected(bool posibleSelected);
+       void            SetPossibleSelected(bool possibleSelected);
     void            SetGroupSelectedPoint(int i, bool select);
     void            SetAllGroupSelectedPoint(bool select);
 
        bool            GetSelected();
-       bool            GetPosibleSelected();
+       bool            GetPossibleSelected();
     bool            GetGroupSelectedPoint(int i);
 
     void               DeleteSelectedPoints();
@@ -104,11 +104,11 @@ public:
        void            SelectPoint(int i,bool select);
        void            SelectLstPoints();
        void            SelectAllPoints(bool select);
-       virtual int             SelectPosiblePoint(int x, int y ,int z);
-       bool            SelectPosibleContour(int x, int y ,int z);
+       virtual int             SelectPossiblePoint(int x, int y ,int z);
+       bool            SelectPossibleContour(int x, int y ,int z);
        void            SelectAllPossibleSelected(bool select);
        void            SetPointSelected(int id,bool select);
-       void            SetPointPosibleSelected(int id,bool select);
+       void            SetPointPossibleSelected(int id,bool select);
        void            SetIfViewControlPoints(bool ifShow);
        bool            GetIfViewControlPoints();
        void            UnSelectPoint(int i);
@@ -229,7 +229,7 @@ protected:
        //
        bool                                                            _selected;
        bool                                                            *_editable;
-       bool                                                            _posibleSelected;
+       bool                                                            _possibleSelected;
        bool                                                            _viewControlPoints;
 
        // text

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
index 43ef14a183bb076dc6cff18d71110ab54ca7aced..df25e30ec60e08b9c980fb7a64fcb4485affc94a 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
@@ -267,7 +267,7 @@ void manualViewContour::RefreshText()  // virtual
                        int i;
                        for (i=0; i<size; i++)
                        {
-                               if (_lstViewPoints[i]->GetPosibleSelected()==true)
+                               if (_lstViewPoints[i]->GetPossibleSelected()==true)
                                {
                                        _id_viewPoint_for_text = i;
                                } // if
@@ -287,6 +287,41 @@ void manualViewContour::RefreshText()  // virtual
        }
 }
 
+
+#define _VECTOR_SUB( a ,b ,r )  \
+    r[0] = a[0]-b[0];           \
+    r[1] = a[1]-b[1];           \
+    r[2] = a[2]-b[2];
+
+#define _VECTOR_MODULE( a )   sqrt(a[0]*a[0] + a[1]*a[1] + a[2]*a[2] )
+
+#define _VECTOR_DOT( a , b )  a[0]*b[0] + a[1]*b[1] + a[2]*b[2]
+
+#define _VECTOR_CROSS( a ,b ,r )        \
+    r[0] = a[1] * b[2] - a[2] * b[1];   \
+    r[1] = a[2] * b[0] - a[0] * b[2];   \
+    r[2] = a[0] * b[1] - a[1] * b[0];
+
+
+double _distanceToSegment( double v[3], double a[3], double b[3] )
+{
+    // https://www.geeksforgeeks.org/program-dot-product-cross-product-two-vector/
+
+    double ab[3];   _VECTOR_SUB(b,a, ab )
+    double av[3];   _VECTOR_SUB(v,a, av )
+    if (_VECTOR_DOT(av,ab) <= 0.0)                  // Point is lagging behind start of the segment, so perpendicular distance is not viable.
+    {
+      return _VECTOR_MODULE(av) ;                   // Use distance to start of segment instead.
+    }
+    double bv[3];   _VECTOR_SUB(v,b,bv )
+    if (_VECTOR_DOT(bv,ab) >= 0.0)                  // Point is advanced past the end of the segment, so perpendicular distance is not viable.
+    {
+        return _VECTOR_MODULE(bv) ;                 // Use distance to end of the segment instead.
+    }
+    double c[3];    _VECTOR_CROSS(ab,av,c);
+    return _VECTOR_MODULE(c) / _VECTOR_MODULE(ab);  // Perpendicular distance of point to segment.
+}
+
 // ----------------------------------------------------------------------------
 bool manualViewContour::ifTouchContour(int x,int y,int z)
 {
@@ -296,50 +331,59 @@ bool manualViewContour::ifTouchContour(int x,int y,int z)
        double zz       = z;
        double ppA[3];
        double ppB[3];
+    double pp[3];
        double d1,d2,d3;
        TransfromCoordViewWorld(xx,yy,zz);
 //EED 27 sep 2006
        xx = xx * _spc[0];
        yy = yy * _spc[1];
        zz = zz * _spc[2];
-       if ( (xx>=_minX) &&  (yy>=_minY) && (xx<=_maxX) && (yy<=_maxY)) 
+    pp[0]=xx;
+    pp[1]=yy;
+    pp[2]=zz;
+       if ( (xx>=_minX) &&  (yy>=_minY) && (xx<=_maxX) && (yy<=_maxY))
        {  // inside the boundaring box
+        double dirVec[3];
+        double num;
+        double k;
+        double den;
+        double projX;
+        double projY;
+        double projZ;
                if ( ShowLineVersion()==true )
                {
                        _pts->GetPoint(0, ppA);
                        _pts->GetPoint(1, ppB);
-                       double dirVec[3];
                        // direction of the segment
             dirVec[0] = ppB[0] - ppA[0];
             dirVec[1] = ppB[1] - ppA[1];
             dirVec[2] = ppB[2] - ppA[2];
                        // proj = mpA + k*dirVec
-                       double num;
-                       double den = 0.0 ;
+                       den = 0.0 ;
 
                        num     = dirVec[0]*( xx-ppA[0] );
                        num     = num + dirVec[1]*( yy-ppA[1] );
                        num     = num + dirVec[2]*( zz-ppA[2] );
 
                        den=dirVec[0]*dirVec[0] + dirVec[1]*dirVec[1] + dirVec[2]*dirVec[2];
-                       double k;
-                       if (den!=0) 
+                       if (den!=0)
                        {
                                k = num/den;
                        } else {
                                k = 99999999;
                        }
                        // projection of th point xx,yy,zz  in segment mpA,mpB
-                       double projX = ppA[0] + k*dirVec[0];
-                       double projY = ppA[1] + k*dirVec[1];
-                       double projZ = ppA[2] + k*dirVec[2];
+                       projX = ppA[0] + k*dirVec[0];
+                       projY = ppA[1] + k*dirVec[1];
+                       projZ = ppA[2] + k*dirVec[2];
 
                        // distance [projX,projY,projZ]   and   (xx,yy,zz]
-                       double d1= sqrt(  (projX-xx)*(projX-xx) + (projY-yy)*(projY-yy) +(projZ-zz)*(projZ-zz) );
+            d1 = sqrt(  (projX-xx)*(projX-xx) + (projY-yy)*(projY-yy) +(projZ-zz)*(projZ-zz) );
                        if (d1<=1)
                        { 
                                result=true;
                        } // if d1
+            
                } else {
                        unsigned int i, nps,nps_t;
                        nps       = _sizePointsContour;
@@ -349,23 +393,74 @@ bool manualViewContour::ifTouchContour(int x,int y,int z)
                        } else {
                                nps_t = nps-1;
                        } // if close
-                       for( i = 0; i < nps_t; i++ ) 
+
+                       for( i = 0; i < nps_t; i++ )
                        {
                                _pts->GetPoint(i%nps, ppA);
                                _pts->GetPoint((i+1)%nps, ppB);
+
+                /* V1 working but not proportional distance throw al contour
                                d1 = sqrt( (ppA[0]-xx)*(ppA[0]-xx) + (ppA[1]-yy)*(ppA[1]-yy) + (ppA[2]-zz)*(ppA[2]-zz));
                                d2 = sqrt( (ppB[0]-xx)*(ppB[0]-xx) + (ppB[1]-yy)*(ppB[1]-yy) + (ppB[2]-zz)*(ppB[2]-zz));
                                d3 = sqrt( (ppB[0]-ppA[0])*(ppB[0]-ppA[0]) + (ppB[1]-ppA[1])*(ppB[1]-ppA[1]) + (ppB[2]-ppA[2])*(ppB[2]-ppA[2]));
-                               if (  ((d1+d2)>=d3) &&  ((d1+d2)<=d3*3.3) )
+                               if (  ((d1+d2)>=d3) &&  ((d1+d2)<=d3*1.1) )
                                {
+                    printf("EED  manualViewContour::ifTouchContour flag 3\n" );
                                        result  = true;
                                        i               = nps;
                                } // if
                 if (  (d1<0.75*_spc[0]) ||  (d2<0.75*_spc[0]) )
                 {
+                    printf("EED  manualViewContour::ifTouchContour flag 4\n" );
                     result    = true;
                     i        = nps;
                 } // if
+                */
+
+                /* V2 not working
+                
+                // direction of the segment
+                dirVec[0] = ppB[0] - ppA[0];
+                dirVec[1] = ppB[1] - ppA[1];
+                dirVec[2] = ppB[2] - ppA[2];
+                // proj = mpA + k*dirVec
+                den = 0.0 ;
+
+                num    = dirVec[0]*( xx-ppA[0] );
+                num    = num + dirVec[1]*( yy-ppA[1] );
+                num    = num + dirVec[2]*( zz-ppA[2] );
+
+                den=dirVec[0]*dirVec[0] + dirVec[1]*dirVec[1] + dirVec[2]*dirVec[2];
+                if (den!=0)
+                {
+                    k = num/den;
+                } else {
+                    k = 99999999;
+                }
+                // projection of th point xx,yy,zz  in segment mpA,mpB
+                projX = ppA[0] + k*dirVec[0];
+                projY = ppA[1] + k*dirVec[1];
+                projZ = ppA[2] + k*dirVec[2];
+
+                // distance [projX,projY,projZ]   and   (xx,yy,zz]
+                d1 = sqrt(  (projX-xx)*(projX-xx) + (projY-yy)*(projY-yy) +(projZ-zz)*(projZ-zz) );
+                
+                printf("EED  manualViewContour::ifTouchContour flag 2 %d    point=%f %f %f    d1=%f\n", nps_t , xx,yy,zz, d1);
+                printf("EED  A=%f %f %f     B=%f %f %f\n", ppA[0], ppA[1], ppA[2], ppB[0],ppB[1],ppB[2]  );
+
+                if (d1<=1)
+                {
+                    result   = true;
+                    i        = nps;
+                } // if d1
+*/
+                // V3 ok in mathematical point of view. Missing optimization c++
+                if ( _distanceToSegment(pp,ppA,ppB) <=1 )
+                {
+                    result   = true;
+                    i        = nps;
+                }
+                 
                        } // for i
                } // if GetSizeLstPoints()==2
        } // if min max

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.cpp
index 79bd5ab46cf1142a803754942064619cc57df730..09e9c8ace1b56c9f02832273a291f11b096d1a9d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.cpp
@@ -28,7 +28,7 @@
 // ----------------------------------------------------------------------------
 manualViewPoint::manualViewPoint(wxVtkBaseView *wxvtkbaseview){
        _selected                = false;
-       _posibleSelected = false;
+       _possibleSelected = false;
     _groupSelected   = false;
        _pts                     = NULL;
        _pd                              = NULL;
@@ -45,9 +45,9 @@ manualViewPoint::manualViewPoint(wxVtkBaseView *wxvtkbaseview){
        _colorNormal_g = 0.0;
        _colorNormal_b = 0.0;
 
-       _colorPosibleSelected_r = 1.0;
-       _colorPosibleSelected_g = 1.0;
-       _colorPosibleSelected_b = 0.0;
+       _colorPossibleSelected_r = 1.0;
+       _colorPossibleSelected_g = 1.0;
+       _colorPossibleSelected_b = 0.0;
 
 }
 // ----------------------------------------------------------------------------
@@ -69,7 +69,7 @@ manualViewPoint * manualViewPoint :: Clone()
 void manualViewPoint::CopyAttributesTo( manualViewPoint * cloneObject)
 {
        // Fathers object
-       cloneObject->SetPosibleSelected(_posibleSelected);
+       cloneObject->SetPossibleSelected(_possibleSelected);
        cloneObject->SetSelected(_selected);
        cloneObject->SetSpacing(_spc);
        cloneObject->SetWidthLine(_widthline);
@@ -87,9 +87,9 @@ void manualViewPoint::SetSelected(bool selected){
 }
 
 // ----------------------------------------------------------------------------
-void manualViewPoint::SetPosibleSelected(bool posibleSelected)
+void manualViewPoint::SetPossibleSelected(bool possibleSelected)
 {
-       _posibleSelected = posibleSelected;
+       _possibleSelected = possibleSelected;
 }
 
 // ----------------------------------------------------------------------------
@@ -112,8 +112,8 @@ bool manualViewPoint::GetSelected(){
 }
 
 // ----------------------------------------------------------------------------
-bool manualViewPoint::GetPosibleSelected(){
-       return _posibleSelected;
+bool manualViewPoint::GetPossibleSelected(){
+       return _possibleSelected;
 }
 
 // ----------------------------------------------------------------------------
@@ -235,14 +235,14 @@ void manualViewPoint::UpdateColorActor()
 //EED03
                _pointVtkActor->GetProperty()->SetLineWidth( _widthline );
                _pointVtkActor->GetProperty()->SetDiffuseColor(_colorNormal_r,_colorNormal_g,_colorNormal_b);
-               if (_posibleSelected==true)
+               if (_possibleSelected==true)
         {
-                       _pointVtkActor->GetProperty()->SetDiffuseColor(_colorPosibleSelected_r,_colorPosibleSelected_g,_colorPosibleSelected_b);
-               }  // if _posibleSelected
+                       _pointVtkActor->GetProperty()->SetDiffuseColor(_colorPossibleSelected_r,_colorPossibleSelected_g,_colorPossibleSelected_b);
+               }  // if _possibleSelected
 // EED 2024-10-25
         if (_groupSelected==true)
         {
-            _pointVtkActor->GetProperty()->SetDiffuseColor(_colorPosibleSelected_r,_colorPosibleSelected_g,_colorPosibleSelected_b);
+            _pointVtkActor->GetProperty()->SetDiffuseColor(_colorPossibleSelected_r,_colorPossibleSelected_g,_colorPossibleSelected_b);
         }  // if  _groupSelected
        } // if _pointVtkActor
 }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.h
index 5943aa002f9065e36e09e2c240d071ecb4ca9bd6..e6ec68867475f879e952fca21eed14c122f2c611 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.h
@@ -61,10 +61,10 @@ public:
        virtual     manualViewPoint * Clone();
        void        CopyAttributesTo( manualViewPoint *cloneObject );
        void            SetSelected(bool selected);
-       void            SetPosibleSelected(bool posibleSelected);
+       void            SetPossibleSelected(bool possibleSelected);
     void        SetGroupSelected(bool groupSelected);
     bool        GetSelected();
-       bool            GetPosibleSelected();
+       bool            GetPossibleSelected();
     bool        GetGroupSelected();
        void            DeleteVtkObjects();
        vtkActor*       CreateVtkPointActor();
@@ -106,7 +106,7 @@ private:
        // Is point selected
        //
        bool                            _selected;      
-       bool                            _posibleSelected;
+       bool                            _possibleSelected;
     bool                _groupSelected;
        
        vtkPoints                       *_pts;
@@ -147,10 +147,10 @@ protected:
        double                          _colorNormal_g;
        double                          _colorNormal_b;
 
-       // Posible selected point color
-       double                          _colorPosibleSelected_r;
-       double                          _colorPosibleSelected_g;
-       double                          _colorPosibleSelected_b;
+       // Possible selected point color
+       double                          _colorPossibleSelected_r;
+       double                          _colorPossibleSelected_g;
+       double                          _colorPossibleSelected_b;
 };
 
 #endif // manualViewPoint_h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoints.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoints.cpp
index f908f68e0d1adc0d60354ea5be9974068413a6b3..41856bfe7b8817be5735b21a713c0e88e5370541 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoints.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoints.cpp
@@ -145,7 +145,7 @@ void manualViewPoints::RefreshContour()  // VIRTUAL
                vtkActor *_pointVtkActor = mv->GetVtkActor();
 
                _pointVtkActor->GetProperty()->SetDiffuseColor( _coulorNormal_r , _coulorNormal_g , _coulorNormal_b );
-               if (_posibleSelected || (_posibleSelected && GetEditable() ) )
+               if (_possibleSelected || (_possibleSelected && GetEditable() ) )
                {
                        _pointVtkActor->GetProperty()->SetDiffuseColor( _coulorEdit_r , _coulorEdit_g , _coulorEdit_b );
                }

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx
index aeea9babb0ec4e4340eaaf0384e42dd9dd105d55..89510311d98ae8d5518f8c3ec7de07b963336fbf 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.cxx
@@ -368,7 +368,7 @@ pColorBar :: ~pColorBar()
 
                        dc.Blit(deviceStart_x, deviceStart_y, bar_width/*-deviceEndMargin*/, bar_height, &temp_dc, 0, 0);
 
-                       // Bitmap for posible needed information to be shown
+                       // Bitmap for possible needed information to be shown
                        /*
                        temp_dc.SelectObject( * information_Bitmap );
                        dc.Blit(0,bar_height, width, height, &temp_dc, 0, height);
@@ -382,7 +382,7 @@ pColorBar :: ~pColorBar()
 //                     dc.Blit(deviceStart_y,deviceStart_x, bar_height+deviceStart_y, bar_width+deviceStart_x, &temp_dc, deviceStart_y, deviceStart_x);        
                        
                        dc.Blit(deviceStart_y,deviceStart_x, bar_height, bar_width-deviceEndMargin, &temp_dc, 0, 0);                            
-                       // Bitmap for posible needed information to be shown
+                       // Bitmap for possible needed information to be shown
                        /*
                        temp_dc.SelectObject( * information_Bitmap );
                        dc.Blit(0,bar_width, height, width, &temp_dc, 0, width );
@@ -562,17 +562,17 @@ pColorBar :: ~pColorBar()
                {
                        bool addedPoint = false;
                        wxPoint point = event.GetPosition();
-                       bool posiblePoint = false;
+                       bool possiblePoint = false;
                        if( getOrientation() )
                        {
-                               posiblePoint = point.x>=deviceStart_x && point.y<= (bar_height + deviceStart_y);
+                               possiblePoint = point.x>=deviceStart_x && point.y<= (bar_height + deviceStart_y);
                        }
                        else
                        {
-                               posiblePoint = point.x>=deviceStart_y && point.x<= (bar_height+deviceStart_y) && point.y>deviceStart_x;
+                               possiblePoint = point.x>=deviceStart_y && point.x<= (bar_height+deviceStart_y) && point.y>deviceStart_x;
                        }
 
-                       if (posiblePoint)
+                       if (possiblePoint)
                        {
                                double real_x = getOrientation() ? convertToRealValue( point.x ) : convertToRealValue( point.y );
                                wxColour selectedColor = getSelectedColour();
@@ -1112,7 +1112,7 @@ pColorBar :: ~pColorBar()
                _logicalBar->clearPoints();
                showedColorPoints.clear();
                _logicalBar->setColorPoints(_points);
-               //posible needed to update
+               //possible needed to update
        }
 
        /**

diff --git a/lib/maracasVisuLib/src/kernel/include/vtkOtsu.cxx b/lib/maracasVisuLib/src/kernel/include/vtkOtsu.cxx
index 0688758e01aa85e0778b382d002701aa0eead1f9..35ad64aaf7a33815792ef273638de9ce24ef8f29 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/include/vtkOtsu.cxx
+++ b/lib/maracasVisuLib/src/kernel/include/vtkOtsu.cxx
@@ -99,7 +99,7 @@
                }
 
 
-               //calcular criterio para cada posible threshold e ir seleccionando el maximo
+               //calcular criterio para cada ossible threshold e ir seleccionando el maximo
            int optimalThreshold = 0;
                double optimalCriteria = 0.0;