From 5df5effdcd9f09c81c68fd63b1f0359593a823bd Mon Sep 17 00:00:00 2001 From: corredor <> Date: Thu, 15 Apr 2010 16:30:15 +0000 Subject: [PATCH] Necessary changes to manage the basic action . First prototype totally completed ... Even the strange movement --- .../bbsKernelEditorGraphic/GBlackBoxModel.cxx | 3 + .../bbsKernelEditorGraphic/GObjectModel.cxx | 8 + .../bbsKernelEditorGraphic/GObjectModel.h | 1 + .../bbsKernelEditorGraphic/GPortModel.cxx | 2 +- .../bbsKernelEditorGraphic/GlobalConstants.h | 8 +- .../bbsKernelEditorGraphic/Observable.cxx | 1 - .../wxVtkSceneManager.cxx | 16 +- .../GBlackBoxController.cxx | 150 ++++++++++++++++++ .../GBlackBoxController.h | 6 +- .../GObjectController.cxx | 28 +++- .../vtkGBlackBoxView.cxx | 41 +++-- .../bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h | 8 +- .../bbsVtkGUIEditorGraphic/vtkGObjectView.cxx | 10 +- .../bbsVtkGUIEditorGraphic/vtkGObjectView.h | 4 +- .../bbsVtkGUIEditorGraphic/vtkGPortView.cxx | 5 +- .../bbtkwxGUIEditorGraphicBBS.cxx | 1 - 16 files changed, 252 insertions(+), 40 deletions(-) diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBlackBoxModel.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBlackBoxModel.cxx index 876dbb0..fa165c0 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBlackBoxModel.cxx +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GBlackBoxModel.cxx @@ -125,6 +125,9 @@ namespace bbtk return temp; } + //========================================================================= + + } // EO namespace bbtk // EOF diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.cxx index d2212d4..15d0d39 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.cxx +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.cxx @@ -75,6 +75,14 @@ namespace bbtk } //========================================================================= + void GObjectModel::getCenter(double& x, double& y, double& z) + { + x = (_xInic+_xFin)/2; + y = (_yInic+_yFin)/2; + z = (_zInic+_zFin)/2; + } + //========================================================================= + void GObjectModel::setInicPoint(double& x, double& y, double& z) { _xInic = x; diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h index eefd07c..43f4591 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GObjectModel.h @@ -71,6 +71,7 @@ namespace bbtk void getInicPoint(double& x, double& y, double& z); void getFinalPoint(double& x, double& y, double& z); + void getCenter(double& x, double& y, double& z); virtual void setInicPoint(double& x, double& y, double& z); virtual void setFinalPoint(double& x, double& y, double& z); void setState(int state); diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.cxx index abb6945..8672eed 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.cxx +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GPortModel.cxx @@ -80,7 +80,7 @@ namespace bbtk posY = yFin; } - //Usually pos begins in 0 + //Variable 'pos' starts with value 0 and it represents the position of the port in the box from left to right posX = xInic + PORT_WIDTH + pos*2*PORT_WIDTH; setInicPoint(posX,posY,posZ); diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h index 06afba2..3d8d755 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h @@ -59,10 +59,10 @@ namespace bbtk const int CREATING_CONTOUR=106; // Object dimensions - const double BOX_HEIGHT=15; - const double BOX_WIDTH=100; - const double PORT_HEIGHT=3; - const double PORT_WIDTH=3; + const double BOX_HEIGHT = 15; + const double BOX_WIDTH = 100; + const double PORT_HEIGHT = 2; + const double PORT_WIDTH = 2; // Commands const int REPAINT = 201; diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.cxx index b169cc4..82c5196 100644 --- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.cxx +++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/Observable.cxx @@ -83,7 +83,6 @@ namespace bbtk void Observable::addObserver(Observer *observer) { - std::cout<<"RaC Observable::addObserver "<SetInteractorStyle(interactorstylebaseview); interactorstylebaseview->SetwxVtkBaseView(_baseView); - double posCamera[3]; _baseView->GetRenderer()->GetActiveCamera()->ParallelProjectionOn(); - _baseView->GetRenderer()->GetActiveCamera()->SetPosition(0,0,1000); - _baseView->GetRenderer()->GetActiveCamera()->GetPosition(posCamera); - _baseView->GetRenderer()->ResetCamera(); - _baseView->GetRenderer()->ResetCameraClippingRange(); + _baseView->GetRenderer()->ResetCamera(-100,100,-100,100,900,900); _baseView->GetRenderer()->SetBackground(0.9,0.9,0.9); @@ -203,7 +199,7 @@ namespace bbtk int cantObjects = _objects.size(); cantObjects++; std::stringstream stream; - stream << "Box " << cantObjects; + stream << "Box:Algo " << cantObjects; std::string arraystring = stream.str(); model->setBBTKName(arraystring); @@ -325,8 +321,8 @@ namespace bbtk manualContourControler* manContourControl = new manualContourControler(); GConnectorView* manViewerContour = new GConnectorView(); manualContourModel* manContourModel = new manualContourModel(); + manContourModel->SetCloseContour(false); - manViewerContour->SetModel( manContourModel ); manViewerContour->SetWxVtkBaseView( _baseView ); manViewerContour->SetRange( 0.5 ); @@ -340,14 +336,16 @@ namespace bbtk manContourControl->SetModelView( manContourModel , manViewerContour ); manContourControl->Configure(); int i,sizeLstPoints = manContourModel->GetSizeLstPoints(); - //std::cout<<"RaC wxVtkSceneManager::createGConnector "<AddPoint(); } manContourControl->CreateNewManualContour(); - manViewerContour->RefreshContour(); + + manViewerContour->RefreshContour(); + registerController((InteractorStyleMaracas*) manContourControl); } diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx index 7cdf253..cf4037e 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.cxx @@ -52,6 +52,156 @@ namespace bbtk } //========================================================================= + bool GBlackBoxController::OnMouseMove() + { + + if ( _vtkInteractorStyleBaseView!=NULL) + { + int X,Y; + wxVTKRenderWindowInteractor *_wxVTKiren; + _wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor(); + _wxVTKiren->GetEventPosition( X , Y ); + + int state = _model->getState(); + + //Evaluate new state + if(!_model->hasChanged() && state == DRAG) + { + moveObject(X,Y); + _model->setChanged(); + } + + if(!_model->hasChanged() && state == NOTHING_HAPPENS) + { + if(_view->isPointInside(X,Y)) + { + _model->setState(HIGHLIGHTED); + _model->setChanged(); + } + } + if(!_model->hasChanged() && state==HIGHLIGHTED) + { + if(!_view->isPointInside(X,Y)) + { + _model->setState(NOTHING_HAPPENS); + _model->setChanged(); + } + } + + _model->notifyObservers(); + } + return true; + } + + //========================================================================= + + bool GBlackBoxController::OnLeftButtonDown() + { + + if ( _vtkInteractorStyleBaseView!=NULL ) + { + int X,Y; + wxVTKRenderWindowInteractor *wxVTKiren; + wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor(); + wxVTKiren->GetEventPosition(X,Y); + + int state = _model->getState(); + + //Evaluate new state + if(!_model->hasChanged() && state==HIGHLIGHTED) + { + _view->isStartDragging(true); + _model->setState(DRAG); + _model->setChanged(); + } + + if( !_model->hasChanged() && state == SELECTED) + { + if(_view->isPointInside(X,Y)) + { + _view->isStartDragging(true); + _model->setState(DRAG); + _model->setChanged(); + } + } + + _model->notifyObservers(); + } + return true; + } + + //========================================================================= + + bool GBlackBoxController::OnLeftButtonUp() + { + if ( _vtkInteractorStyleBaseView!=NULL ) + { + int X,Y; + wxVTKRenderWindowInteractor *wxVTKiren; + wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor(); + wxVTKiren->GetEventPosition(X,Y); + + int state = _model->getState(); + + //Evaluate new state + if(!_model->hasChanged() && state==CLICKED) + { + _model->setState(SELECTED); + _model->setChanged(); + } + + if( !_model->hasChanged() && state == DRAG) + { + _model->setState(SELECTED); + _model->setChanged(); + } + + _model->notifyObservers(); + + } + return true; + } + + //========================================================================= + + bool GBlackBoxController::OnLeftDClick() + { + if ( _vtkInteractorStyleBaseView!=NULL ) + { + int X,Y; + wxVTKRenderWindowInteractor *wxVTKiren; + wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor(); + wxVTKiren->GetEventPosition(X,Y); + + _model->notifyObservers(); + } + return true; + } + + //========================================================================= + + bool GBlackBoxController::OnRightButtonDown() + { + if( _vtkInteractorStyleBaseView!= NULL ) + { + int X,Y; + wxVTKRenderWindowInteractor *wxVTKiren; + wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor(); + wxVTKiren->GetEventPosition(X, Y); + + int state = _model->getState(); + + //Evaluate new state + if( !_model->hasChanged() && state == SELECTED) + { + _model->setState(NOTHING_HAPPENS); + _model->setChanged(); + } + + _model->notifyObservers(); + } + return true; +} //========================================================================= diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.h index a908f10..b6baee4 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.h +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GBlackBoxController.h @@ -66,7 +66,11 @@ namespace bbtk ~GBlackBoxController(); //Public methods - + virtual bool OnMouseMove(); + virtual bool OnLeftButtonDown(); + virtual bool OnLeftButtonUp(); + virtual bool OnLeftDClick(); + virtual bool OnRightButtonDown(); private: diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx index 37b5de2..6b1174f 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/GObjectController.cxx @@ -62,6 +62,8 @@ namespace bbtk bool GObjectController::OnMouseMove() { + /********************** VIRTUAL *************************/ + if ( _vtkInteractorStyleBaseView!=NULL) { int X,Y; @@ -97,11 +99,15 @@ bool GObjectController::OnMouseMove() _model->notifyObservers(); } + + /**/ + return true; } //========================================================================= bool GObjectController::OnLeftButtonDown() { + /********************** VIRTUAL ************************* if ( _vtkInteractorStyleBaseView!=NULL ) { @@ -115,7 +121,7 @@ bool GObjectController::OnLeftButtonDown() //Evaluate new state if(!_model->hasChanged() && state==HIGHLIGHTED) { - _view->isFirstDragging(true); + _view->isStartDragging(true); _model->setState(DRAG); _model->setChanged(); } @@ -124,7 +130,7 @@ bool GObjectController::OnLeftButtonDown() { if(_view->isPointInside(X,Y)) { - _view->isFirstDragging(true); + _view->isStartDragging(true); _model->setState(DRAG); _model->setChanged(); } @@ -132,11 +138,17 @@ bool GObjectController::OnLeftButtonDown() _model->notifyObservers(); } + + */ + return true; } //========================================================================= bool GObjectController::OnLeftButtonUp() { + + /********************** VIRTUAL ************************* + if ( _vtkInteractorStyleBaseView!=NULL ) { int X,Y; @@ -162,11 +174,15 @@ bool GObjectController::OnLeftButtonUp() _model->notifyObservers(); } + + */ return true; } //========================================================================= bool GObjectController::OnLeftDClick() { + /********************** VIRTUAL ************************* + if ( _vtkInteractorStyleBaseView!=NULL ) { int X,Y; @@ -176,11 +192,15 @@ bool GObjectController::OnLeftDClick() _model->notifyObservers(); } + + */ return true; } //========================================================================= bool GObjectController::OnRightButtonDown() { + /********************** VIRTUAL *************************/ + if( _vtkInteractorStyleBaseView!= NULL ) { int X,Y; @@ -199,7 +219,11 @@ bool GObjectController::OnRightButtonDown() _model->notifyObservers(); } + + /**/ + return true; + } //========================================================================= diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx index a354fd7..e509662 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.cxx @@ -53,32 +53,34 @@ namespace bbtk //========================================================================= void vtkGBlackBoxView::update(int command) { + _objectActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B); + if(_model->getState()==NOTHING_HAPPENS) { _objectActor->GetProperty()->SetLineWidth(1); _objectActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B); - _nameActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B); + //_nameActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B); _typeActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B); } else if(_model->getState()==HIGHLIGHTED) { _objectActor->GetProperty()->SetLineWidth(2); _objectActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B); - _nameActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B); + //_nameActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B); _typeActor->GetProperty()->SetColor(BOXCONTOUR_HIGHLIGHTED_R,BOXCONTOUR_HIGHLIGHTED_G,BOXCONTOUR_HIGHLIGHTED_B); } else if(_model->getState()==DRAG) { _objectActor->GetProperty()->SetLineWidth(1.2); _objectActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B); - _nameActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B); + //_nameActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B); _typeActor->GetProperty()->SetColor(BOXCONTOUR_DRAG_R,BOXCONTOUR_DRAG_G,BOXCONTOUR_DRAG_B); } else if(_model->getState()==SELECTED) { _objectActor->GetProperty()->SetLineWidth(2); _objectActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B); - _nameActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B); + //_nameActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B); _typeActor->GetProperty()->SetColor(BOXCONTOUR_SELECTED_R,BOXCONTOUR_SELECTED_G,BOXCONTOUR_SELECTED_B); } @@ -99,7 +101,8 @@ namespace bbtk //----------- - _baseView->GetRenWin()->Render(); + _baseView->RefreshView(); + _baseView->Refresh(); } //========================================================================= @@ -144,6 +147,7 @@ namespace bbtk //------------ + /* _vectorNameText = vtkVectorText::New(); std::string temp = _model->getBBTKName(); _vectorNameText->SetText(temp.c_str()); @@ -152,6 +156,12 @@ namespace bbtk txtMapper->SetInputConnection( _vectorNameText->GetOutputPort()); _nameActor = vtkActor::New(); _nameActor->SetMapper(txtMapper); + */ + + _vectorNameText = vtkTextActor3D::New(); + std::string temp = _model->getBBTKName(); + _vectorNameText->SetInput( temp.c_str() ); + //------------ @@ -159,7 +169,7 @@ namespace bbtk temp = _model->getBBTKType(); _vectorTypeText->SetText(temp.c_str()); - txtMapper = vtkPolyDataMapper::New(); + vtkPolyDataMapper* txtMapper = vtkPolyDataMapper::New(); txtMapper->SetInputConnection( _vectorTypeText->GetOutputPort()); _typeActor = vtkActor::New(); _typeActor->SetMapper(txtMapper); @@ -168,7 +178,11 @@ namespace bbtk updatePositionTextActors( xInic, yInic, zInic); - _nameActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B); + //_nameActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B); + _vectorNameText->GetTextProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B); + _vectorNameText->GetTextProperty()->SetFontSize(75);//SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B); + _vectorNameText->GetTextProperty()->BoldOn(); + _vectorNameText->SetScale(0.05,0.05,1); _typeActor->GetProperty()->SetColor(BOXCONTOUR_NH_R,BOXCONTOUR_NH_G,BOXCONTOUR_NH_B); } @@ -177,7 +191,10 @@ namespace bbtk void vtkGBlackBoxView::addVtkActors()//virtual { - _baseView->GetRenderer()->AddActor(_nameActor); + //_baseView->GetRenderer()->AddActor(_nameActor); + + _baseView->GetRenderer()->AddActor(_vectorNameText); + _baseView->GetRenderer()->AddActor(_typeActor); vtkGObjectView::addVtkActors(); @@ -187,13 +204,15 @@ namespace bbtk void vtkGBlackBoxView::updatePositionTextActors(double xInic, double yInic, double zInic) { - _nameActor->SetPosition(xInic+4,yInic-5,zInic); - _nameActor->SetScale(3,2,1); + //_nameActor->SetPosition(xInic+4,yInic-5,zInic); + //_nameActor->SetScale(2,2,1); + _vectorNameText->SetPosition(xInic+4,yInic-5,zInic); _typeActor->SetPosition(xInic+4,yInic-10,zInic); - _typeActor->SetScale(3,2,1); + _typeActor->SetScale(2,2,1); } + //========================================================================= } // EO namespace bbtk diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h index 2d5ce85..8114f51 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGBlackBoxView.h @@ -57,6 +57,9 @@ Version: $Revision$ #include "vtkRenderer.h" #include "vtkCellArray.h" +#include "vtkTextActor3D.h" +#include "vtkTextProperty.h" + //Includes std #include @@ -82,7 +85,10 @@ namespace bbtk vtkPoints *_pts; vtkActor* _nameActor; vtkActor* _typeActor; - vtkVectorText* _vectorNameText; + + //vtkVectorText* _vectorNameText; + vtkTextActor3D* _vectorNameText; + vtkVectorText* _vectorTypeText; //Private Methods diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx index 98cfc85..51761e7 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.cxx @@ -45,7 +45,7 @@ namespace bbtk { _baseView=NULL; _objectActor=NULL; - _isFirstDragging=false; + _isStartDragging=false; } //========================================================================= @@ -116,9 +116,9 @@ namespace bbtk - if(_isFirstDragging) + if(_isStartDragging) { - _isFirstDragging=false; + _isStartDragging=false; double xInic,yInic,zInic; _model->getInicPoint(xInic,yInic,zInic); @@ -132,9 +132,9 @@ namespace bbtk //========================================================================= - void vtkGObjectView::isFirstDragging(bool param) + void vtkGObjectView::isStartDragging(bool param) { - _isFirstDragging=param; + _isStartDragging=param; dragDifX=0; dragDifX=0; } diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h index 97ea577..e15232f 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGObjectView.h @@ -83,12 +83,12 @@ namespace bbtk virtual void moveObject(int X, int Y); virtual void update(int command); - void isFirstDragging(bool param); + void isStartDragging(bool param); private: //Private Attributes - bool _isFirstDragging; + bool _isStartDragging; double dragDifX; double dragDifY; diff --git a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx index d6bef81..adbe0ca 100644 --- a/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx +++ b/lib/EditorGraphicBBS/bbsVtkGUIEditorGraphic/vtkGPortView.cxx @@ -53,6 +53,7 @@ namespace bbtk //========================================================================= void vtkGPortView::update(int command) { + _objectActor->GetProperty()->SetColor(0.8,0.2,0.5); if(_model->getState()==HIGHLIGHTED) { _objectActor->GetProperty()->SetColor(0.8,0.2,0.5); @@ -74,8 +75,8 @@ namespace bbtk _pts->SetPoint(2, xFin, yFin, zFin ); _pts->SetPoint(3, xFin, yInic, zFin ); - _baseView->GetRenderer()->Render(); - _baseView->GetRenWin()->Render(); + //_baseView->GetRenderer()->Render(); + //_baseView->GetRenWin()->Render(); } diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index 6049911..34a8542 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx @@ -262,7 +262,6 @@ namespace bbtk switch (event.GetId()) { case wxID_NEW : - std::cout<<"RaC New"<addNewTab(); break; } -- 2.45.1