ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-24 01:22:05 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
amx 2007-01-29 15:52:55 +00:00
parent 472ebcad1d
commit 4d98127e08
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -237,12 +237,12 @@ GEOM_Displayer::GEOM_Displayer( SalomeApp_Study* st )
myShadingColor = SalomeApp_Tools::color( col ); myShadingColor = SalomeApp_Tools::color( col );
myDisplayMode = resMgr->integerValue("Geometry", "display_mode", 0); 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.); myScaleOfMarker = resMgr->doubleValue("Geometry", "marker_scale", 1.);
if(myScaleOfMarker < 1.) if(myScaleOfMarker < 1.0)
myScaleOfMarker = 1.; myScaleOfMarker = 1.0;
if(myScaleOfMarker > 8.) if(myScaleOfMarker > 7.)
myScaleOfMarker = 8.; myScaleOfMarker = 7.;
myColor = -1; myColor = -1;

40
src/GEOMGUI/GeometryGUI.cxx
View File

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