Feature #86: The hierarchy in the Object Browser (T 19).

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

diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
index 837097139053ed168f265d23ee2a390087788510..5932efc5882f118181575d28d7c7c075aef4d08f 100755 (executable)
--- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
@@ -23,15 +23,12 @@
 #include "HYDROGUI_PolylineOp.h"
 #include "HYDROGUI_PolylineDlg.h"
 #include "HYDROGUI_Tool.h"
-#include "CurveCreator.hxx"
-#include "CurveCreator_Curve.hxx"
-#include "CurveCreator_CurveEditor.hxx"
-#include "HYDROGUI_AISCurve.h"
+#include "HYDROGUI_UpdateFlags.h"
 
-#include <HYDROData_Document.h>
-#include <HYDROData_Polyline.h>
-#include <CurveCreator_Curve.hxx>
-#include <CurveCreator_CurveEditor.hxx>
+#include "HYDROData_Document.h"
+#include "HYDROData_Polyline.h"
+#include "CurveCreator_Curve.hxx"
+#include "CurveCreator_Displayer.h"
 
 #include <LightApp_Application.h>
 #include <LightApp_SelectionMgr.h>
@@ -49,7 +46,7 @@
 
 HYDROGUI_PolylineOp::HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool theIsEdit )
 : HYDROGUI_Operation( theModule ), myIsEdit(theIsEdit), myCurve(NULL), 
-  myViewManager(NULL), myAISCurve(NULL)
+  myViewManager(NULL)
 {
   setName( theIsEdit ? tr( "EDIT_POLYLINE" ) : tr( "CREATE_POLYLINE" ) );
 }
@@ -59,6 +56,24 @@ HYDROGUI_PolylineOp::~HYDROGUI_PolylineOp()
   erasePreview();
 }
 
+/**
+ * Redirect the delete action to input panel
+ */
+void HYDROGUI_PolylineOp::deleteSelected()
+{
+  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  aPanel->deleteSelected();
+}
+
+/**
+ * Checks whether there are some to delete
+ */
+bool HYDROGUI_PolylineOp::deleteEnabled()
+{
+  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  return aPanel->deleteEnabled();
+}
+
 void HYDROGUI_PolylineOp::startOperation()
 {
   if( myCurve )
@@ -72,6 +87,11 @@ void HYDROGUI_PolylineOp::startOperation()
   HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)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_Polyline)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
   if( !myEditedObject.IsNull() )
@@ -83,40 +103,38 @@ void HYDROGUI_PolylineOp::startOperation()
     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;
+      CurveCreator::SectionType aType = CurveCreator::Polyline;
       if( aPolylineData[i].myType == PolylineSection::SECTION_SPLINE ){
-        aType = CurveCreator::BSpline;
+        aType = CurveCreator::Spline;
       }
       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 );
+      myCurve->addSectionInternal( aName, aType, isClosed, aCoords );
     }
-    delete anEdit;
     aPanel->setPolylineName( myEditedObject->GetName() );
 
   }
   else{
     myCurve = new CurveCreator_Curve(CurveCreator::Dim2d);
-    aPanel->setCurve(myCurve);
-    QString aNewName = HYDROGUI_Tool::GenerateObjectName( module(), "Polyline" );
+    //aPanel->setCurve(myCurve);
+    QString aNewName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_POLYLINE_NAME" ) );
     aPanel->setPolylineName(aNewName);
   }
   aPanel->setCurve(myCurve);
 
-  if( myAISCurve )
-    myAISCurve->setCurve(myCurve);
-
   displayPreview();
 }
 
 void HYDROGUI_PolylineOp::abortOperation()
 {
+  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  if ( aPanel )
+    aPanel->setOCCViewer( 0 );
   erasePreview();
 
   HYDROGUI_Operation::abortOperation();
@@ -124,6 +142,9 @@ void HYDROGUI_PolylineOp::abortOperation()
 
 void HYDROGUI_PolylineOp::commitOperation()
 {
+  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  if ( aPanel )
+    aPanel->setOCCViewer( 0 );
   erasePreview();
 
   HYDROGUI_Operation::commitOperation();
@@ -173,7 +194,7 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
     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 ){
+    if( myCurve->getSectionType(i) == CurveCreator::Spline ){
       aSect.myType = PolylineSection::SECTION_SPLINE;
     }
     CurveCreator::Coordinates aCoords = myCurve->getPoints(i);
@@ -184,8 +205,16 @@ bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
   }
   aPolylineObj->SetPolylineData(aPolylineData);
 
-  theUpdateFlags = UF_Model;
-  module()->setObjectVisible( HYDROGUI_Tool::GetActiveGraphicsViewId( module() ), aPolylineObj, true );
+  // 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 );
+
+  if( !myIsEdit )
+    module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aPolylineObj, true );
+
+  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;
+
   return true;
 }
 
@@ -196,23 +225,20 @@ void HYDROGUI_PolylineOp::onEditorSelectionChanged()
     return;
   if( !myCurve )
     return;
-  if( !myAISCurve )
+  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) ){
-      myAISCurve->highlightSection(i, aIsHl);
+      aDisplayer->highlight( myCurve->constructSection(i), aIsHl );
     }
   }
 }
 
 void HYDROGUI_PolylineOp::displayPreview()
 {
-  LightApp_Application* anApp = module()->getApp();
-
-  myViewManager =
-    dynamic_cast<OCCViewer_ViewManager*>( anApp->getViewManager( OCCViewer_Viewer::Type(), true ) );
   if( myViewManager )
   {
     if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
@@ -220,8 +246,9 @@ void HYDROGUI_PolylineOp::displayPreview()
       Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
       if( !aCtx.IsNull() )
       {
-        myAISCurve = new HYDROGUI_AISCurve( myCurve, aCtx );
-        myAISCurve->Display();
+        CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
+        myCurve->setDisplayer( aDisplayer );
+        aDisplayer->display( myCurve->constructWire() );
       }
     }
   }
@@ -229,16 +256,15 @@ void HYDROGUI_PolylineOp::displayPreview()
 
 void HYDROGUI_PolylineOp::erasePreview()
 {
-  if( myViewManager )
+  CurveCreator_Displayer* aDisplayer = myCurve ? myCurve->getDisplayer() : 0;
+  if( myViewManager && aDisplayer )
   {
     if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
     {
       Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
-      if( !aCtx.IsNull() && myAISCurve )
+      if( !aCtx.IsNull() )
       {
-        myAISCurve->Erase();
-        delete myAISCurve;
-        myAISCurve = 0;
+        aDisplayer->erase();
       }
     }
   }