X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Poly3DOp.cxx;h=0c1f2b2f64584e7cdae874becea06c52a625a2b5;hb=d6e19029f8b41f295db878e9aecf451c2edda4af;hp=9be0f7513dfcd06cf28f0061f4490a7ebf4b5269;hpb=902f7fd2408dda7bec3b9cc407cf476319871b6b;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx b/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx
index 9be0f751..0c1f2b2f 100644
--- a/src/HYDROGUI/HYDROGUI_Poly3DOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_Poly3DOp.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
@@ -23,6 +19,7 @@
 #include "HYDROGUI_Poly3DOp.h"
 
 #include "HYDROGUI_Module.h"
+#include <HYDROGUI_DataObject.h>
 #include "HYDROGUI_Tool.h"
 #include "HYDROGUI_Poly3DDlg.h"
 #include "HYDROGUI_UpdateFlags.h"
@@ -31,6 +28,7 @@
 #include <HYDROData_Polyline3D.h>
 #include <HYDROData_Profile.h>
 #include <HYDROData_PolylineXY.h>
+#include <HYDROData_Bathymetry.h>
 
 #include <HYDROData_OperationsFactory.h>
 
@@ -63,26 +61,37 @@ void HYDROGUI_Poly3DOp::startOperation()
   QString aPoly3DName;
   if( myIsEdit )
   {
-    myEditedObject = Handle(HYDROData_Polyline3D)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+    if ( isApplyAndClose() )
+      myEditedObject = Handle(HYDROData_Polyline3D)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
     if( !myEditedObject.IsNull() )
       aPoly3DName = myEditedObject->GetName();
   }
   else
   {
-    aPoly3DName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "POLYLINE_3D" ) );
+    aPoly3DName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_POLYLINE_3D_NAME" ) );
   }
   aPanel->setResultName( aPoly3DName );
 
-  QString aSelectedName1, aSelectedName2;
+  QString aPolyName, aProfileName, aBathName;
   if( myIsEdit && !myEditedObject.IsNull() )
   {
-    Handle(HYDROData_Entity) anObject1 = myEditedObject->GetProfileUZ()->GetFatherObject();
-    if( !anObject1.IsNull() )
-      aSelectedName1 = anObject1->GetName();
-    Handle(HYDROData_Entity) anObject2 = myEditedObject->GetPolylineXY();
-    if( !anObject2.IsNull() )
-      aSelectedName2 = anObject2->GetName();
-    aPanel->setSelectedObjects( aSelectedName1, aSelectedName2 );
+    Handle(HYDROData_ProfileUZ) aProfileUZ = myEditedObject->GetProfileUZ();
+    if( !aProfileUZ.IsNull() )
+    {
+      Handle(HYDROData_Entity) aProfile = aProfileUZ->GetFatherObject();
+      if ( !aProfile.IsNull() )
+        aProfileName = aProfile->GetName();
+    }
+
+    Handle(HYDROData_Entity) aPoly = myEditedObject->GetPolylineXY();
+    if( !aPoly.IsNull() )
+      aPolyName = aPoly->GetName();
+
+    Handle(HYDROData_IAltitudeObject) anAltitudeObj = myEditedObject->GetAltitudeObject();
+    if( !anAltitudeObj.IsNull() )
+      aBathName = anAltitudeObj->GetName();
+
+    aPanel->setSelectedObjects( aPolyName, aProfileName, aBathName );
   }
   else if( !myIsEdit )
   {
@@ -97,7 +106,8 @@ void HYDROGUI_Poly3DOp::startOperation()
 }
 
 bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
-                                         QString& theErrorMsg )
+                                      QString& theErrorMsg,
+                                      QStringList& theBrowseObjectsEntries )
 {
   HYDROGUI_Poly3DDlg* aPanel = dynamic_cast<HYDROGUI_Poly3DDlg*>( inputPanel() );
 
@@ -105,8 +115,8 @@ bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
   if( aResultName.isEmpty() )
     return false;
 
-  QString aSelectedName1, aSelectedName2;
-  if( !aPanel->getSelectedObjects( aSelectedName1, aSelectedName2 ) )
+  QString aPolyName, aProfileName, aBathName;
+  if( !aPanel->getSelectedObjects( aPolyName, aProfileName, aBathName ) )
     return false;
 
   if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != aResultName ) )
@@ -120,52 +130,63 @@ bool HYDROGUI_Poly3DOp::processApply( int& theUpdateFlags,
     }
   }
 
-  Handle(HYDROData_Entity) anObject1 =
-    HYDROGUI_Tool::FindObjectByName( module(), aSelectedName1, KIND_PROFILE ) ;
-  Handle(HYDROData_Entity) anObject2 =
-    HYDROGUI_Tool::FindObjectByName( module(), aSelectedName2, KIND_POLYLINEXY );
-  if( anObject1.IsNull() || anObject2.IsNull() )
-    return false;
-
-  Handle(HYDROData_Profile) aProfile = Handle(HYDROData_Profile)::DownCast( anObject1 );
-  Handle(HYDROData_PolylineXY) aPolyline = Handle(HYDROData_PolylineXY)::DownCast( anObject2 );
-
-  if( aProfile.IsNull() || aPolyline.IsNull() )
-    return false;
+  Handle(HYDROData_Profile) aProfile = Handle(HYDROData_Profile)::DownCast( 
+    HYDROGUI_Tool::FindObjectByName( module(), aProfileName, KIND_PROFILE ) );
+  Handle(HYDROData_PolylineXY) aPolyline = Handle(HYDROData_PolylineXY)::DownCast( 
+    HYDROGUI_Tool::FindObjectByName( module(), aPolyName, KIND_POLYLINEXY ) );
+  Handle(HYDROData_Bathymetry) aBath = Handle(HYDROData_Bathymetry)::DownCast( 
+    HYDROGUI_Tool::FindObjectByName( module(), aBathName, KIND_BATHYMETRY ) );
 
-  Handle(HYDROData_ProfileUZ) aProfileUZ = aProfile->GetProfileUZ();
-  if( aProfileUZ.IsNull() )
+  if ( aPolyline.IsNull() || ( aProfile.IsNull() && aBath.IsNull() ) )
     return false;
 
   Handle(HYDROData_Polyline3D) aResult;
   if( myIsEdit )
   {
     aResult = myEditedObject;
-    aResult->RemoveProfileUZ();
-    aResult->RemovePolylineXY();
   }
   else
   {
     aResult = Handle(HYDROData_Polyline3D)::DownCast( doc()->CreateObject( KIND_POLYLINE ) );
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aResult );
+    theBrowseObjectsEntries.append( anEntry );
   }
 
   if( aResult.IsNull() )
     return false;
 
   aResult->SetName( aResultName );
-  aResult->SetProfileUZ( aProfileUZ );
-  aResult->SetPolylineXY( aPolyline );
+
+  aResult->SetPolylineXY( aPolyline, false );
+  if ( !aProfile.IsNull() )
+  {
+    Handle(HYDROData_ProfileUZ) aProfileUZ = aProfile->GetProfileUZ();
+    if( aProfileUZ.IsNull() )
+      return false;
+    
+    aResult->SetProfileUZ( aProfileUZ );
+  }
+  else
+  {
+    aResult->SetAltitudeObject( aBath );
+  }
+
+  if( !myIsEdit )
+  {
+    aResult->SetBorderColor( HYDROData_Polyline3D::DefaultBorderColor() );
+  }
 
   aResult->Update();
 
   if( !myIsEdit )
   {
-    size_t aViewId = HYDROGUI_Tool::GetActiveGraphicsViewId( module() );
-    module()->setObjectVisible( aViewId, anObject1, false );
-    module()->setObjectVisible( aViewId, anObject2, false );
+    size_t aViewId = HYDROGUI_Tool::GetActiveOCCViewId( module() );
+    module()->setObjectVisible( aViewId, aPolyline, false );
+    module()->setObjectVisible( aViewId, aProfile, false );
     module()->setObjectVisible( aViewId, aResult, true );
   }
+  module()->setIsToUpdate( aResult );
 
-  theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced;
+  theUpdateFlags = UF_Model | UF_Viewer | UF_GV_Forced | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer;
   return true;
 }