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

Update in accordance with changes in QtxComboBox.

Browse Source
This commit is contained in:
vsr 2016-06-21 16:08:42 +03:00
parent 31b91717e0
commit d1e1f96ab2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
View File

@ -170,13 +170,13 @@ void GEOMToolsGUI_MarkerDlg::setStandardMarker( GEOM::marker_type type, GEOM::ma
if ( type > GEOM::MT_NONE && type < GEOM::MT_USER ) { if ( type > GEOM::MT_NONE && type < GEOM::MT_USER ) {
myTypeGroup->button( 0 )->setChecked( true ); myTypeGroup->button( 0 )->setChecked( true );
myWGStack->setCurrentIndex( 0 ); myWGStack->setCurrentIndex( 0 );
myStdTypeCombo->setCurrentIndex( (int)type - 1 ); myStdTypeCombo->setCurrentId( (int)type );
#ifdef WIN32 #ifdef WIN32
int asize = max( (int)GEOM::MS_10, min( (int)GEOM::MS_70, (int)size ) ); int asize = max( (int)GEOM::MS_10, min( (int)GEOM::MS_70, (int)size ) );
#else #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 #endif
myStdScaleCombo->setCurrentIndex( asize-1 ); myStdScaleCombo->setCurrentId( asize );
} }
} }
@ -192,17 +192,17 @@ void GEOMToolsGUI_MarkerDlg::setCustomMarker( int id )
GEOM::marker_type GEOMToolsGUI_MarkerDlg::getMarkerType() const GEOM::marker_type GEOMToolsGUI_MarkerDlg::getMarkerType() const
{ {
return myWGStack->currentIndex() == 0 ? (GEOM::marker_type)myStdTypeCombo->currentId() : GEOM::MT_USER; return myWGStack->currentIndex() == 0 ? (GEOM::marker_type)myStdTypeCombo->currentId().toInt() : GEOM::MT_USER;
} }
GEOM::marker_size GEOMToolsGUI_MarkerDlg::getStandardMarkerScale() const GEOM::marker_size GEOMToolsGUI_MarkerDlg::getStandardMarkerScale() const
{ {
return myWGStack->currentIndex() == 0 ? (GEOM::marker_size)myStdScaleCombo->currentId() : GEOM::MS_NONE; return myWGStack->currentIndex() == 0 ? (GEOM::marker_size)myStdScaleCombo->currentId().toInt() : GEOM::MS_NONE;
} }
int GEOMToolsGUI_MarkerDlg::getCustomMarkerID() const int GEOMToolsGUI_MarkerDlg::getCustomMarkerID() const
{ {
return myWGStack->currentIndex() == 1 ? myCustomTypeCombo->currentId() : 0; return myWGStack->currentIndex() == 1 ? myCustomTypeCombo->currentId().toInt() : 0;
} }
void GEOMToolsGUI_MarkerDlg::accept() void GEOMToolsGUI_MarkerDlg::accept()