Create/edit polyline operation was updated

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

diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
index b8a6982628d80714c7d5ea23b00324176c507847..3e9d21a69e74db413b28bcc0a2b0dae200541f9b 100755 (executable)
--- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
@@ -26,13 +26,15 @@
 
 #include <HYDROData_Document.h>
 #include <HYDROData_Polyline.h>
+#include <CurveCreator_Curve.hxx>
+#include <CurveCreator_CurveEditor.hxx>
 
 #include <LightApp_Application.h>
 #include <LightApp_UpdateFlags.h>
 
 
 HYDROGUI_PolylineOp::HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool theIsEdit )
-: HYDROGUI_Operation( theModule ), myIsEdit(theIsEdit)
+: HYDROGUI_Operation( theModule ), myIsEdit(theIsEdit), myCurve(NULL)
 {
   setName( theIsEdit ? tr( "EDIT_POLYLINE" ) : tr( "CREATE_POLYLINE" ) );
 }
@@ -68,19 +70,38 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
   if( aPolylineObj.IsNull() )
     return false;
 
-  if( !myIsEdit ){
-    static int PolylineId = 0;
-    aPolylineObj->SetName( QString( "Polyline_%1" ).arg( QString::number( ++PolylineId ) ) );
+  QString aPolylineName = aPanel->getPolylineName();
+  aPolylineObj->SetName(aPolylineName);
+  int aDimInt = 3;
+  if( myCurve->getDimension() == CurveCreator::Dim2d )
+    aDimInt = 2;
+  aPolylineObj->setDimension(aDimInt);
+  QList<PolylineSection> aPolylineData;
+  for( int i=0 ; i < myCurve->getNbSections() ; i++ ){
+    PolylineSection aSect;
+    aSect.mySectionName = HYDROGUI_Tool::ToExtString( QString::fromLocal8Bit(myCurve->getSectionName(i).c_str()));
+    aSect.myIsClosed = myCurve->isClosed(i);
+    aSect.myType = PolylineSection::SECTION_POLYLINE;
+    if( myCurve->getType(i) == CurveCreator::BSpline ){
+      aSect.myType = PolylineSection::SECTION_SPLINE;
+    }
+    CurveCreator::Coordinates aCoords = myCurve->getPoints(i);
+    for( int j = 0 ; j < aCoords.size() ; j++ ){
+      aSect.myCoords << aCoords.at(j);
+    }
+    aPolylineData << aSect;
   }
+  aPolylineObj->setPolylineData(aPolylineData);
 
+  theUpdateFlags = UF_Model;
   aPolylineObj->SetVisibility( true );
-
-  theUpdateFlags = UF_Model | UF_Viewer;
   return true;
 }
 
 void HYDROGUI_PolylineOp::startOperation()
 {
+  CurveCreator_Curve* anOldCurve = myCurve;
+
   HYDROGUI_Operation::startOperation();
 
   HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
@@ -89,5 +110,38 @@ void HYDROGUI_PolylineOp::startOperation()
   myEditedObject = Handle(HYDROData_Polyline)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
   if( !myEditedObject.IsNull() )
   {
+    int anIntDim = myEditedObject->getDimension();
+    CurveCreator::Dimension aDim = CurveCreator::Dim3d;
+    if( anIntDim == 2 )
+      aDim = CurveCreator::Dim2d;
+    myCurve = new CurveCreator_Curve(aDim);
+    QList<PolylineSection> aPolylineData = myEditedObject->getPolylineData();
+
+    CurveCreator_CurveEditor* anEdit = new CurveCreator_CurveEditor(myCurve);
+    for( int i = 0 ; i < aPolylineData.size() ; i++ ){
+      std::string aName = HYDROGUI_Tool::ToQString(aPolylineData[i].mySectionName).toStdString();
+      bool isClosed = aPolylineData[i].myIsClosed;
+      CurveCreator::Type aType = CurveCreator::Polyline;
+      if( aPolylineData[i].myType == PolylineSection::SECTION_SPLINE ){
+        aType = CurveCreator::BSpline;
+      }
+      CurveCreator::Coordinates aCoords;
+      for( int j = 0 ; j < aPolylineData[i].myCoords.size() ; j++ ){
+        aCoords.push_back(aPolylineData[i].myCoords[j]);
+      }
+      anEdit->addSection( aName, aType, isClosed, aCoords );
+    }
+    delete anEdit;
+    aPanel->setPolylineName( myEditedObject->GetName() );
+
   }
-}
\ No newline at end of file
+  else{
+    myCurve = new CurveCreator_Curve(CurveCreator::Dim3d);
+    aPanel->setCurve(myCurve);
+    QString aNewName = HYDROGUI_Tool::GenerateObjectName( module(), tr("POLYLINE_PREFIX") );
+    aPanel->setPolylineName(aNewName);
+  }
+  aPanel->setCurve(myCurve);
+  if( anOldCurve )
+    delete anOldCurve;
+}