refs #525: autocolor of zones in a calculation case.

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

diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx
index 6f1adada33b9121c81a475262fb6489338014aa0..159851abf96c293a130ad8011efd8b7298f65a47 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_DataModel.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataModel.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
@@ -453,7 +453,9 @@ void HYDROGUI_DataModel::update( const int theStudyId )
 
 HYDROGUI_DataObject* HYDROGUI_DataModel::getDataObject( const Handle(HYDROData_Entity)& theModelObject )
 {
-  return NULL; // to do if necessary
+  HYDROGUI_DataObject* aGuiObj = dynamic_cast<HYDROGUI_DataObject*>(
+    findObject( HYDROGUI_DataObject::dataObjectEntry( theModelObject ) ) );
+  return aGuiObj;
 }
 
 HYDROGUI_DataObject* HYDROGUI_DataModel::getReferencedDataObject( HYDROGUI_DataObject* theObject )
@@ -637,24 +639,6 @@ bool HYDROGUI_DataModel::paste()
 
         // remove Z layer
         aClone->RemoveZLevel();
-        
-        // generate a new unique name for the clone object:
-        // case 1: Image_1 -> Image_2
-        // case 2: ImageObj -> ImageObj_1
-        QString aName = aClone->GetName();
-        QString aPrefix = aName;
-        if( aName.contains( '_' ) ) // case 1
-        {
-          QString aSuffix = aName.section( '_', -1 );
-          bool anIsInteger = false;
-          aSuffix.toInt( &anIsInteger );
-          if( anIsInteger )
-            aPrefix = aName.section( '_', 0, -2 );
-        }
-        else // case 2
-          aPrefix = aName;
-        aName = HYDROGUI_Tool::GenerateObjectName( (HYDROGUI_Module*)module(), aPrefix );
-        aClone->SetName( aName );
       }
     }
   }
@@ -980,6 +964,11 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
 
     HYDROData_SequenceOfObjects aProfiles = aStreamObj->GetProfiles();
     buildObjectPartition( aGuiObj, aProfiles, tr( "STREAM_PROFILES" ), true );
+
+    Handle(HYDROData_Polyline3D) aBottomPolyline = aStreamObj->GetBottomPolyline();
+    if ( !aBottomPolyline.IsNull() && !aBottomPolyline->IsRemoved() ) {
+      createObject( aGuiObj, aBottomPolyline, aGuiObj->entry(), false );
+    }
   }
 }