X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_ProfileOp.cxx;h=b6baf1e715b6d43cf286298409c085a8fbecf059;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=de66285269f83ba04f9ae2a35b6525673498fd6c;hpb=512ec397c07a7f6f569c058451daf788154deb3a;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
index de662852..b6baf1e7 100644
--- a/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileOp.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // 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,16 +15,17 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include "HYDROGUI_Module.h"
-#include "HYDROGUI_ProfileOp.h"
-#include "HYDROGUI_ProfileDlg.h"
-#include "HYDROGUI_Tool.h"
-#include "HYDROGUI_UpdateFlags.h"
 
-#include "HYDROData_Document.h"
-#include "HYDROData_Profile.h"
-#include "CurveCreator_Profile.hxx"
-#include "CurveCreator_Displayer.h"
+#include <HYDROGUI_Module.h>
+#include <HYDROGUI_ProfileOp.h>
+#include <HYDROGUI_ProfileDlg.h>
+#include <HYDROGUI_Tool.h>
+#include <HYDROGUI_UpdateFlags.h>
+#include <HYDROGUI_DataObject.h>
+#include <HYDROData_Document.h>
+#include <HYDROData_Profile.h>
+#include <HYDROGUI_CurveCreatorProfile.h>
+#include <CurveCreator_Displayer.hxx>
 
 #include <LightApp_Application.h>
 #include <LightApp_SelectionMgr.h>
@@ -78,7 +75,7 @@ void HYDROGUI_ProfileOp::startOperation()
   if( myProfile )
     delete myProfile;
 
-  myProfile = new CurveCreator_Profile();
+  myProfile = new HYDROGUI_CurveCreatorProfile();
 
   HYDROGUI_Operation::startOperation();
 
@@ -86,28 +83,42 @@ void HYDROGUI_ProfileOp::startOperation()
   aPanel->reset();
 
   if( myIsEdit )
-    myEditedObject = Handle(HYDROData_Profile)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+    if ( isApplyAndClose() )
+      myEditedObject = Handle(HYDROData_Profile)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
 
   QString aProfileName;
   if( !myEditedObject.IsNull() )
   {
-    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 )
+    Handle(HYDROData_ProfileUZ) aProfileUZ = myEditedObject->GetProfileUZ( false );
+    if ( !aProfileUZ.IsNull() )
     {
-      const HYDROData_Profile::ProfilePoint& aSectPoint = aSectPointsList.Value( k );
-      aCurveCoords.clear();
-      aCurveCoords.push_back( aSectPoint.X() );
-      aCurveCoords.push_back( aSectPoint.Z() );
+      CurveCreator::Coordinates aCurveCoords;
+      CurveCreator::SectionsMap aSectionsMap;
+
+      HYDROData_ProfileUZ::PointsList aSectPointsList = aProfileUZ->GetPoints();
+      CurveCreator::PosPointsList aPoints;
+      for ( int k = 1, aNbPoints = aSectPointsList.Size(); k <= aNbPoints; ++k )
+      {
+        const HYDROData_ProfileUZ::Point& aSectPoint = aSectPointsList.Value( k );
+        aCurveCoords.clear();
+        aCurveCoords.push_back( aSectPoint.X() );
+        aCurveCoords.push_back( aSectPoint.Y() );
+
+        CurveCreator_PosPoint* aPosPoint = new CurveCreator_PosPoint( k, aCurveCoords );
+        aPoints.push_back( aPosPoint );
+      }
 
-      CurveCreator_PosPoint* aPosPoint = new CurveCreator_PosPoint( k, aCurveCoords );
-      aPoints.push_back( aPosPoint );
+      aSectionsMap[0] = aPoints;
+      myProfile->addPointsInternal( aSectionsMap );
+
+      HYDROData_ProfileUZ::SectionType aSectType = aProfileUZ->GetSectionType( 0 );
+
+      CurveCreator::SectionType aCurveType = CurveCreator::Polyline;
+      if( aSectType == HYDROData_ProfileUZ::SECTION_SPLINE )
+        aCurveType = CurveCreator::Spline;
+
+      myProfile->setSectionType( 0, aCurveType );
     }
-    aSectionsMap[0] = aPoints;
-    myProfile->addPointsInternal( aSectionsMap );
 
     aProfileName = myEditedObject->GetName();
   }
@@ -142,7 +153,8 @@ HYDROGUI_InputPanel* HYDROGUI_ProfileOp::createInputPanel() const
 }
 
 bool HYDROGUI_ProfileOp::processApply( int& theUpdateFlags,
-                                        QString& theErrorMsg )
+                                       QString& theErrorMsg,
+                                       QStringList& theBrowseObjectsEntries )
 {
   HYDROGUI_ProfileDlg* aPanel = ::qobject_cast<HYDROGUI_ProfileDlg*>( inputPanel() );
   if ( !aPanel )
@@ -177,6 +189,10 @@ bool HYDROGUI_ProfileOp::processApply( int& theUpdateFlags,
   if( aProfileObj.IsNull() )
     return false;
 
+  Handle(HYDROData_ProfileUZ) aProfileUZ = aProfileObj->GetProfileUZ();
+  if ( aProfileUZ.IsNull() )
+    return false;
+
   aProfileObj->SetName(aProfileName);
 
   HYDROData_ProfileUZ::PointsList aProfileParamPoints;
@@ -200,10 +216,34 @@ bool HYDROGUI_ProfileOp::processApply( int& theUpdateFlags,
   }
   aProfileObj->SetParametricPoints( aProfileParamPoints );
 
-  if( !myIsEdit )
-    module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aProfileObj, true );
+  HYDROData_ProfileUZ::SectionType aSectType = HYDROData_ProfileUZ::SECTION_POLYLINE;
+  if ( myProfile->getSectionType( 0 ) == CurveCreator::Spline )
+    aSectType = HYDROData_ProfileUZ::SECTION_SPLINE;
+
+  aProfileUZ->SetSectionType( 0, aSectType );
+
+  if ( !myIsEdit )
+  {
+    aProfileObj->SetBorderColor( HYDROData_Profile::DefaultBorderColor() );
+  }
+
+  // At first we update the child u,z profile object
+  aProfileUZ->SetToUpdate( true );
+  aProfileUZ->Update();
+
+  // And now we update our edited object
+  aProfileObj->Update();
+  module()->setIsToUpdate( aProfileObj );
 
   theUpdateFlags = UF_Model;
+  if ( myIsEdit )
+    theUpdateFlags |= UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
+  else
+  {
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aProfileObj );
+    theBrowseObjectsEntries.append( anEntry );
+  }
+
   return true;
 }
 
@@ -217,7 +257,7 @@ void HYDROGUI_ProfileOp::displayPreview()
     {
       CurveCreator_Displayer* aDisplayer = new CurveCreator_Displayer( aCtx );
       myProfile->setDisplayer( aDisplayer );
-      aDisplayer->display( myProfile->constructWire(), true );
+      aDisplayer->display( myProfile->getAISObject( true ), true );
     }
   }
 }
@@ -231,7 +271,7 @@ void HYDROGUI_ProfileOp::erasePreview()
     Handle(AIS_InteractiveContext) aCtx = aPanel->getAISContext();
     if( !aCtx.IsNull() )
     {
-      aDisplayer->erase( true );
+      aDisplayer->eraseAll( true );
     }
   }
 }