X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_Preferences.cpp;h=68e275d213504e78b2adf87a9fdbfe3bdc53328f;hb=584f97832c77adf0c9df154b2f3eb1835bd3ce9e;hp=c14fd6dd9e72557202372d764b764189d117d3bc;hpb=7074394f8f08413d885f63be01df6bd5007b868c;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_Preferences.cpp b/src/ModuleBase/ModuleBase_Preferences.cpp
index c14fd6dd9..68e275d21 100644
--- a/src/ModuleBase/ModuleBase_Preferences.cpp
+++ b/src/ModuleBase/ModuleBase_Preferences.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "ModuleBase_Preferences.h"
@@ -188,6 +187,26 @@ void ModuleBase_Preferences::createCustomPage(ModuleBase_IPrefMgr* thePref, int
         if(aProp->type() == Config_Prop::Directory) {
           thePref->setItemProperty("path_type", Qtx::PT_Directory, anId);
         }
+        if (aPrefType == SUIT_PreferenceMgr::DblSpin) {
+          if (aProp->min() != "") {
+            double aMin = QString(aProp->min().c_str()).toDouble();
+            thePref->setItemProperty("min", aMin, anId);
+          }
+          if (aProp->max() != "") {
+            double aMax = QString(aProp->max().c_str()).toDouble();
+            thePref->setItemProperty("max", aMax, anId);
+          }
+        }
+        if (aPrefType == SUIT_PreferenceMgr::IntSpin) {
+          if (aProp->min() != "") {
+            int aMin = QString(aProp->min().c_str()).toInt();
+            thePref->setItemProperty("min", aMin, anId);
+          }
+          if (aProp->max() != "") {
+            int aMax = QString(aProp->max().c_str()).toInt();
+            thePref->setItemProperty("max", aMax, anId);
+          }
+        }
       }
     }
   }
@@ -254,7 +273,7 @@ ModuleBase_PreferencesDlg::ModuleBase_PreferencesDlg(SUIT_ResourceMgr* theResurc
   createEditors();
 
   myPreferences->retrieve();
-  setMinimumSize(800, 240);
+  setMinimumSize(820, 300);
 }
 
 ModuleBase_PreferencesDlg::~ModuleBase_PreferencesDlg()
@@ -320,10 +339,52 @@ void ModuleBase_PreferencesDlg::createViewerPage(int thePageId)
 
   int sensitivityGroup = myPreferences->addItem(tr("Selection sensitivity"), viewTab);
   myPreferences->setItemProperty("columns", 2, sensitivityGroup);
-  myPreferences->addItem(tr("Vertex"), sensitivityGroup, SUIT_PreferenceMgr::Double,
+  myPreferences->addItem(tr("Vertex"), sensitivityGroup, SUIT_PreferenceMgr::DblSpin,
                          ModuleBase_Preferences::VIEWER_SECTION, "point-selection-sensitivity");
-  myPreferences->addItem(tr("Edge"), sensitivityGroup, SUIT_PreferenceMgr::Double,
+  myPreferences->addItem(tr("Edge"), sensitivityGroup, SUIT_PreferenceMgr::DblSpin,
                          ModuleBase_Preferences::VIEWER_SECTION, "edge-selection-sensitivity");
+
+  int highlightGroup = myPreferences->addItem(tr("Additional highlighting"), viewTab);
+  myPreferences->setItemProperty("columns", 2, highlightGroup);
+  myPreferences->addItem(tr("In 3d mode"), highlightGroup,
+    SUIT_PreferenceMgr::Bool, ModuleBase_Preferences::VIEWER_SECTION, "highlighting-3d");
+  myPreferences->addItem(tr("In 2d mode"), highlightGroup,
+    SUIT_PreferenceMgr::Bool, ModuleBase_Preferences::VIEWER_SECTION, "highlighting-2d");
+
+  int colorScaleGroup = myPreferences->addItem(tr("Color scale"), viewTab);
+  myPreferences->setItemProperty("columns", 4, colorScaleGroup);
+  int aItem = myPreferences->addItem(tr("X position"), colorScaleGroup,
+    SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_x_position");
+  myPreferences->setItemProperty("min", 0, aItem);
+  myPreferences->setItemProperty("max", 1, aItem);
+
+  aItem = myPreferences->addItem(tr("Y position"), colorScaleGroup,
+    SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_y_position");
+  myPreferences->setItemProperty("min", 0, aItem);
+  myPreferences->setItemProperty("max", 1, aItem);
+
+  aItem = myPreferences->addItem(tr("Width"), colorScaleGroup,
+    SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_width");
+  myPreferences->setItemProperty("min", 0, aItem);
+  myPreferences->setItemProperty("max", 1, aItem);
+
+  aItem = myPreferences->addItem(tr("Height"), colorScaleGroup,
+    SUIT_PreferenceMgr::Double, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_height");
+  myPreferences->setItemProperty("min", 0, aItem);
+  myPreferences->setItemProperty("max", 1, aItem);
+
+  aItem = myPreferences->addItem(tr("Intervals number"), colorScaleGroup,
+    SUIT_PreferenceMgr::Integer, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_nb_intervals");
+  myPreferences->setItemProperty("min", 0, aItem);
+  myPreferences->setItemProperty("max", 100, aItem);
+
+  aItem = myPreferences->addItem(tr("Text height"), colorScaleGroup,
+    SUIT_PreferenceMgr::Integer, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_text_height");
+  myPreferences->setItemProperty("min", 0, aItem);
+  myPreferences->setItemProperty("max", 100, aItem);
+
+  aItem = myPreferences->addItem(tr("Text color"), colorScaleGroup,
+    SUIT_PreferenceMgr::Color, ModuleBase_Preferences::VIEWER_SECTION, "scalar_bar_text_color");
 }
 
 void ModuleBase_PreferencesDlg::createMenuPage(int thePageId)