X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_PolylineOp.cxx;h=47b25a1233b9769803854985c2caa4e4ab4dbcff;hb=a88716339afd0e93e4a62bd0379c8c6eacd01ad9;hp=889a13362e7eae9e44834a5c49302c1c91246ca1;hpb=26e583f66a1d492ebe7d2cab874273697e455f8c;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
index 889a1336..47b25a12 100755
--- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
@@ -44,13 +44,15 @@
 
 #include <Precision.hxx>
 
+#include <SUIT_MessageBox.h>
+#include <SUIT_Desktop.h>
+
 //static int ZValueIncrement = 0;
 
 HYDROGUI_PolylineOp::HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool theIsEdit )
 : HYDROGUI_Operation( theModule ), 
   myIsEdit( theIsEdit ),
-  myCurve( NULL ), 
-  myViewManager( NULL )
+  myCurve( NULL )
 {
   setName( theIsEdit ? tr( "EDIT_POLYLINE" ) : tr( "CREATE_POLYLINE" ) );
 }
@@ -78,8 +80,49 @@ bool HYDROGUI_PolylineOp::deleteEnabled()
   return aPanel->deleteEnabled();
 }
 
+/**
+ * Set Z layer for the operation preview.
+ \param theLayer a layer position
+ */
+void HYDROGUI_PolylineOp::updatePreviewZLayer( int theLayer )
+{
+  HYDROGUI_Operation::updatePreviewZLayer( theLayer );
+
+  int aZLayer = getPreviewZLayer();
+  if ( aZLayer >= 0 )
+  {
+    if( getPreviewManager() )
+    {
+      if ( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() )
+      {
+        Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+        if( !aCtx.IsNull() )
+        {
+          Handle(AIS_InteractiveObject) anObject = myCurve->getAISObject( true );
+          aCtx->SetZLayer( anObject, aZLayer );
+        }
+      }
+    }
+  }
+}
+
 void HYDROGUI_PolylineOp::startOperation()
 {
+  if( myIsEdit )
+  {
+    myEditedObject = Handle(HYDROData_PolylineXY)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+    if ( !myEditedObject.IsNull() && !myEditedObject->IsEditable() )
+    {
+      // Polyline is imported from GEOM module an is not recognized as
+      // polyline or spline and exist only as shape presentation
+      SUIT_MessageBox::critical( module()->getApp()->desktop(),
+                                 tr( "POLYLINE_IS_UNEDITABLE_TLT" ),
+                                 tr( "POLYLINE_IS_UNEDITABLE_MSG" ) );
+      abort();
+      return;
+    }
+  }
+
   if( myCurve )
     delete myCurve;
 
@@ -91,12 +134,10 @@ void HYDROGUI_PolylineOp::startOperation()
   aPanel->reset();
 
   LightApp_Application* anApp = module()->getApp();
-  myViewManager =
+  OCCViewer_ViewManager* aViewManager =
     dynamic_cast<OCCViewer_ViewManager*>( anApp->getViewManager( OCCViewer_Viewer::Type(), true ) );
-  aPanel->setOCCViewer( myViewManager ? myViewManager->getOCCViewer() : 0 );
-
-  if( myIsEdit )
-    myEditedObject = Handle(HYDROData_PolylineXY)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+  aPanel->setOCCViewer( aViewManager ? aViewManager->getOCCViewer() : 0 );
+  setPreviewManager( aViewManager );
 
   QString aPolylineName;
   if( !myEditedObject.IsNull() )
@@ -250,8 +291,14 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
     }
   }
 
+  if ( !myIsEdit )
+  {
+    aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() );
+  }
+
   // Update the wire of polyline
   aPolylineObj->Update();
+  module()->setIsToUpdate( aPolylineObj );
 
   // the viewer should be release from the widget before the module update it
   // because it has an opened local context and updated presentation should not be displayed in it
@@ -263,6 +310,7 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
   // the polyline should be rebuild in all viewers, where it is displayed
   theUpdateFlags |= UF_Viewer | UF_GV_Forced;
   theUpdateFlags |= UF_OCCViewer | UF_OCC_Forced;
+  theUpdateFlags |= UF_VTKViewer;
 
   size_t anActiveViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() );
   if ( anActiveViewId == 0 )
@@ -298,14 +346,14 @@ void HYDROGUI_PolylineOp::onEditorSelectionChanged()
 
 void HYDROGUI_PolylineOp::displayPreview()
 {
-  if( myViewManager )
+  if( getPreviewManager() )
   {
-    if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
+    if( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() )
     {
       Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
       if( !aCtx.IsNull() )
       {
-        CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
+        CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx, getPreviewZLayer() );
         myCurve->setDisplayer( aDisplayer );
         aDisplayer->display( myCurve->getAISObject( true ), true );
       }
@@ -316,9 +364,9 @@ void HYDROGUI_PolylineOp::displayPreview()
 void HYDROGUI_PolylineOp::erasePreview()
 {
   CurveCreator_Displayer* aDisplayer = myCurve ? myCurve->getDisplayer() : 0;
-  if( myViewManager && aDisplayer )
+  if( getPreviewManager() && aDisplayer )
   {
-    if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
+    if( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() )
     {
       Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
       if( !aCtx.IsNull() )
@@ -327,4 +375,11 @@ void HYDROGUI_PolylineOp::erasePreview()
       }
     }
   }
+
+  setPreviewManager( NULL );
+  if ( myCurve )
+  {
+    delete myCurve;
+    myCurve = NULL;
+  }
 }