Coloring of objects (Bug #219).

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

diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
index bbef9e43b6fb054bd08de98c2128e009ccfb7c99..835b9d04d18f341507a19b3c81f089a00abfc57e 100755 (executable)
--- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
@@ -172,13 +172,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 +206,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 +231,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,6 +250,11 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
     }
   }
 
+  if ( !myIsEdit )
+  {
+    aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() );
+  }
+
   // Update the wire of polyline
   aPolylineObj->Update();
 
@@ -267,7 +296,8 @@ void HYDROGUI_PolylineOp::onEditorSelectionChanged()
   //QList<int> aSelSections = aPanel->getSelectedSections();
   bool aIsHl = false;
   //if( aSelSections.contains(i) ){
-    aDisplayer->highlight( myCurve->constructWire(), aIsHl );
+  // TODO
+  //aDisplayer->highlight( myCurve->getAISObject(), aIsHl );
   //}
 }
 
@@ -282,7 +312,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 );
       }
     }
   }
@@ -298,8 +328,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;
+  }
 }