PR: quadtree

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_TranslateObstacleOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_TranslateObstacleOp.cxx b/src/HYDROGUI/HYDROGUI_TranslateObstacleOp.cxx
index 952fe9fbdd908b91618c97751ae2687800e335b9..7275fe0a4f0158db1b0fb905489429022fb148dd 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_TranslateObstacleOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_TranslateObstacleOp.cxx
@@ -68,9 +68,6 @@ void HYDROGUI_TranslateObstacleOp::startOperation()
     abort();
     return;
   }
-  else if ( myEditedObject->IsMustBeUpdated() ) {
-    myEditedObject->Update();
-  }
 
   // Set the edited object name to the panel
   aPanel->setName( myEditedObject->GetName() );
@@ -140,14 +137,16 @@ void HYDROGUI_TranslateObstacleOp::createPreview()
   // Create preview presentation if necessary
   if ( !myPreviewPrs ) {
     LightApp_Application* anApp = module()->getApp();
-    OCCViewer_ViewManager* aViewManager = ::qobject_cast<OCCViewer_ViewManager*>( 
-      anApp->getViewManager( OCCViewer_Viewer::Type(), true ) );
-  
+
+    if ( !getPreviewManager() )
+      setPreviewManager( ::qobject_cast<OCCViewer_ViewManager*>( 
+                         anApp->getViewManager( OCCViewer_Viewer::Type(), true ) ) );
+    OCCViewer_ViewManager* aViewManager = getPreviewManager();
     if ( aViewManager ) {
       if ( OCCViewer_Viewer* aViewer = aViewManager->getOCCViewer() ) {
         Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
         if ( !aCtx.IsNull() ) {
-          myPreviewPrs = new HYDROGUI_Shape( aCtx, NULL );
+          myPreviewPrs = new HYDROGUI_Shape( aCtx, NULL, getPreviewZLayer() );
           myPreviewPrs->setFillingColor( myEditedObject->GetFillingColor(), false, false );
           myPreviewPrs->setBorderColor( myEditedObject->GetBorderColor(), false, false );
         }
@@ -182,25 +181,3 @@ void HYDROGUI_TranslateObstacleOp::onArgumentsChanged()
   createPreview();
 }
 
-TopoDS_Shape HYDROGUI_TranslateObstacleOp::getTranslatedShape() const
-{
-  TopoDS_Shape aTranslatedShape;
-
-  HYDROGUI_TranslateObstacleDlg* aPanel = (HYDROGUI_TranslateObstacleDlg*)inputPanel();
-  if ( aPanel && !myEditedObject.IsNull() ) {
-    double aDx = aPanel->getDx();
-    double aDy = aPanel->getDy();
-    double aDz = aPanel->getDz();
-
-    TopoDS_Shape aShape = myEditedObject->GetShape3D();
-    gp_Trsf aTrsf;
-    gp_Vec aVec( aDx, aDy, aDz );
-    aTrsf.SetTranslation(aVec);
-    TopLoc_Location aLocOrig = aShape.Location();
-    gp_Trsf aTrsfOrig = aLocOrig.Transformation();
-    TopLoc_Location aLocRes( aTrsf * aTrsfOrig );
-    aTranslatedShape = aShape.Located( aLocRes );
-  }
-
-  return aTranslatedShape;
-}
\ No newline at end of file