X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_PolylineOp.cxx;h=47b25a1233b9769803854985c2caa4e4ab4dbcff;hb=a88716339afd0e93e4a62bd0379c8c6eacd01ad9;hp=b8b19f763778e2b1a2cbb63b3c2aef813004fc0a;hpb=7ba9e0e34e3d326077ecb01fb6ce837cde1627bc;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
index b8b19f76..47b25a12 100755
--- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
@@ -19,19 +19,18 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include "HYDROGUI_Module.h"
+
 #include "HYDROGUI_PolylineOp.h"
+
+#include "HYDROGUI_Module.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 <CurveCreator_Displayer.h>
 
 #include <LightApp_Application.h>
 #include <LightApp_SelectionMgr.h>
@@ -43,169 +42,290 @@
 
 #include <OCCViewer_AISSelector.h>
 
+#include <Precision.hxx>
+
+#include <SUIT_MessageBox.h>
+#include <SUIT_Desktop.h>
+
+//static int ZValueIncrement = 0;
+
 HYDROGUI_PolylineOp::HYDROGUI_PolylineOp( HYDROGUI_Module* theModule, bool theIsEdit )
-: HYDROGUI_Operation( theModule ), myIsEdit(theIsEdit), myCurve(NULL), 
-  myActiveViewManager(NULL), myPreviewViewManager(NULL), myAISCurve(NULL)
+: HYDROGUI_Operation( theModule ), 
+  myIsEdit( theIsEdit ),
+  myCurve( NULL )
 {
   setName( theIsEdit ? tr( "EDIT_POLYLINE" ) : tr( "CREATE_POLYLINE" ) );
 }
 
 HYDROGUI_PolylineOp::~HYDROGUI_PolylineOp()
 {
-  closePreview();
+  erasePreview();
 }
 
-HYDROGUI_InputPanel* HYDROGUI_PolylineOp::createInputPanel() const
+/**
+ * Redirect the delete action to input panel
+ */
+void HYDROGUI_PolylineOp::deleteSelected()
 {
-  HYDROGUI_PolylineDlg* aDlg = new HYDROGUI_PolylineDlg( module(), getName() );
-  connect( aDlg ,SIGNAL( selectionChanged() ), this, SLOT( onEditorSelectionChanged() ) );
-  return aDlg;
+  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  aPanel->deleteSelected();
 }
 
-bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
-                                        QString& theErrorMsg )
+/**
+ * Checks whether there are some to delete
+ */
+bool HYDROGUI_PolylineOp::deleteEnabled()
 {
   HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
-
-  int aStudyId = module()->getStudyId();
-  bool aHasDoc = HYDROData_Document::HasDocument(aStudyId);
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( aStudyId );
-  if( aDocument.IsNull() )
-    return false;
-
-  Handle(HYDROData_Polyline) aPolylineObj;
-  if( myIsEdit ){
-    aPolylineObj = myEditedObject;
-  }
-  else{
-    aPolylineObj = Handle(HYDROData_Polyline)::DownCast( aDocument->CreateObject( KIND_POLYLINE ) );
-  }
-
-  if( aPolylineObj.IsNull() )
-    return false;
-
-  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;
-  module()->setObjectVisible( HYDROGUI_Tool::GetActiveGraphicsViewId( module() ), aPolylineObj, true );
-  return true;
+  return aPanel->deleteEnabled();
 }
 
-void HYDROGUI_PolylineOp::onCreatePreview()
+/**
+ * Set Z layer for the operation preview.
+ \param theLayer a layer position
+ */
+void HYDROGUI_PolylineOp::updatePreviewZLayer( int theLayer )
 {
-  LightApp_Application* anApp = module()->getApp();
+  HYDROGUI_Operation::updatePreviewZLayer( theLayer );
 
-  myActiveViewManager = anApp->activeViewManager();
-
-  myPreviewViewManager =
-    dynamic_cast<OCCViewer_ViewManager*>( anApp->createViewManager( OCCViewer_Viewer::Type() ) );
-  if( myPreviewViewManager )
+  int aZLayer = getPreviewZLayer();
+  if ( aZLayer >= 0 )
   {
-    connect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
-             this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
-
-    //anApp->selectionMgr()->setEnabled(false); // what the hell?!
-    myPreviewViewManager->setTitle( tr( "CREATE_POLYLINE" ) );
-    OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
-    aViewer->enableSelection(true);
-    aViewer->enableMultiselection(true);
-    Handle_AIS_InteractiveContext aCtx = aViewer->getAISContext();
-
-    OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView();
-    vw->onTopView();
-
-    myAISCurve = new HYDROGUI_AISCurve(myCurve, aCtx);
-
-    myAISCurve->Display();
+    if( getPreviewManager() )
+    {
+      if ( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() )
+      {
+        Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+        if( !aCtx.IsNull() )
+        {
+          Handle(AIS_InteractiveObject) anObject = myCurve->getAISObject( true );
+          aCtx->SetZLayer( anObject, aZLayer );
+        }
+      }
+    }
   }
 }
 
 void HYDROGUI_PolylineOp::startOperation()
 {
-  CurveCreator_Curve* anOldCurve = myCurve;
+  if( myIsEdit )
+  {
+    myEditedObject = Handle(HYDROData_PolylineXY)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+    if ( !myEditedObject.IsNull() && !myEditedObject->IsEditable() )
+    {
+      // Polyline is imported from GEOM module an is not recognized as
+      // polyline or spline and exist only as shape presentation
+      SUIT_MessageBox::critical( module()->getApp()->desktop(),
+                                 tr( "POLYLINE_IS_UNEDITABLE_TLT" ),
+                                 tr( "POLYLINE_IS_UNEDITABLE_MSG" ) );
+      abort();
+      return;
+    }
+  }
+
+  if( myCurve )
+    delete myCurve;
+
+  myCurve = new CurveCreator_Curve( CurveCreator::Dim2d );
 
   HYDROGUI_Operation::startOperation();
 
   HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
   aPanel->reset();
 
-  myEditedObject = Handle(HYDROData_Polyline)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+  LightApp_Application* anApp = module()->getApp();
+  OCCViewer_ViewManager* aViewManager =
+    dynamic_cast<OCCViewer_ViewManager*>( anApp->getViewManager( OCCViewer_Viewer::Type(), true ) );
+  aPanel->setOCCViewer( aViewManager ? aViewManager->getOCCViewer() : 0 );
+  setPreviewManager( aViewManager );
+
+  QString aPolylineName;
   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;
+    NCollection_Sequence<TCollection_AsciiString>           aSectNames;
+    NCollection_Sequence<HYDROData_PolylineXY::SectionType> aSectTypes;
+    NCollection_Sequence<bool>                              aSectClosures;
+    myEditedObject->GetSections( aSectNames, aSectTypes, aSectClosures );
+
+    for ( int i = 1, n = aSectNames.Size(); i <= n; ++i )
+    {
+      QString aSectName = HYDROGUI_Tool::ToQString( aSectNames.Value( i ) );
+      HYDROData_PolylineXY::SectionType aSectType = aSectTypes.Value( i );
+      bool aSectClosure = aSectClosures.Value( i );
+
+      CurveCreator::SectionType aCurveType = CurveCreator::Polyline;
+      if( aSectType == HYDROData_PolylineXY::SECTION_SPLINE )
+        aCurveType = CurveCreator::Spline;
+
+      CurveCreator::Coordinates aCurveCoords;
+
+      HYDROData_PolylineXY::PointsList aSectPointsList = myEditedObject->GetPoints( i - 1 );
+      for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k )
+      {
+        const HYDROData_PolylineXY::Point& aSectPoint = aSectPointsList.Value( k );
+        aCurveCoords.push_back( aSectPoint.X() );
+        aCurveCoords.push_back( aSectPoint.Y() );
       }
-      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( aSectName.toStdString(), aCurveType, aSectClosure, aCurveCoords );
     }
-    delete anEdit;
-    aPanel->setPolylineName( myEditedObject->GetName() );
 
+    aPolylineName = myEditedObject->GetName();
   }
-  else{
-    myCurve = new CurveCreator_Curve(CurveCreator::Dim2d);
-    aPanel->setCurve(myCurve);
-    QString aNewName = HYDROGUI_Tool::GenerateObjectName( module(), "Polyline" );
-    aPanel->setPolylineName(aNewName);
+  else
+  {
+    aPolylineName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_POLYLINE_NAME" ) );
   }
-  aPanel->setCurve(myCurve);
-  if( myAISCurve )
-    myAISCurve->setCurve(myCurve);
-  if( anOldCurve )
-    delete anOldCurve;
-  onCreatePreview();
+
+  aPanel->setPolylineName( aPolylineName );
+  aPanel->setCurve( myCurve );
+
+  displayPreview();
 }
 
 void HYDROGUI_PolylineOp::abortOperation()
 {
-  closePreview();
+  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  if ( aPanel )
+    aPanel->setOCCViewer( 0 );
+  erasePreview();
 
   HYDROGUI_Operation::abortOperation();
 }
 
 void HYDROGUI_PolylineOp::commitOperation()
 {
-  closePreview();
+  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  if ( aPanel )
+    aPanel->setOCCViewer( 0 );
+  erasePreview();
 
   HYDROGUI_Operation::commitOperation();
 }
 
+HYDROGUI_InputPanel* HYDROGUI_PolylineOp::createInputPanel() const
+{
+  HYDROGUI_PolylineDlg* aDlg = new HYDROGUI_PolylineDlg( module(), getName() );
+  connect( aDlg, SIGNAL( selectionChanged() ), this, SLOT( onEditorSelectionChanged() ) );
+  return aDlg;
+}
+
+bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
+                                        QString& theErrorMsg )
+{
+  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;
+    }
+  }
+
+  if ( myCurve->getNbSections() <= 0 )
+  {
+    theErrorMsg = tr( "EMPTY_POLYLINE_DATA" );
+    return false;
+  }
+
+  Handle(HYDROData_PolylineXY) aPolylineObj;
+  if( myIsEdit )
+  {
+    aPolylineObj = myEditedObject;
+    aPolylineObj->RemoveSections();
+  }
+  else
+  {
+    aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( doc()->CreateObject( KIND_POLYLINEXY ) );
+  }
+
+  if( aPolylineObj.IsNull() )
+    return false;
+
+  aPolylineObj->SetName( aPolylineName );
+
+  for ( int i = 0 ; i < myCurve->getNbSections() ; i++ )
+  {
+    TCollection_AsciiString aSectName = HYDROGUI_Tool::ToAsciiString( myCurve->getSectionName( i ).c_str() );
+    CurveCreator::SectionType aCurveType =  myCurve->getSectionType( i );
+    bool aSectClosure = myCurve->isClosed( i );
+
+    HYDROData_PolylineXY::SectionType aSectType = HYDROData_PolylineXY::SECTION_POLYLINE;
+
+    if ( aCurveType == CurveCreator::Spline )
+      aSectType = HYDROData_PolylineXY::SECTION_SPLINE;
+
+    aPolylineObj->AddSection( aSectName, aSectType, aSectClosure );
+
+    // 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;
+
+      aSectPoint.SetX( aCurveCoords.at( k ) );
+      k++;
+      aSectPoint.SetY( aCurveCoords.at( k ) );
+
+      aPolylineObj->AddPoint( i, aSectPoint );
+    }
+  }
+
+  if ( !myIsEdit )
+  {
+    aPolylineObj->SetWireColor( HYDROData_PolylineXY::DefaultWireColor() );
+  }
+
+  // Update the wire of polyline
+  aPolylineObj->Update();
+  module()->setIsToUpdate( aPolylineObj );
+
+  // 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 );
+
+  theUpdateFlags = UF_Model;
+
+  // the polyline should be rebuild in all viewers, where it is displayed
+  theUpdateFlags |= UF_Viewer | UF_GV_Forced;
+  theUpdateFlags |= UF_OCCViewer | UF_OCC_Forced;
+  theUpdateFlags |= UF_VTKViewer;
+
+  size_t anActiveViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() );
+  if ( anActiveViewId == 0 )
+  {
+    anActiveViewId = HYDROGUI_Tool::GetActiveOCCViewId( module() );
+  }
+
+  if( !myIsEdit )
+  {
+    module()->setObjectVisible( anActiveViewId, aPolylineObj, true );
+  }  
+
+  return true;
+}
+
 void HYDROGUI_PolylineOp::onEditorSelectionChanged()
 {
   HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
@@ -213,36 +333,53 @@ 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);
-    }
-  }
+  //QList<int> aSelSections = aPanel->getSelectedSections();
+  bool aIsHl = false;
+  //if( aSelSections.contains(i) ){
+  // TODO
+  //aDisplayer->highlight( myCurve->getAISObject(), aIsHl );
+  //}
 }
 
-void HYDROGUI_PolylineOp::onLastViewClosed( SUIT_ViewManager* theViewManager )
+void HYDROGUI_PolylineOp::displayPreview()
 {
-  closePreview();
+  if( getPreviewManager() )
+  {
+    if( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() )
+    {
+      Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+      if( !aCtx.IsNull() )
+      {
+        CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx, getPreviewZLayer() );
+        myCurve->setDisplayer( aDisplayer );
+        aDisplayer->display( myCurve->getAISObject( true ), true );
+      }
+    }
+  }
 }
 
-void HYDROGUI_PolylineOp::closePreview()
+void HYDROGUI_PolylineOp::erasePreview()
 {
-  if( myPreviewViewManager )
+  CurveCreator_Displayer* aDisplayer = myCurve ? myCurve->getDisplayer() : 0;
+  if( getPreviewManager() && aDisplayer )
   {
-    disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
-                this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
-
-    module()->getApp()->removeViewManager( myPreviewViewManager ); // myPreviewViewManager is deleted here
-    myPreviewViewManager = 0;
+    if( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() )
+    {
+      Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+      if( !aCtx.IsNull() )
+      {
+        aDisplayer->eraseAll( true );
+      }
+    }
   }
 
-  if( myActiveViewManager )
+  setPreviewManager( NULL );
+  if ( myCurve )
   {
-    HYDROGUI_Tool::SetActiveViewManager( module(), myActiveViewManager );
-    myActiveViewManager = 0;
+    delete myCurve;
+    myCurve = NULL;
   }
 }