Fix for the bug #45: check and warning when the same image is used in 2 arguments.

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

diff --git a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
index 8f9519006ede54a7c9ceaf398bd9369b4a63e14f..a9a9cf2cdeb0a2280f2744e85ed1fe1c3ad9af33 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
@@ -94,14 +94,14 @@ void HYDROGUI_ProfileOp::startOperation()
     CurveCreator::Coordinates aCurveCoords;
     CurveCreator::SectionsMap aSectionsMap;
 
-    HYDROData_Profile::ProfilePoints aSectPointsList = myEditedObject->GetProfilePoints();
+    HYDROData_ProfileUZ::PointsList aSectPointsList = myEditedObject->GetParametricPoints();
     CurveCreator::PosPointsList aPoints;
     for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k )
     {
-      const HYDROData_Profile::ProfilePoint& aSectPoint = aSectPointsList.Value( k );
+      const HYDROData_ProfileUZ::Point& aSectPoint = aSectPointsList.Value( k );
       aCurveCoords.clear();
       aCurveCoords.push_back( aSectPoint.X() );
-      aCurveCoords.push_back( aSectPoint.Z() );
+      aCurveCoords.push_back( aSectPoint.Y() );
 
       CurveCreator_PosPoint* aPosPoint = new CurveCreator_PosPoint( k, aCurveCoords );
       aPoints.push_back( aPosPoint );
@@ -144,34 +144,50 @@ HYDROGUI_InputPanel* HYDROGUI_ProfileOp::createInputPanel() const
 bool HYDROGUI_ProfileOp::processApply( int& theUpdateFlags,
                                         QString& theErrorMsg )
 {
-  HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
+  HYDROGUI_ProfileDlg* aPanel = ::qobject_cast<HYDROGUI_ProfileDlg*>( inputPanel() );
+  if ( !aPanel )
+    return false;
 
-  int aStudyId = module()->getStudyId();
-  bool aHasDoc = HYDROData_Document::HasDocument(aStudyId);
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( aStudyId );
-  if( aDocument.IsNull() )
+  QString aProfileName = aPanel->getProfileName().simplified();
+  if ( aProfileName.isEmpty() )
+  {
+    theErrorMsg = tr( "INCORRECT_OBJECT_NAME" );
     return false;
+  }
+
+  if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != aProfileName ) )
+  {
+    // check that there are no other objects with the same name in the document
+    Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( module(), aProfileName );
+    if( !anObject.IsNull() )
+    {
+      theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( aProfileName );
+      return false;
+    }
+  }
 
   Handle(HYDROData_Profile) aProfileObj;
   if( myIsEdit ){
     aProfileObj = myEditedObject;
   }
   else{
-    aProfileObj = Handle(HYDROData_Profile)::DownCast( aDocument->CreateObject( KIND_PROFILE ) );
-
-    //double aZValue = double( ++ZValueIncrement ) * 1e-2; // empiric value, to be revised
-    //aProfileObj->SetZValue( aZValue );
+    aProfileObj = Handle(HYDROData_Profile)::DownCast( doc()->CreateObject( KIND_PROFILE ) );
   }
 
   if( aProfileObj.IsNull() )
     return false;
 
-  QString aProfileName = aPanel->getProfileName();
   aProfileObj->SetName(aProfileName);
 
   HYDROData_ProfileUZ::PointsList aProfileParamPoints;
 
   CurveCreator::Coordinates aCurveCoords = myProfile->getPoints( 0 );
+  if ( aCurveCoords.size() <= 2 )
+  {
+    theErrorMsg = tr( "NUMBER_OF_PROFILE_POINTS_INCORRECT" );
+    return false;
+  }
+
   for ( int k = 0 ; k + 1 < aCurveCoords.size() ; k++ )
   {
     HYDROData_ProfileUZ::Point aProfileParamPoint;
@@ -184,8 +200,7 @@ bool HYDROGUI_ProfileOp::processApply( int& theUpdateFlags,
   }
   aProfileObj->SetParametricPoints( aProfileParamPoints );
 
-  if( !myIsEdit )
-    module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aProfileObj, true );
+  aProfileObj->Update();
 
   theUpdateFlags = UF_Model;
   return true;
@@ -201,7 +216,7 @@ void HYDROGUI_ProfileOp::displayPreview()
     {
       CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
       myProfile->setDisplayer( aDisplayer );
-      aDisplayer->display( myProfile->constructWire(), true );
+      aDisplayer->display( myProfile->getAISObject( true ), true );
     }
   }
 }
@@ -215,7 +230,7 @@ void HYDROGUI_ProfileOp::erasePreview()
     Handle(AIS_InteractiveContext) aCtx = aPanel->getAISContext();
     if( !aCtx.IsNull() )
     {
-      aDisplayer->erase( true );
+      aDisplayer->eraseAll( true );
     }
   }
 }