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

diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx
index fdaa86c25..946a93df9 100644
--- a/src/OBJECT/SMESH_ActorUtils.cxx
+++ b/src/OBJECT/SMESH_ActorUtils.cxx
@@ -15,12 +15,15 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
 
 #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>
@@ -32,16 +35,42 @@ static int MYDEBUG = 1;
 static int MYDEBUG = 0;
 #endif
 
-namespace SMESH{
+namespace SMESH
+{
+
+  vtkFloatingPointType
+  GetFloat( const QString& theValue, 
+	    vtkFloatingPointType theDefault )
+  {
+    int pos = theValue.indexOf( ":" );
+    vtkFloatingPointType 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;
+  }
+
+  vtkFloatingPointType
+  GetFloat( const QString& theValue, 
+	    const QString& theSection, 
+	    vtkFloatingPointType theDefault )
+  {
+    vtkFloatingPointType val = theDefault;
+    SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
+    if( mgr )
+      val = (vtkFloatingPointType) mgr->doubleValue( theSection, theValue, theDefault );
 
-  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();
+    return val;
   }
 
-  void WriteUnstructuredGrid(vtkUnstructuredGrid* theGrid, const char* theFileName){
+  void
+  WriteUnstructuredGrid(vtkUnstructuredGrid* theGrid, 
+			const char* theFileName)
+  {
     vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New();
     aWriter->SetFileName(theFileName);
     aWriter->SetInput(theGrid);
@@ -51,4 +80,46 @@ 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, 
+	    vtkFloatingPointType& r, 
+	    vtkFloatingPointType& g, 
+	    vtkFloatingPointType& 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.;
+  }
 }