X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_PolylineOp.cxx;h=dc0d2d6b12f85d497a8e9b55ff765a7cb358faf8;hb=a1431f03eac1d1aed4203d0568d987c41ce939b3;hp=8ff209f50dfa3105db4fe141499aa21177e8c0b8;hpb=8a464e12ecf0be7b04e99307b7adb2207b470cb5;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
index 8ff209f5..dc0d2d6b 100755
--- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
@@ -44,6 +44,9 @@
 
 #include <Precision.hxx>
 
+#include <SUIT_MessageBox.h>
+#include <SUIT_Desktop.h>
+
 //static int ZValueIncrement = 0;
 
 HYDROGUI_PolylineOp::HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool theIsEdit )
@@ -80,6 +83,21 @@ bool HYDROGUI_PolylineOp::deleteEnabled()
 
 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;
 
@@ -95,9 +113,6 @@ void HYDROGUI_PolylineOp::startOperation()
     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() ) );
-
   QString aPolylineName;
   if( !myEditedObject.IsNull() )
   {
@@ -172,13 +187,33 @@ HYDROGUI_InputPanel* HYDROGUI_PolylineOp::createInputPanel() const
 bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
                                         QString& theErrorMsg )
 {
-  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  HYDROGUI_PolylineDlg* aPanel = ::qobject_cast<HYDROGUI_PolylineDlg*>( inputPanel() );
+  if ( !aPanel )
+    return false;
+
+  QString aPolylineName = aPanel->getPolylineName().simplified();
+  if ( aPolylineName.isEmpty() )
+  {
+    theErrorMsg = tr( "INCORRECT_OBJECT_NAME" );
+    return false;
+  }
+
+  if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != aPolylineName ) )
+  {
+    // check that there are no other objects with the same name in the document
+    Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), aPolylineName );
+    if( !anObject.IsNull() )
+    {
+      theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( aPolylineName );
+      return false;
+    }
+  }
 
-  int aStudyId = module()->getStudyId();
-  bool aHasDoc = HYDROData_Document::HasDocument(aStudyId);
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( aStudyId );
-  if( aDocument.IsNull() )
+  if ( myCurve->getNbSections() <= 0 )
+  {
+    theErrorMsg = tr( "EMPTY_POLYLINE_DATA" );
     return false;
+  }
 
   Handle(HYDROData_PolylineXY) aPolylineObj;
   if( myIsEdit )
@@ -186,18 +221,15 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
     aPolylineObj = myEditedObject;
     aPolylineObj->RemoveSections();
   }
-  else{
-    aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( aDocument->CreateObject( KIND_POLYLINEXY ) );
-
-    //double aZValue = double( ++ZValueIncrement ) * 1e-2; // empiric value, to be revised
-    //aPolylineObj->SetZValue( aZValue );
+  else
+  {
+    aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( doc()->CreateObject( KIND_POLYLINEXY ) );
   }
 
   if( aPolylineObj.IsNull() )
     return false;
 
-  QString aPolylineName = aPanel->getPolylineName();
-  aPolylineObj->SetName(aPolylineName);
+  aPolylineObj->SetName( aPolylineName );
 
   for ( int i = 0 ; i < myCurve->getNbSections() ; i++ )
   {
@@ -214,6 +246,13 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
 
     // Add the points fro section
     CurveCreator::Coordinates aCurveCoords = myCurve->getPoints( i );
+
+    if ( aCurveCoords.size() <= 2 )
+    {
+      theErrorMsg = tr( "NUMBER_OF_SECTION_POINTS_INCORRECT" );
+      return false;
+    }
+
     for ( int k = 0 ; k + 1 < aCurveCoords.size() ; k++ )
     {
       HYDROData_PolylineXY::Point aSectPoint;
@@ -226,8 +265,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
@@ -239,6 +284,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 )
@@ -264,13 +310,12 @@ void HYDROGUI_PolylineOp::onEditorSelectionChanged()
   CurveCreator_Displayer* aDisplayer = myCurve->getDisplayer();
   if( !aDisplayer )
     return;
-  QList<int> aSelSections = aPanel->getSelectedSections();
-  for( int i = 0 ; i < myCurve->getNbSections() ; i++ ){
-    bool aIsHl = false;
-    if( aSelSections.contains(i) ){
-      aDisplayer->highlight( myCurve->constructSection(i), aIsHl );
-    }
-  }
+  //QList<int> aSelSections = aPanel->getSelectedSections();
+  bool aIsHl = false;
+  //if( aSelSections.contains(i) ){
+  // TODO
+  //aDisplayer->highlight( myCurve->getAISObject(), aIsHl );
+  //}
 }
 
 void HYDROGUI_PolylineOp::displayPreview()
@@ -284,7 +329,7 @@ void HYDROGUI_PolylineOp::displayPreview()
       {
         CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
         myCurve->setDisplayer( aDisplayer );
-        aDisplayer->display( myCurve->constructWire(), true );
+        aDisplayer->display( myCurve->getAISObject( true ), true );
       }
     }
   }
@@ -300,8 +345,15 @@ void HYDROGUI_PolylineOp::erasePreview()
       Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
       if( !aCtx.IsNull() )
       {
-        aDisplayer->erase( true );
+        aDisplayer->eraseAll( true );
       }
     }
   }
+
+  myViewManager = NULL;
+  if ( myCurve )
+  {
+    delete myCurve;
+    myCurve = NULL;
+  }
 }