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

Additional fix for Windows compatibility.

Browse Source
This commit is contained in:
vsr 2009-11-10 15:13:44 +00:00
parent 776b61d3bb
commit 60d195f9bf
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
View File

@ -169,7 +169,11 @@ void GEOMToolsGUI_MarkerDlg::setStandardMarker( GEOM::marker_type type, GEOM::ma
myTypeGroup->button( 0 )->setChecked( true ); myTypeGroup->button( 0 )->setChecked( true );
myWGStack->setCurrentIndex( 0 ); myWGStack->setCurrentIndex( 0 );
myStdTypeCombo->setCurrentIndex( (int)type - 1 ); myStdTypeCombo->setCurrentIndex( (int)type - 1 );
#ifdef WNT
int asize = max( (int)GEOM::MS_10, min( (int)GEOM::MS_70, (int)size ) );
#else
int asize = std::max( (int)GEOM::MS_10, std::min( (int)GEOM::MS_70, (int)size ) ); int asize = std::max( (int)GEOM::MS_10, std::min( (int)GEOM::MS_70, (int)size ) );
#endif
myStdScaleCombo->setCurrentIndex( asize-1 ); myStdScaleCombo->setCurrentIndex( asize-1 );
} }
} }
@ -309,6 +313,9 @@ void GEOMToolsGUI_MarkerDlg::init()
setStandardMarker( aType, aSize ); setStandardMarker( aType, aSize );
else if ( aType == GEOM::MT_USER ) else if ( aType == GEOM::MT_USER )
setCustomMarker( aTexture ); setCustomMarker( aTexture );
else
setStandardMarker((GEOM::marker_type)(resMgr->integerValue("Geometry", "type_of_marker", (int)Aspect_TOM_PLUS) + 1),
(GEOM::marker_size)(resMgr->integerValue("Geometry", "marker_scale", 1)));
} }
void GEOMToolsGUI_MarkerDlg::addTexture( int id, bool select ) const void GEOMToolsGUI_MarkerDlg::addTexture( int id, bool select ) const