bool GBlackBoxController::OnMouseMove()
{
-printf("EED GBlackBoxController::OnMouseMove START \n");
-
if ( _vtkInteractorStyleBaseView!=NULL)
{
int X,Y;
_objHasBeenMoved=true;
} // state
-printf("EED GBlackBoxController::OnMouseMove state=%d\n", state);
_model->notifyObservers(getId());
}
_objHasBeenMoved = false;
_isLeftClickDown = true;
bool ok=true;
+
+ int X,Y;
+ wxVTKRenderWindowInteractor *_wxVTKiren;
+ _wxVTKiren= _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
+ _wxVTKiren->GetEventPosition( X , Y );
+
+
+
int state = _view->getState();
-printf("EED GBlackBoxController::OnLeftButtonDown state=%d \n", state);
//Evaluate new state
- if(state == HIGHLIGHTED)
+
+ if(_view->isPointInside(X,Y))
+
+// if(state == HIGHLIGHTED)
//EED3oct2010 if ( (state == HIGHLIGHTED) && (ctrlkey==1 ) )
{
ok=false;
_view->setState(SELECTED);
_model->notifyObservers(getId(),ADD_TO_SELECTED);
}
-
-
-
- int X,Y;
- wxVTKRenderWindowInteractor *wxVTKiren;
- wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
- wxVTKiren->GetEventPosition(X,Y);
- int ctrlkey=_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
+
+
+ int shiftkey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
+ int ctrlkey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
+ ctrlkey = ctrlkey + shiftkey;
+
+
if ( (state==DRAG) && (ctrlkey==1) && (_view->isPointInside(X,Y)==true) )
{
_view->setState(NOTHING_HAPPENS);
_model->notifyObservers(getId(),REMOVE_FROM_SELECTED);
}
-printf("EED GBlackBoxController::OnLeftButtonDown END\n" );
-
return ok;
-
}
//=========================================================================
{
_isLeftClickDown = false;
int state = _view->getState();
-printf("EED GBlackBoxController::OnLeftButtonUp START state=%d \n", state);
//Evaluate new state
- int ctrlkey=_vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
-
+ int shiftkey = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
+ int ctrlkey = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
+ ctrlkey = ctrlkey + shiftkey;
+
+
if ( (state==SELECTED) && (ctrlkey==0) && (_objHasBeenMoved==false))
{
_view->setState(NOTHING_HAPPENS);
}
-printf("EED GBlackBoxController::OnLeftButtonUp END state=%d \n", state);
return true;
wxVTKiren = _vtkInteractorStyleBaseView->GetWxVtk3DBaseView()->GetWxVTKRenderWindowInteractor();
wxVTKiren->GetEventPosition(X,Y);
- int state = _view->getState();
+// int state = _view->getState();
//Evaluate new state
if(_view->isPointInside(X,Y))