Modify creation of curves: 1) using QDockWidget instead of QDialog; 2) selection...

[modules/hydro.git] / src / HYDROData / HYDROData_Zone.cxx

diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx
index f87234534466247acc4ab6ad9db284cb10685dc4..fa2c0e16171b80e5c43c83c9cd4c0164c5e629ec 100644 (file)
--- a/src/HYDROData/HYDROData_Zone.cxx
+++ b/src/HYDROData/HYDROData_Zone.cxx
@@ -35,32 +35,34 @@ QStringList HYDROData_Zone::DumpToPython( MapOfTreatedObjects& theTreatedObjects
   return aResList;
 }
 
-void HYDROData_Zone::SetColor( const QColor& theColor )
+QColor HYDROData_Zone::DefaultFillingColor()
 {
-  Handle(TDataStd_IntegerArray) aColorArray;
-  if ( !myLab.FindChild( DataTag_Color ).FindAttribute( TDataStd_IntegerArray::GetID(), aColorArray ) )
-    aColorArray = TDataStd_IntegerArray::Set( myLab.FindChild( DataTag_Color ), 1, 4 );
+  return QColor( Qt::green );
+}
 
-  aColorArray->SetValue( 1, theColor.red()   );
-  aColorArray->SetValue( 2, theColor.green() );
-  aColorArray->SetValue( 3, theColor.blue()  );
-  aColorArray->SetValue( 4, theColor.alpha() );
+void HYDROData_Zone::SetFillingColor( const QColor& theColor )
+{
+  return SetColor( theColor, DataTag_FillingColor );
 }
 
-QColor HYDROData_Zone::GetColor() const
+QColor HYDROData_Zone::GetFillingColor() const
 {
-  QColor aResColor( Qt::green );
+  return GetColor( DefaultFillingColor(), DataTag_FillingColor );
+}
 
-  Handle(TDataStd_IntegerArray) aColorArray;
-  if ( myLab.FindChild( DataTag_Color ).FindAttribute( TDataStd_IntegerArray::GetID(), aColorArray ) )
-  {
-    aResColor.setRed(   aColorArray->Value( 1 ) );
-    aResColor.setGreen( aColorArray->Value( 2 ) );
-    aResColor.setBlue(  aColorArray->Value( 3 ) );
-    aResColor.setAlpha( aColorArray->Value( 4 ) );
-  }
+QColor HYDROData_Zone::DefaultBorderColor()
+{
+  return QColor( Qt::transparent );
+}
 
-  return aResColor;
+void HYDROData_Zone::SetBorderColor( const QColor& theColor )
+{
+  return SetColor( theColor, DataTag_BorderColor );
+}
+
+QColor HYDROData_Zone::GetBorderColor() const
+{
+  return GetColor( DefaultBorderColor(), DataTag_BorderColor );
 }
 
 void HYDROData_Zone::SetPolyline( const Handle(HYDROData_Polyline)& thePolyline )