From: vsr Date: Wed, 3 Oct 2012 13:46:55 +0000 (+0000) Subject: 0021711: [CEA 579] Simplify Properties dialog accordingly to dimension of mesh X-Git-Tag: V6_main_20121004 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3e85effe9758c76dcc314012cf55a6ece2d38f97;p=modules%2Fvisu.git 0021711: [CEA 579] Simplify Properties dialog accordingly to dimension of mesh --- diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index a8c76b6b..d323b9df 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -1598,25 +1598,25 @@ VisuGUI VTKViewer_MarkerDlg* aDlg = new VTKViewer_MarkerDlg( GetDesktop( this ) ); aDlg->setHelpData( "VISU", "point_marker_page.html" ); - aDlg->setCustomMarkerMap( aMarkerMap[ aStudyId ] ); + aDlg->setCustomMarkers( aMarkerMap[ aStudyId ] ); - aDlg->addExtraStdMarker( VTK::MT_POINT_SPRITE, aPointSpritePixmap ); + aDlg->addMarker( VTK::MT_POINT_SPRITE, aPointSpritePixmap ); VISU::MarkerType aMarkerTypeCurrent = aPrs->GetMarkerType(); VISU::MarkerScale aMarkerScaleCurrent = aPrs->GetMarkerScale(); int aMarkerTextureCurrent = aPrs->GetMarkerTexture(); if( aMarkerTypeCurrent != VISU::MT_USER ) - aDlg->setStandardMarker( (VTK::MarkerType)aMarkerTypeCurrent, (VTK::MarkerScale)aMarkerScaleCurrent ); + aDlg->setMarker( (VTK::MarkerType)aMarkerTypeCurrent, (VTK::MarkerScale)aMarkerScaleCurrent ); else aDlg->setCustomMarker( aMarkerTextureCurrent ); if( aDlg->exec() ) { - aMarkerMap[ aStudyId ] = aDlg->getCustomMarkerMap(); + aMarkerMap[ aStudyId ] = aDlg->customMarkers(); - VISU::MarkerType aMarkerTypeNew = (VISU::MarkerType)aDlg->getMarkerType(); - VISU::MarkerScale aMarkerScaleNew = (VISU::MarkerScale)aDlg->getStandardMarkerScale(); - int aMarkerTextureNew = aDlg->getCustomMarkerID(); + VISU::MarkerType aMarkerTypeNew = (VISU::MarkerType)aDlg->markerType(); + VISU::MarkerScale aMarkerScaleNew = (VISU::MarkerScale)aDlg->markerScale(); + int aMarkerTextureNew = aDlg->markerId(); if( aMarkerTypeNew != VISU::MT_USER ) aPrs->SetMarkerStd( aMarkerTypeNew, aMarkerScaleNew ); else