X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataObject.cxx;h=116afcc2ee641cd2b2aa1a816ef9c668384788b3;hb=a4f3b004326025e1760d4f5e922c6b79a9a451ca;hp=8ec9658dab3b3c3120276eaca84a192d9b5e15f6;hpb=d6a8c59ee076938a924fcfd1e3f83ef1395b7336;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_DataObject.cxx b/src/HYDROGUI/HYDROGUI_DataObject.cxx
index 8ec9658d..116afcc2 100644
--- a/src/HYDROGUI/HYDROGUI_DataObject.cxx
+++ b/src/HYDROGUI/HYDROGUI_DataObject.cxx
@@ -19,7 +19,10 @@
 #include "HYDROGUI_DataObject.h"
 
 #include <HYDROData_DummyObject3D.h>
+#include <HYDROData_ImmersibleZone.h>
 #include <HYDROData_Object.h>
+#include <HYDROData_ArtificialObject.h>
+#include <HYDROData_NaturalObject.h>
 
 #include <TDF_Tool.hxx>
 
@@ -32,13 +35,16 @@
 #include <SUIT_Study.h>
 
 #include <QPixmap>
+#include <QPainter>
 
 HYDROGUI_DataObject::HYDROGUI_DataObject( SUIT_DataObject* theParent, 
                                           Handle(HYDROData_Entity) theData,
                                           const QString& theParentEntry,
                                           const bool theIsInOperation )
 : CAM_DataObject( theParent ),
+#ifndef TEST_MODE
   LightApp_DataObject( theParent ),
+#endif
   myData( theData ),
   myParentEntry( theParentEntry ),
   myIsValid( true ),
@@ -49,7 +55,7 @@ HYDROGUI_DataObject::HYDROGUI_DataObject( SUIT_DataObject* theParent,
 QString HYDROGUI_DataObject::entry() const
 {
   QString anEntry = HYDROGUI_DataObject::dataObjectEntry( modelObject() );
-  if( isReference() )
+  if( !refEntry().isEmpty() )
     anEntry.prepend( myParentEntry + "_" );
   return anEntry;
 }
@@ -70,7 +76,7 @@ QString HYDROGUI_DataObject::name() const
 
 QFont HYDROGUI_DataObject::font( const int theId ) const
 {
-  QFont aFont = LightApp_DataObject::font( theId );
+  QFont aFont = PARENT::font( theId );
   if( theId == NameId )
   {
     Handle(HYDROData_Entity) aDataObject = modelObject();
@@ -129,7 +135,7 @@ QColor HYDROGUI_DataObject::color( const ColorRole theRole, const int theId ) co
   }
 
   if ( !aColor.isValid() ) {
-    aColor = LightApp_DataObject::color( theRole, theId );
+    aColor = PARENT::color( theRole, theId );
   }
 
   return aColor;
@@ -142,6 +148,15 @@ QPixmap HYDROGUI_DataObject::icon( const int theId ) const
   {
     QString anIcon;
     Handle(HYDROData_Entity) aDataObject = modelObject();
+    Handle(HYDROData_Object) anObject;
+    Handle(HYDROData_ArtificialObject) anAObject = Handle( HYDROData_ArtificialObject )::DownCast(aDataObject);
+    Handle(HYDROData_NaturalObject) aNObject = Handle( HYDROData_NaturalObject )::DownCast(aDataObject);
+    
+    if (!anAObject.IsNull())
+      anObject = anAObject;
+    if (!aNObject.IsNull())
+      anObject = aNObject;
+
     if( aDataObject.IsNull() )
     {
       anIcon = QObject::tr( "HYDRO_TYPE0_ICO" ); // KIND_UNKNOWN
@@ -151,6 +166,7 @@ QPixmap HYDROGUI_DataObject::icon( const int theId ) const
       QString aNeedUpdate( aDataObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) ? "M_" : "" );
 
       int anObjectKind = (int)aDataObject->GetKind();
+      bool IsUnsImmZone = false;
       if ( anObjectKind == KIND_DUMMY_3D )
       {
         Handle(HYDROData_DummyObject3D) anObject3D = 
@@ -160,13 +176,34 @@ QPixmap HYDROGUI_DataObject::icon( const int theId ) const
         if ( !aFatherObj.IsNull() )
           anObjectKind = aFatherObj->GetKind();
       }
-
-      anIcon = QObject::tr( QString("HYDRO_%1TYPE%2_ICO").arg( aNeedUpdate ).arg( anObjectKind ).toAscii() );
+      else if ( !anObject.IsNull() )
+      {
+        bool IsSubm = anObject->IsSubmersible();
+        QString anIcon1 = QObject::tr( QString("HYDRO_%1TYPE%2_ICO").arg( aNeedUpdate ).arg( anObjectKind ).toLatin1() );
+        QString anIcon2;
+        if (IsSubm) 
+          anIcon2 = QObject::tr( QString("HYDRO_SUBMERSIBLE16_ICO").toLatin1());
+        else
+          anIcon2 = QObject::tr( QString("HYDRO_UNSUBMERSIBLE16_ICO").toLatin1());
+
+        QPixmap qpm1 = aResMgr->loadPixmap( "HYDRO", anIcon1 );
+        QPixmap qpm2 = aResMgr->loadPixmap( "HYDRO", anIcon2 );
+        QPixmap qpmD(32,16);
+        qpmD.fill(QColor(0,0,0));
+        QPainter painter;
+        painter.begin(&qpmD);
+        painter.drawPixmap(0, 0, qpm1);
+        painter.drawPixmap(16, 0, qpm2);
+        painter.end();
+        return qpmD;
+      }
+      else
+        anIcon = QObject::tr( QString("HYDRO_%1TYPE%2_ICO").arg( aNeedUpdate ).arg( anObjectKind ).toLatin1() );
     }
 
     return aResMgr->loadPixmap( "HYDRO", anIcon );
   }
-  return LightApp_DataObject::icon( theId );
+  return PARENT::icon( theId );
 }
 
 QString HYDROGUI_DataObject::dataObjectEntry( const Handle(HYDROData_Entity)& theObject,
@@ -211,7 +248,7 @@ bool HYDROGUI_DataObject::renameAllowed( const int theColumnId ) const
   }
   else
   {
-    aRes = LightApp_DataObject::renameAllowed( theColumnId );
+    aRes = PARENT::renameAllowed( theColumnId );
   }
   return aRes;
 }
@@ -235,7 +272,9 @@ HYDROGUI_NamedObject::HYDROGUI_NamedObject( SUIT_DataObject* theParent,
                                             const QString&   theParentEntry,
                                             const bool       theIsInOperation  )
 : CAM_DataObject( theParent ),
+#ifndef TEST_MODE
   LightApp_DataObject( theParent ),
+#endif
   myName( theName ),
   myParentEntry( theParentEntry ),
   myIsInOperation( theIsInOperation )
@@ -262,12 +301,12 @@ QPixmap HYDROGUI_NamedObject::icon( const int theId ) const
   {
     return aResMgr->loadPixmap( "HYDRO", QObject::tr( "PARTITION_ICO" ) );
   }
-  return LightApp_DataObject::icon( theId );
+  return PARENT::icon( theId );
 }
 
 QFont HYDROGUI_NamedObject::font( const int theId ) const
 {
-  QFont aFont = LightApp_DataObject::font( theId );
+  QFont aFont = PARENT::font( theId );
   if( theId == NameId )
   {
   if ( dynamic_cast<CAM_ModuleObject*>( parent() ) )