From efb8a93b758b3a8ca6b277de19e8f9eb5d21b14a Mon Sep 17 00:00:00 2001
From: adv <adv@opencascade.com>
Date: Wed, 15 Jan 2014 10:24:13 +0000
Subject: [PATCH] Colors methods changes.

---
 src/HYDROData/HYDROData_DummyObject3D.cxx |  4 ++--
 src/HYDROData/HYDROData_Object.cxx        | 14 ++------------
 src/HYDROData/HYDROData_Object.h          | 10 ----------
 src/HYDROPy/HYDROData_ImmersibleZone.sip  | 20 --------------------
 src/HYDROPy/HYDROData_Object.sip          | 20 ++++++++++++++++++++
 5 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/src/HYDROData/HYDROData_DummyObject3D.cxx b/src/HYDROData/HYDROData_DummyObject3D.cxx
index d8af281c..1b62d3bd 100644
--- 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 2746e025..719c105b 100644
--- 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 1b6e85fd..312368eb 100644
--- 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 33d46350..1e986fce 100644
--- 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 b8ee1120..39f89026 100644
--- 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:
 
   /**
-- 
2.39.2