X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataModel.cxx;h=f4cb0c9a780bdb520e01518b3516f1db26470cac;hb=f34b90e9e4e02ba65419134d5d37a2e42aecfabf;hp=4a1baf917f2cff0683977c17c43ec6dc5a2ba887;hpb=6e0cd430821292a07e3ec980e6b2cd6cff33d33a;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx
index 4a1baf91..f4cb0c9a 100644
--- a/src/HYDROGUI/HYDROGUI_DataModel.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataModel.cxx
@@ -547,21 +547,25 @@ bool HYDROGUI_DataModel::redo()
 bool HYDROGUI_DataModel::canCopy()
 {
   HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( (HYDROGUI_Module*)module() );
-  if( aSeq.Length() != 1 )
-    return false;
-
-  Handle(HYDROData_Entity) anObject = aSeq.First();
-  if( anObject.IsNull() )
-    return false;
-
-  ObjectKind aKind = anObject->GetKind();
-  if( aKind == KIND_IMAGE ||
-      aKind == KIND_POLYLINE ||
-      aKind == KIND_PROFILE ||
-      aKind == KIND_CALCULATION )
-    return true;
+  bool isCanCopy = !aSeq.IsEmpty();
 
-  return false;
+  for ( Standard_Integer anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ ) {
+    Handle(HYDROData_Entity) anObject = aSeq.Value( anIndex );
+    if( !anObject.IsNull() ) {
+      ObjectKind aKind = anObject->GetKind();
+      bool isUnrecognized = aKind <= KIND_UNKNOWN || aKind > KIND_LAST;
+      bool isChildObject = aKind == KIND_DUMMY_3D || 
+                           aKind == KIND_ZONE ||
+                           aKind == KIND_SHAPES_GROUP || 
+                           aKind == KIND_SPLITTED_GROUP;
+      if ( isUnrecognized || isChildObject ) {
+        isCanCopy = false;
+        break;
+      }
+    }
+  }
+  
+  return isCanCopy;
 }
 
 bool HYDROGUI_DataModel::canPaste()
@@ -705,6 +709,30 @@ LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* theParen
   return new HYDROGUI_NamedObject( theParent, theName, theParentEntry );
 }
 
+void HYDROGUI_DataModel::buildObjectPartition( SUIT_DataObject*                   theObject,
+                                               const HYDROData_SequenceOfObjects& theObjects,
+                                               const QString&                     thePartName,
+                                               const bool                         theIsCreateEmpty )
+{
+  if ( theObjects.IsEmpty() && !theIsCreateEmpty )
+    return;
+
+  HYDROGUI_DataObject* aGuiObj = dynamic_cast<HYDROGUI_DataObject*>( theObject );
+  if ( !aGuiObj )
+    return;
+
+  LightApp_DataObject* aPartSect = 
+    createObject( aGuiObj, thePartName, aGuiObj->entry() );
+
+  HYDROData_SequenceOfObjects::Iterator anIter( theObjects );
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    Handle(HYDROData_Entity) anObj = anIter.Value();
+    if( !anObj.IsNull() && !anObj->IsRemoved() )
+      createObject( aPartSect, anObj, aGuiObj->entry(), false );
+  }
+}
+
 void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
                                           SUIT_DataObject* theObject,
                                           const QString&   theParentEntry,
@@ -725,21 +753,11 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
 
     Handle(HYDROData_DummyObject3D) anObject3D = aGeomObj->GetObject3D();
     if ( !anObject3D.IsNull() )
-      createObject( aGuiObj, anObject3D, aGuiObj->entry(), false );
+      createObject( aGuiObj, anObject3D, "", false );
 
 #ifdef DEB_GROUPS
-    LightApp_DataObject* aGroupsSect = 
-      createObject( aGuiObj, tr( "OBJECT_GROUPS" ), aGuiObj->entry() );
-
     HYDROData_SequenceOfObjects anObjGroups = aGeomObj->GetGroups();
-    HYDROData_SequenceOfObjects::Iterator anIter( anObjGroups );
-    for ( ; anIter.More(); anIter.Next() )
-    {
-      Handle(HYDROData_ShapesGroup) anObjGroup =
-        Handle(HYDROData_ShapesGroup)::DownCast( anIter.Value() );
-      if( !anObjGroup.IsNull() && !anObjGroup->IsRemoved() )
-        createObject( aGroupsSect, anObjGroup, aGuiObj->entry(), false );
-    }
+    buildObjectPartition( aGuiObj, anObjGroups, tr( "OBJECT_GROUPS" ), false );
 #endif
   }
 
@@ -771,9 +789,9 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
     LightApp_DataObject* aBathSect = 
       createObject( aGuiObj, tr( "ZONE_BATHYMETRY" ), aGuiObj->entry() );
 
-    Handle(HYDROData_Bathymetry) aBathymetry = aZoneObj->GetBathymetry();
-    if ( !aBathymetry.IsNull() && !aBathymetry->IsRemoved() )
-      createObject( aBathSect, aBathymetry, aGuiObj->entry(), false );
+    Handle(HYDROData_IAltitudeObject) anAltitudeObj = aZoneObj->GetAltitudeObject();
+    if ( !anAltitudeObj.IsNull() && !anAltitudeObj->IsRemoved() )
+      createObject( aBathSect, anAltitudeObj, aGuiObj->entry(), false );
   }
   else if ( anObjectKind == KIND_POLYLINE )
   {
@@ -805,15 +823,49 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
     LightApp_DataObject* aBathSect = 
       createObject( aGuiObj, tr( "POLYLINE3D_BATHYMETRY" ), aGuiObj->entry() );
 
-    Handle(HYDROData_Bathymetry) aBathymetry = aPolyline3D->GetBathymetry();
-    if ( !aBathymetry.IsNull() && !aBathymetry->IsRemoved() )
-      createObject( aBathSect, aBathymetry, aGuiObj->entry(), false );
+    Handle(HYDROData_IAltitudeObject) anAltitudeObj = aPolyline3D->GetAltitudeObject();
+    if ( !anAltitudeObj.IsNull() && !anAltitudeObj->IsRemoved() )
+      createObject( aBathSect, anAltitudeObj, aGuiObj->entry(), false );
   }
   else if ( anObjectKind == KIND_CALCULATION )
   {
     Handle(HYDROData_CalculationCase) aCaseObj =
       Handle(HYDROData_CalculationCase)::DownCast( aDataObj );
 
+    LightApp_DataObject* aPolylineSect = 
+      createObject( aGuiObj, tr( "CASE_BOUNDARY" ), aGuiObj->entry() );
+
+    Handle(HYDROData_PolylineXY) aPolyline = aCaseObj->GetBoundaryPolyline();
+    if ( !aPolyline.IsNull() && !aPolyline->IsRemoved() )
+      createObject( aPolylineSect, aPolyline, aGuiObj->entry(), false );
+
+    LightApp_DataObject* aCaseAOSect = 
+      createObject( aGuiObj, tr( partitionName( KIND_ARTIFICIAL_OBJECT ).toAscii() ),
+                    aGuiObj->entry() );
+    LightApp_DataObject* aCaseNOSect = 
+      createObject( aGuiObj, tr( partitionName( KIND_NATURAL_OBJECT ).toAscii() ),
+                    aGuiObj->entry() );
+
+    HYDROData_SequenceOfObjects aSeq = aCaseObj->GetGeometryObjects();
+    HYDROData_SequenceOfObjects::Iterator aGOIter( aSeq );
+    Handle(HYDROData_Entity) anEntity;
+    Handle(HYDROData_ArtificialObject) anAObject;
+    Handle(HYDROData_NaturalObject) aNObject;
+    for ( ; aGOIter.More(); aGOIter.Next() )
+    {
+      anEntity = aGOIter.Value();
+      if ( anEntity.IsNull() )
+        continue;
+      anAObject = Handle(HYDROData_ArtificialObject)::DownCast( anEntity );
+      if ( !anAObject.IsNull() )
+        createObject( aCaseAOSect, anAObject, aGuiObj->entry(), false );
+      else
+      {
+        aNObject = Handle(HYDROData_NaturalObject)::DownCast( anEntity );
+        if ( !aNObject.IsNull() )
+          createObject( aCaseNOSect, aNObject, aGuiObj->entry(), false );
+      }
+    }
     LightApp_DataObject* aCaseRegionsSect = 
       createObject( aGuiObj, tr( "CASE_REGIONS" ), aGuiObj->entry() );
 
@@ -826,6 +878,15 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
       if( !aCaseRegion.IsNull() && !aCaseRegion->IsRemoved() )
         createRegion( aCaseRegionsSect, aCaseRegion, "", true, theIsInOperation );
     }
+
+#ifdef DEB_GROUPS
+    HYDROData_SequenceOfObjects aCalcGroups = aCaseObj->GetSplittedGroups();
+    buildObjectPartition( aGuiObj, aCalcGroups, tr( "OBJECT_GROUPS" ), false );
+
+    HYDROData_SequenceOfObjects aCalcSplitGroups = aCaseObj->GetSplittedGroups();
+    buildObjectPartition( aGuiObj, aCalcSplitGroups, tr( "CASE_SPLITTED_GROUPS" ), false );
+#endif
+
   }
   else if ( anObjectKind == KIND_REGION )
   {
@@ -854,11 +915,34 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent,
     Handle(HYDROData_Channel) aChannelObj =
       Handle(HYDROData_Channel)::DownCast( aDataObj );
 
-    Handle(HYDROData_Profile) aProfile = aChannelObj->GetProfile();
+    LightApp_DataObject* aGuideLineSect = 
+      createObject( aGuiObj, tr( "CHANNEL_GUIDE_LINE" ), aGuiObj->entry() );
     Handle(HYDROData_Polyline3D) aGuideLine = aChannelObj->GetGuideLine();
+    if ( !aGuideLine.IsNull() && !aGuideLine->IsRemoved() ) {
+      createObject( aGuideLineSect, aGuideLine, aGuiObj->entry(), false );
+    }
+
+    LightApp_DataObject* aProfileSect = 
+      createObject( aGuiObj, tr( "CHANNEL_PROFILE" ), aGuiObj->entry() );
+    Handle(HYDROData_Profile) aProfile = aChannelObj->GetProfile();
+    if ( !aProfile.IsNull() && !aProfile->IsRemoved() ) {
+      createObject( aProfileSect, aProfile, aGuiObj->entry(), false );
+    }
+  }
+  else if ( anObjectKind == KIND_STREAM )
+  {
+    Handle(HYDROData_Stream) aStreamObj =
+      Handle(HYDROData_Stream)::DownCast( aDataObj );
+
+    LightApp_DataObject* aHydraulicAxisSect = 
+      createObject( aGuiObj, tr( "STREAM_HYDRAULIC_AXIS" ), aGuiObj->entry() );
+    Handle(HYDROData_PolylineXY) aHydraulicAxis = aStreamObj->GetHydraulicAxis();
+    if ( !aHydraulicAxis.IsNull() && !aHydraulicAxis->IsRemoved() ) {
+      createObject( aHydraulicAxisSect, aHydraulicAxis, aGuiObj->entry(), false );
+    }
 
-    createObject( aGuiObj, aProfile, aGuiObj->entry(), false );
-    createObject( aGuiObj, aGuideLine, aGuiObj->entry(), false );
+    HYDROData_SequenceOfObjects aProfiles = aStreamObj->GetProfiles();
+    buildObjectPartition( aGuiObj, aProfiles, tr( "STREAM_PROFILES" ), true );
   }
 }