Colors methods changes.

diff --git a/src/HYDROData/HYDROData_DummyObject3D.cxx b/src/HYDROData/HYDROData_DummyObject3D.cxx
index d8af281cfbb109eb51f28ef7ae587a925962e707..1b62d3bda541cdecb1c1b6b5ea2f7fff37036718 100644 (file)
--- a/src/HYDROData/HYDROData_DummyObject3D.cxx
+++ b/src/HYDROData/HYDROData_DummyObject3D.cxx
@@ -61,7 +61,7 @@ TopoDS_Shape HYDROData_DummyObject3D::GetShape() const
 
 QColor HYDROData_DummyObject3D::GetFillingColor() const
 {
-  QColor aResColor( HYDROData_Object::DefaultFillingColor() );
+  QColor aResColor( Qt::yellow );
 
   Handle(HYDROData_Object) aFatherObj = GetObject();
   if ( !aFatherObj.IsNull() )
@@ -72,7 +72,7 @@ QColor HYDROData_DummyObject3D::GetFillingColor() const
 
 QColor HYDROData_DummyObject3D::GetBorderColor() const
 {
-  QColor aResColor( HYDROData_Object::DefaultBorderColor() );
+  QColor aResColor( Qt::transparent );
 
   Handle(HYDROData_Object) aFatherObj = GetObject();
   if ( !aFatherObj.IsNull() )

diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 2746e025b2840be85e74a3be11e4120eb1fe39bf..719c105bf908f79ae3ddb090f11af3ce03be4671 100644 (file)
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -188,24 +188,14 @@ QColor HYDROData_Object::GetBorderColor() const
   return GetColor( getDefaultBorderColor(), DataTag_BorderColor );
 }
 
-QColor HYDROData_Object::DefaultFillingColor()
-{
-  return QColor( Qt::yellow );
-}
-
-QColor HYDROData_Object::DefaultBorderColor()
-{
-  return QColor( Qt::transparent );
-}
-
 QColor HYDROData_Object::getDefaultFillingColor() const
 {
-  return DefaultFillingColor();
+  return QColor( Qt::yellow );
 }
 
 QColor HYDROData_Object::getDefaultBorderColor() const
 {
-  return DefaultBorderColor();
+  return QColor( Qt::transparent );
 }
 
 ObjectKind HYDROData_Object::getAltitudeObjectType() const

diff --git a/src/HYDROData/HYDROData_Object.h b/src/HYDROData/HYDROData_Object.h
index 1b6e85fd6a964256eb847ae6591f1a4423575b32..312368eb183a5b3aca8188c0e2ffdb6cbc275cee 100644 (file)
--- a/src/HYDROData/HYDROData_Object.h
+++ b/src/HYDROData/HYDROData_Object.h
@@ -130,16 +130,6 @@ public:
    */
   HYDRODATA_EXPORT virtual QColor GetBorderColor() const;
 
-  /**
-   * Returns default filling color for new object.
-   */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
-
-  /**
-   * Returns default border color for new object.
-   */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
-
 protected:
 
   /**

diff --git a/src/HYDROPy/HYDROData_ImmersibleZone.sip b/src/HYDROPy/HYDROData_ImmersibleZone.sip
index 33d46350dbb91f0954f356349c9fd2fc05de684b..1e986fce14df2ebfd0c4a06eca2f34f6bf3d20de 100644 (file)
--- a/src/HYDROPy/HYDROData_ImmersibleZone.sip
+++ b/src/HYDROPy/HYDROData_ImmersibleZone.sip
@@ -46,26 +46,6 @@ class HYDROData_ImmersibleZone : HYDROData_NaturalObject
 
 public:      
 
-  /**
-   * Sets filling color for zone.
-   */
-  void SetFillingColor( const QColor& theColor );
-
-  /**
-   * Returns filling color of zone.
-   */
-  QColor GetFillingColor() const;
-
-  /**
-   * Sets border color for zone.
-   */
-  void SetBorderColor( const QColor& theColor );
-
-  /**
-   * Returns border color of zone.
-   */
-  QColor GetBorderColor() const;
-
   /**
    * Sets reference polyline object for zone.
    */

diff --git a/src/HYDROPy/HYDROData_Object.sip b/src/HYDROPy/HYDROData_Object.sip
index b8ee11204fa40fb4ba3b208412cdec14ad8b0a76..39f890264827b8b210899deb94e1a045f1dd9512 100644 (file)
--- a/src/HYDROPy/HYDROData_Object.sip
+++ b/src/HYDROPy/HYDROData_Object.sip
@@ -118,6 +118,26 @@ public:
    */
   void RemoveAltitudeObject();
 
+  /**
+   * Sets filling color for zone.
+   */
+  virtual void SetFillingColor( const QColor& theColor );
+
+  /**
+   * Returns filling color of zone.
+   */
+  virtual QColor GetFillingColor() const;
+
+  /**
+   * Sets border color for zone.
+   */
+  virtual void SetBorderColor( const QColor& theColor );
+
+  /**
+   * Returns border color of zone.
+   */
+  virtual QColor GetBorderColor() const;
+
 protected:
 
   /**