Profile object creation.

diff --git a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
index d732b05e25e959dee59fd2fb80f3cfb533a2d185..e6e24a486302691f93e9e895cabd9dc51d060ebe 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileDlg.cxx
@@ -73,15 +73,12 @@ HYDROGUI_ProfileDlg::HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QStr
   connect( myEditorWidget, SIGNAL( subOperationFinished(QWidget*) ), this, SLOT( processFinishedSubOperation(QWidget*) ) );
 
   //myAddElementBox->hide();
-}
 
-HYDROGUI_ProfileDlg::~HYDROGUI_ProfileDlg()
-{
+  myEditorWidget->setOCCViewWidget( myViewWidget );
 }
 
-void HYDROGUI_ProfileDlg::setOCCViewer( OCCViewer_Viewer* theViewer )
+HYDROGUI_ProfileDlg::~HYDROGUI_ProfileDlg()
 {
-  myEditorWidget->setOCCViewer( theViewer );
 }
 
 void HYDROGUI_ProfileDlg::processStartedSubOperation( QWidget* theWidget )
@@ -108,6 +105,12 @@ void HYDROGUI_ProfileDlg::processFinishedSubOperation( QWidget* theWidget )
 
 void HYDROGUI_ProfileDlg::reset()
 {
+  myEditorWidget->reset();
+}
+
+Handle(AIS_InteractiveContext) HYDROGUI_ProfileDlg::getAISContext()
+{
+  return myViewWidget->getAISContext();
 }
 
 void HYDROGUI_ProfileDlg::setProfileName( const QString& theName )
@@ -120,9 +123,9 @@ QString HYDROGUI_ProfileDlg::getProfileName() const
   return myName->text();
 }
 
-void HYDROGUI_ProfileDlg::setCurve( CurveCreator_ICurve* theCurve )
+void HYDROGUI_ProfileDlg::setProfile( CurveCreator_ICurve* theProfile )
 {
-  myEditorWidget->setCurve( theCurve );
+  myEditorWidget->setCurve( theProfile );
 }
 
 QList<int> HYDROGUI_ProfileDlg::getSelectedSections()

diff --git a/src/HYDROGUI/HYDROGUI_ProfileDlg.h b/src/HYDROGUI/HYDROGUI_ProfileDlg.h
index dd5f52223bcdf99e1992a755b4a9ee4a8d68aa29..388fc48df5ca9b2802a88226824731b4851b1eab 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ProfileDlg.h
+++ b/src/HYDROGUI/HYDROGUI_ProfileDlg.h
@@ -25,6 +25,8 @@
 
 #include "HYDROGUI_InputPanel.h"
 
+#include <AIS_InteractiveContext.hxx>
+
 class QGroupBox;
 class QLineEdit;
 class CurveCreator_Widget;
@@ -40,12 +42,12 @@ public:
   HYDROGUI_ProfileDlg( HYDROGUI_Module* theModule, const QString& theTitle );
   virtual ~HYDROGUI_ProfileDlg();
 
-  void setOCCViewer( OCCViewer_Viewer* theViewer );
+  Handle(AIS_InteractiveContext) getAISContext();
 
   void  setProfileName( const QString& theName );
   QString getProfileName() const;
        
-  void  setCurve( CurveCreator_ICurve* theCurve );
+  void  setProfile( CurveCreator_ICurve* theProfile );
 
   void  reset();
 

diff --git a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
index 4ff533ed430f0edc59f21bbcb31ef44d02c87622..1bb26b87ac799932d4d3faef274c41073011f20e 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
@@ -27,7 +27,7 @@
 
 #include "HYDROData_Document.h"
 #include "HYDROData_Profile.h"
-#include "CurveCreator_Curve.hxx"
+#include "CurveCreator_Profile.hxx"
 #include "CurveCreator_Displayer.h"
 
 #include <LightApp_Application.h>
@@ -45,15 +45,14 @@
 //static int ZValueIncrement = 0;
 
 HYDROGUI_ProfileOp::HYDROGUI_ProfileOp( HYDROGUI_Module* theModule, bool theIsEdit )
-: HYDROGUI_Operation( theModule ), myIsEdit(theIsEdit), myCurve(NULL)//, 
-  //myViewManager(NULL)
+: HYDROGUI_Operation( theModule ), myIsEdit(theIsEdit), myProfile(NULL)
 {
   setName( theIsEdit ? tr( "EDIT_PROFILE" ) : tr( "CREATE_PROFILE" ) );
 }
 
 HYDROGUI_ProfileOp::~HYDROGUI_ProfileOp()
 {
-  //erasePreview();
+  erasePreview();
 }
 
 /**
@@ -76,75 +75,62 @@ bool HYDROGUI_ProfileOp::deleteEnabled()
 
 void HYDROGUI_ProfileOp::startOperation()
 {
-  if( myCurve )
-  {
-    delete myCurve;
-    myCurve = 0;
-  }
+  if( myProfile )
+    delete myProfile;
+
+  myProfile = new CurveCreator_Profile();
 
   HYDROGUI_Operation::startOperation();
 
   HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
   aPanel->reset();
 
-  //LightApp_Application* anApp = module()->getApp();
-  //myViewManager =
-  //  dynamic_cast<OCCViewer_ViewManager*>( anApp->getViewManager( OCCViewer_Viewer::Type(), true ) );
-  //aPanel->setOCCViewer( myViewManager ? myViewManager->getOCCViewer() : 0 );
-
   if( myIsEdit )
     myEditedObject = Handle(HYDROData_Profile)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+
+  QString aProfileName;
   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();
-
-    for( int i = 0 ; i < aPolylineData.size() ; i++ ){
-      std::string aName = HYDROGUI_Tool::ToQString(aPolylineData[i].mySectionName).toStdString();
-      bool isClosed = aPolylineData[i].myIsClosed;
-      CurveCreator::SectionType aType = CurveCreator::Polyline;
-      if( aPolylineData[i].myType == PolylineSection::SECTION_SPLINE ){
-        aType = CurveCreator::Spline;
-      }
-      CurveCreator::Coordinates aCoords;
-      for( int j = 0 ; j < aPolylineData[i].myCoords.size() ; j++ ){
-        aCoords.push_back(aPolylineData[i].myCoords[j]);
-      }
-      myCurve->addSectionInternal( aName, aType, isClosed, aCoords );
+    CurveCreator::Coordinates aCurveCoords;
+    CurveCreator::SectionsMap aSectionsMap;
+
+    HYDROData_Profile::ProfilePoints aSectPointsList = myEditedObject->GetProfilePoints();
+    CurveCreator::PosPointsList aPoints;
+    for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k )
+    {
+      const HYDROData_Profile::ProfilePoint& aSectPoint = aSectPointsList.Value( k );
+      aCurveCoords.clear();
+      aCurveCoords.push_back( aSectPoint.X() );
+      aCurveCoords.push_back( aSectPoint.Z() );
+
+      CurveCreator_PosPoint* aPosPoint = new CurveCreator_PosPoint( k, aCurveCoords );
+      aPoints.push_back( aPosPoint );
     }
-    aPanel->setProfileName( myEditedObject->GetName() );
-    */
+    aSectionsMap[0] = aPoints;
+    myProfile->addPointsInternal( aSectionsMap );
+
+    aProfileName = myEditedObject->GetName();
   }
-  else{
-    /*myCurve = new CurveCreator_Curve(CurveCreator::Dim2d);*/
-    //aPanel->setCurve(myCurve);
-    QString aNewName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_PROFILE_NAME" ) );
-    aPanel->setProfileName(aNewName);
+  else
+  {
+    aProfileName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_PROFILE_NAME" ) );
   }
-  /*aPanel->setCurve(myCurve);*/
-  //displayPreview();
+
+  aPanel->setProfileName( aProfileName );
+  aPanel->setProfile( myProfile );
+  displayPreview();
 }
 
 void HYDROGUI_ProfileOp::abortOperation()
 {
-  //HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
-  //if ( aPanel )
-  //  aPanel->setOCCViewer( 0 );
-  //erasePreview();
+  erasePreview();
 
   HYDROGUI_Operation::abortOperation();
 }
 
 void HYDROGUI_ProfileOp::commitOperation()
 {
-  //HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
-  //if ( aPanel )
-  //  aPanel->setOCCViewer( 0 );
-  //erasePreview();
+  erasePreview();
 
   HYDROGUI_Operation::commitOperation();
 }
@@ -152,7 +138,6 @@ void HYDROGUI_ProfileOp::commitOperation()
 HYDROGUI_InputPanel* HYDROGUI_ProfileOp::createInputPanel() const
 {
   HYDROGUI_ProfileDlg* aDlg = new HYDROGUI_ProfileDlg( module(), getName() );
-  //connect( aDlg, SIGNAL( selectionChanged() ), this, SLOT( onEditorSelectionChanged() ) );
   return aDlg;
 }
 
@@ -183,88 +168,55 @@ bool HYDROGUI_ProfileOp::processApply( int& theUpdateFlags,
 
   QString aProfileName = aPanel->getProfileName();
   aProfileObj->SetName(aProfileName);
-  /*
-  int aDimInt = 3;
-  if( myCurve->getDimension() == CurveCreator::Dim2d )
-    aDimInt = 2;
-  aProfileObj->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->getSectionType(i) == CurveCreator::Spline ){
-      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;
-  }
-  aProfileObj->SetPolylineData(aPolylineData);
 
-  // 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
-  //if ( aPanel )
-  //  aPanel->setOCCViewer( 0 );
+  HYDROData_Profile::ProfilePoints aProfilePoints;
+
+  CurveCreator::Coordinates aCurveCoords = myProfile->getPoints( 0 );
+  for ( int k = 0 ; k + 1 < aCurveCoords.size() ; k++ )
+  {
+    HYDROData_Profile::ProfilePoint aProfilePoint;
+
+    aProfilePoint.SetX( aCurveCoords.at( k ) );
+    k++;
+    aProfilePoint.SetY( 0 );
+    aProfilePoint.SetZ( aCurveCoords.at( k ) );
+
+    aProfilePoints.Append( aProfilePoint );
+  }
+  aProfileObj->SetProfilePoints( aProfilePoints );
 
   if( !myIsEdit )
     module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aProfileObj, true );
-*/
+
   theUpdateFlags = UF_Model;
   return true;
 }
 
-/*void HYDROGUI_ProfileOp::onEditorSelectionChanged()
+void HYDROGUI_ProfileOp::displayPreview()
 {
-  HYDROGUI_ProfileDlg* aPanel = (HYDROGUI_ProfileDlg*)inputPanel();
-  if( !aPanel )
-    return;
-  if( !myCurve )
-    return;
-  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 );
-    }
-  }
-}*/
-
-/*void HYDROGUI_ProfileOp::displayPreview()
-{
-  if( myViewManager )
+  HYDROGUI_ProfileDlg* aPanel = dynamic_cast<HYDROGUI_ProfileDlg*>( inputPanel() );
+  if( aPanel )
   {
-    if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
+    Handle(AIS_InteractiveContext) aCtx = aPanel->getAISContext();
+    if( !aCtx.IsNull() )
     {
-      Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
-      if( !aCtx.IsNull() )
-      {
-        CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
-        myCurve->setDisplayer( aDisplayer );
-        aDisplayer->display( myCurve->constructWire() );
-      }
+      CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
+      myProfile->setDisplayer( aDisplayer );
+      aDisplayer->display( myProfile->constructWire() );
     }
   }
-}*/
+}
 
-/*void HYDROGUI_ProfileOp::erasePreview()
+void HYDROGUI_ProfileOp::erasePreview()
 {
-  CurveCreator_Displayer* aDisplayer = myCurve ? myCurve->getDisplayer() : 0;
-  if( myViewManager && aDisplayer )
+  HYDROGUI_ProfileDlg* aPanel = dynamic_cast<HYDROGUI_ProfileDlg*>( inputPanel() );
+  CurveCreator_Displayer* aDisplayer = myProfile ? myProfile->getDisplayer() : 0;
+  if( aPanel && aDisplayer )
   {
-    if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
+    Handle(AIS_InteractiveContext) aCtx = aPanel->getAISContext();
+    if( !aCtx.IsNull() )
     {
-      Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
-      if( !aCtx.IsNull() )
-      {
-        aDisplayer->erase();
-      }
+      aDisplayer->erase();
     }
   }
-}*/
+}

diff --git a/src/HYDROGUI/HYDROGUI_ProfileOp.h b/src/HYDROGUI/HYDROGUI_ProfileOp.h
index ac86f4c1394f45a56530b1dc82e415348f6eddda..dd5e2370a7ed754baedc71ece1a77933b6d01bca 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ProfileOp.h
+++ b/src/HYDROGUI/HYDROGUI_ProfileOp.h
@@ -27,8 +27,7 @@
 
 #include <HYDROData_Profile.h>
 
-//class OCCViewer_ViewManager;
-class CurveCreator_Curve;
+class CurveCreator_Profile;
 
 class HYDROGUI_ProfileOp : public HYDROGUI_Operation
 {
@@ -50,19 +49,14 @@ protected:
 
   virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg );
 
-//protected slots:
-//  void                       onEditorSelectionChanged();
-
-//private:
-  //void                       displayPreview();
-  //void                       erasePreview();
-
 private:
-  //OCCViewer_ViewManager*     myViewManager;
+  void                       displayPreview();
+  void                       erasePreview();
 
+private:
   bool                       myIsEdit;
   Handle(HYDROData_Profile)  myEditedObject;
-  CurveCreator_Curve*        myCurve;
+  CurveCreator_Profile*      myProfile;
 };
 
 #endif