Preferences-Mesh-General tab: regressions and reorganization.

[modules/smesh.git] / src / OBJECT / SMESH_Actor.cxx

diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx
index bdadcf0261d669de0a64417155f5b781e0774c3e..1d83c6501d12beba09fdf80dfca7d83df53dd6de 100644 (file)
--- a/src/OBJECT/SMESH_Actor.cxx
+++ b/src/OBJECT/SMESH_Actor.cxx
@@ -116,7 +116,10 @@ SMESH_ActorDef::SMESH_ActorDef()
   myIsShrinkable = false;
   myIsShrunk = false;
 
-  myControlsPrecision = (long)SMESH::GetFloat( "SMESH:controls_precision", -1 );
+  myControlsPrecision = -1;
+  SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
+  if ( mgr && mgr->booleanValue( "SMESH", "use_precision", false ) )
+    myControlsPrecision = (long)SMESH::GetFloat( "SMESH", "controls_precision", -1 );
 
   float aPointSize = SMESH::GetFloat("SMESH:node_size",3);
   float aLineWidth = SMESH::GetFloat("SMESH:element_width",1);
@@ -278,7 +281,7 @@ SMESH_ActorDef::SMESH_ActorDef()
   myScalarBarActor->SetVisibility(false);
   myScalarBarActor->SetLookupTable(myLookupTable);
 
-  SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
+  mgr = SUIT_Session::session()->resourceMgr();
   if( !mgr )
     return;
 
@@ -743,18 +746,18 @@ bool SMESH_ActorDef::Init(TVisualObjPtr theVisualObj,
   if( !mgr )
     return false;
 
-  QString aMode = mgr->stringValue( "SMESH", "display_mode" );
+  int aMode = mgr->integerValue( "SMESH", "display_mode" );
   SetRepresentation(-1);
   
-  if(aMode.compare("Wireframe") == 0){
+  if(aMode == 0){
     SetRepresentation(eEdge);
-  }else if(aMode.compare("Shading") == 0){
+  }else if(aMode == 1){
     SetRepresentation(eSurface);
-  }else if(aMode.compare("Nodes") == 0){
+  }else if(aMode == 2){
     SetRepresentation(ePoint);
   }
   
-  if(aMode == "Shrink"){
+  if(aMode == 3){
     SetShrink();
   }