X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_PolylineOp.cxx;h=61634ca78e968fbe2140b46b0d99458c5b9320b9;hb=3524c916e16d5c5c545c0ddbda4b570139612afe;hp=2aa8ccac9b65d2e94649539338dc8b08ce95362d;hpb=ca0e09c1e1bb19c9855e2f3839243da36097ee1c;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
index 2aa8ccac..61634ca7 100755
--- a/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_PolylineOp.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,19 +19,19 @@
 //
 // 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_DataObject.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.hxx>
 
 #include <LightApp_Application.h>
 #include <LightApp_SelectionMgr.h>
@@ -43,9 +43,17 @@
 
 #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), 
-  myViewManager(NULL), myAISCurve(NULL)
+: HYDROGUI_Operation( theModule ), 
+  myIsEdit( theIsEdit ),
+  myCurve( NULL )
 {
   setName( theIsEdit ? tr( "EDIT_POLYLINE" ) : tr( "CREATE_POLYLINE" ) );
 }
@@ -55,59 +63,132 @@ 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();
+}
+
+/**
+ * Set Z layer for the operation preview.
+ \param theLayer a layer position
+ */
+void HYDROGUI_PolylineOp::updatePreviewZLayer( int theLayer )
+{
+  HYDROGUI_Operation::updatePreviewZLayer( theLayer );
+
+  int aZLayer = getPreviewZLayer();
+  if ( aZLayer >= 0 )
+  {
+    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;
-      }
-      CurveCreator::Coordinates aCoords;
-      for( int j = 0 ; j < aPolylineData[i].myCoords.size() ; j++ ){
-        aCoords.push_back(aPolylineData[i].myCoords[j]);
+    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() );
       }
-      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;
+
+  aPanel->setPolylineName( aPolylineName );
+  aPanel->setCurve( myCurve );
+
   displayPreview();
 }
 
 void HYDROGUI_PolylineOp::abortOperation()
 {
+  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  if ( aPanel )
+    aPanel->setOCCViewer( 0 );
   erasePreview();
 
   HYDROGUI_Operation::abortOperation();
@@ -115,6 +196,9 @@ void HYDROGUI_PolylineOp::abortOperation()
 
 void HYDROGUI_PolylineOp::commitOperation()
 {
+  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  if ( aPanel )
+    aPanel->setOCCViewer( 0 );
   erasePreview();
 
   HYDROGUI_Operation::commitOperation();
@@ -128,52 +212,121 @@ HYDROGUI_InputPanel* HYDROGUI_PolylineOp::createInputPanel() const
 }
 
 bool HYDROGUI_PolylineOp::processApply( int& theUpdateFlags,
-                                        QString& theErrorMsg )
+                                        QString& theErrorMsg,
+                                        QStringList& theBrowseObjectsEntries )
 {
-  HYDROGUI_PolylineDlg* aPanel = (HYDROGUI_PolylineDlg*)inputPanel();
+  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;
+  }
 
-  int aStudyId = module()->getStudyId();
-  bool aHasDoc = HYDROData_Document::HasDocument(aStudyId);
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( aStudyId );
-  if( aDocument.IsNull() )
+  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_Polyline) aPolylineObj;
-  if( myIsEdit ){
+  Handle(HYDROData_PolylineXY) aPolylineObj;
+  if( myIsEdit )
+  {
     aPolylineObj = myEditedObject;
+    aPolylineObj->RemoveSections();
   }
-  else{
-    aPolylineObj = Handle(HYDROData_Polyline)::DownCast( aDocument->CreateObject( KIND_POLYLINE ) );
+  else
+  {
+    aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( doc()->CreateObject( KIND_POLYLINEXY ) );
   }
 
   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;
+  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;
     }
-    CurveCreator::Coordinates aCoords = myCurve->getPoints(i);
-    for( int j = 0 ; j < aCoords.size() ; j++ ){
-      aSect.myCoords << aCoords.at(j);
+
+    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 );
     }
-    aPolylineData << aSect;
   }
-  aPolylineObj->setPolylineData(aPolylineData);
+
+  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;
-  module()->setObjectVisible( HYDROGUI_Tool::GetActiveGraphicsViewId( module() ), aPolylineObj, true );
+
+  // 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 );
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aPolylineObj );
+    theBrowseObjectsEntries.append( anEntry );
+  }  
+
   return true;
 }
 
@@ -184,32 +337,29 @@ 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::displayPreview()
 {
-  LightApp_Application* anApp = module()->getApp();
-
-  myViewManager =
-    dynamic_cast<OCCViewer_ViewManager*>( anApp->getViewManager( OCCViewer_Viewer::Type(), true ) );
-  if( myViewManager )
+  if( getPreviewManager() )
   {
-    if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
+    if( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() )
     {
       Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
       if( !aCtx.IsNull() )
       {
-        myAISCurve = new HYDROGUI_AISCurve( myCurve, aCtx );
-        myAISCurve->Display();
+        CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx, getPreviewZLayer() );
+        myCurve->setDisplayer( aDisplayer );
+        aDisplayer->display( myCurve->getAISObject( true ), true );
       }
     }
   }
@@ -217,17 +367,23 @@ void HYDROGUI_PolylineOp::displayPreview()
 
 void HYDROGUI_PolylineOp::erasePreview()
 {
-  if( myViewManager )
+  CurveCreator_Displayer* aDisplayer = myCurve ? myCurve->getDisplayer() : 0;
+  if( getPreviewManager() && aDisplayer )
   {
-    if( OCCViewer_Viewer* aViewer = myViewManager->getOCCViewer() )
+    if( OCCViewer_Viewer* aViewer = getPreviewManager()->getOCCViewer() )
     {
       Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
-      if( !aCtx.IsNull() && myAISCurve )
+      if( !aCtx.IsNull() )
       {
-        myAISCurve->Erase();
-        delete myAISCurve;
-        myAISCurve = 0;
+        aDisplayer->eraseAll( true );
       }
     }
   }
+
+  setPreviewManager( NULL );
+  if ( myCurve )
+  {
+    delete myCurve;
+    myCurve = NULL;
+  }
 }