X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOBJECT%2FSMESH_ActorUtils.cxx;h=feee143db948dd0510aa8ec57b3d4ee291f974a1;hb=c0562941eac9e5a0a8b36d731f3348fe09bf32d0;hp=fdaa86c251d9f09a99fa622439afb9f024c00a6a;hpb=090aff07266d376ae028ae43434bdea7c0a0f9bb;p=modules%2Fsmesh.git

diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx
index fdaa86c25..feee143db 100644
--- a/src/OBJECT/SMESH_ActorUtils.cxx
+++ b/src/OBJECT/SMESH_ActorUtils.cxx
@@ -20,7 +20,10 @@
 
 #include "SMESH_ActorUtils.h"
 
-#include "QAD_Config.h"
+#include "SUIT_Tools.h"
+#include "SUIT_Session.h"
+#include "SUIT_ResourceMgr.h"
+
 #include "utilities.h"
 
 #include <vtkUnstructuredGrid.h>
@@ -34,11 +37,28 @@ static int MYDEBUG = 0;
 
 namespace SMESH{
 
-  float GetFloat(const QString& theValue, float theDefault){
-    if(theValue.isEmpty()) return theDefault;
-    QString aValue = QAD_CONFIG->getSetting(theValue);
-    if(aValue.isEmpty()) return theDefault;
-    return aValue.toFloat();
+  float GetFloat( const QString& theValue, float theDefault )
+  {
+    int pos = theValue.find( ":" );
+    float val = theDefault;
+    if( pos>=0 ) 
+    {
+      QString name = theValue.right( theValue.length()-pos-1 ),
+              sect = theValue.left( pos );
+      if( !name.isEmpty() && !sect.isEmpty() )
+	val = GetFloat( name, sect, theDefault );
+    }
+    return val;
+  }
+
+  float GetFloat( const QString& theValue, const QString& theSection, float theDefault )
+  {
+    float val = theDefault;
+    SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
+    if( mgr )
+      val = (float) mgr->doubleValue( theValue, theSection, theDefault );
+
+    return val;
   }
 
   void WriteUnstructuredGrid(vtkUnstructuredGrid* theGrid, const char* theFileName){
@@ -51,4 +71,31 @@ namespace SMESH{
     aWriter->Delete();
   }
 
+  QColor GetColor( const QString& theSect, const QString& theName, const QColor& def )
+  {
+    QColor c = def;
+    SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
+    if ( mgr )
+      c = mgr->colorValue( theSect, theName, def );
+    return c;
+  }
+
+  void GetColor( const QString& theSect, const QString& theName, int& r, int& g, int& b, const QColor& def )
+  {
+    QColor c = def;
+    SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
+    if ( mgr )
+      c = mgr->colorValue( theSect, theName, def );
+
+    SUIT_Tools::rgbSet( SUIT_Tools::rgbSet( c ), r, g, b );
+  }
+
+  void GetColor( const QString& theSect, const QString& theName, float& r, float& g, float& b, const QColor& def )
+  {
+    int ir( 0 ), ig( 0 ), ib( 0 );
+    GetColor( theSect, theName, ir, ig, ib, def );
+    r = ir / 255.;
+    g = ig / 255.;
+    b = ib / 255.;
+  }
 }