PAL13456 : change default values for Vertex Maker style and size.

diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index 48827ca65636a376793bab2123530c206887e003..1511436a7cf66248777a2fa74f7ebffbbcdc9db9 100644 (file)
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -237,12 +237,12 @@ GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* st )
   myShadingColor = SalomeApp_Tools::color( col );
 
   myDisplayMode = resMgr->integerValue("Geometry", "display_mode", 0);
-  myTypeOfMarker = (Aspect_TypeOfMarker)resMgr->integerValue("Geometry", "type_of_marker", 0);
+  myTypeOfMarker = (Aspect_TypeOfMarker)resMgr->integerValue("Geometry", "type_of_marker", Aspect_TOM_PLUS);
   myScaleOfMarker = resMgr->doubleValue("Geometry", "marker_scale", 1.);
-  if(myScaleOfMarker < 1.)
-    myScaleOfMarker = 1.;
-  if(myScaleOfMarker > 8.)
-    myScaleOfMarker = 8.;
+  if(myScaleOfMarker < 1.0)
+    myScaleOfMarker = 1.0;
+  if(myScaleOfMarker > 7.)
+    myScaleOfMarker = 7.;
 
 
   myColor = -1;

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index bd3d9759d661a63aebcbb4c595c09d1060354aff..1362269dcc6ca44d0b36fb248fab4a61f2515075 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -1680,7 +1680,7 @@ void GeometryGUI::createPreferences()
                                     LightApp_Preferences::Selector, "Geometry", "type_of_marker" );
 
   int markerScale = addPreference( tr( "PREF_MARKER_SCALE" ), VertexGroup,
-                                   LightApp_Preferences::IntSpin, "Geometry", "marker_scale" );
+                                   LightApp_Preferences::DblSpin, "Geometry", "marker_scale" );
 
   // Set property for default display mode
   QStringList aModesList;
@@ -1701,34 +1701,44 @@ void GeometryGUI::createPreferences()
 
   // Set property for type of vertex marker
   QStringList aTypeOfMarkerList;
-  aTypeOfMarkerList.append( tr("TOM_POINT") );
+  QValueList<QVariant> anTypeOfMarkerIndexesList;
+
   aTypeOfMarkerList.append( tr("TOM_PLUS") );
-  aTypeOfMarkerList.append( tr("TOM_STAR") );
-  aTypeOfMarkerList.append( tr("TOM_O") );
-  aTypeOfMarkerList.append( tr("TOM_X") );
-  aTypeOfMarkerList.append( tr("TOM_O_POINT") );
-  aTypeOfMarkerList.append( tr("TOM_O_PLUS") );
-  aTypeOfMarkerList.append( tr("TOM_O_STAR") );
-  aTypeOfMarkerList.append( tr("TOM_O_X") );
+  anTypeOfMarkerIndexesList.append(Aspect_TOM_PLUS);
 
-  QValueList<QVariant> anTypeOfMarkerIndexesList;
+  aTypeOfMarkerList.append( tr("TOM_POINT") );
   anTypeOfMarkerIndexesList.append(Aspect_TOM_POINT);
-  anTypeOfMarkerIndexesList.append(Aspect_TOM_PLUS);
+
+  aTypeOfMarkerList.append( tr("TOM_STAR") );
   anTypeOfMarkerIndexesList.append(Aspect_TOM_STAR);
+
+  aTypeOfMarkerList.append( tr("TOM_O") );
   anTypeOfMarkerIndexesList.append(Aspect_TOM_O);
+
+  aTypeOfMarkerList.append( tr("TOM_X") );
   anTypeOfMarkerIndexesList.append(Aspect_TOM_X);
+
+  aTypeOfMarkerList.append( tr("TOM_O_POINT") );
   anTypeOfMarkerIndexesList.append(Aspect_TOM_O_POINT);
+
+  aTypeOfMarkerList.append( tr("TOM_O_PLUS") );
   anTypeOfMarkerIndexesList.append(Aspect_TOM_O_PLUS);
+
+  aTypeOfMarkerList.append( tr("TOM_O_STAR") );
   anTypeOfMarkerIndexesList.append(Aspect_TOM_O_STAR);
+
+  aTypeOfMarkerList.append( tr("TOM_O_X") );
   anTypeOfMarkerIndexesList.append(Aspect_TOM_O_X);
 
+
   setPreferenceProperty( typeOfMarker, "strings", aTypeOfMarkerList );
   setPreferenceProperty( typeOfMarker, "indexes", anTypeOfMarkerIndexesList );
 
   // Set property for Vertex Marker scale
-  setPreferenceProperty( markerScale, "min", 0.25 );
-  setPreferenceProperty( markerScale, "max", 10. );
-  setPreferenceProperty( markerScale, "precision", 1 );
+  setPreferenceProperty( markerScale, "min", 1. );
+  setPreferenceProperty( markerScale, "max", 7. );
+  setPreferenceProperty( markerScale, "precision", 0.01 );
+  setPreferenceProperty( markerScale, "step", 0.5 );
 
 }