Merge from V6_main (04/10/2012)

diff --git a/doc/salome/gui/VISU/images/point_marker_dlg1.png b/doc/salome/gui/VISU/images/point_marker_dlg1.png
index 9bcecefca1dbfd5057a9d132d11e9c547dca60b9..f7bd540ced58c00c7bd00fd04d90191d68743fea 100755 (executable)
Binary files a/doc/salome/gui/VISU/images/point_marker_dlg1.png and b/doc/salome/gui/VISU/images/point_marker_dlg1.png differ

diff --git a/doc/salome/gui/VISU/images/point_marker_dlg2.png b/doc/salome/gui/VISU/images/point_marker_dlg2.png
index 3a67294cdfc15e184e226aa637b2fec99dddecf6..037ac73bfbefeb22eb6f5357a6448480ddfdcdc8 100755 (executable)
Binary files a/doc/salome/gui/VISU/images/point_marker_dlg2.png and b/doc/salome/gui/VISU/images/point_marker_dlg2.png differ

diff --git a/doc/salome/gui/VISU/images/point_marker_dlg3.png b/doc/salome/gui/VISU/images/point_marker_dlg3.png
index bec4a9a39a4344cd67e13bb57605a349e9781ca5..63fd9e4fd97be4d3d806e7a41e278c6ade49baa3 100755 (executable)
Binary files a/doc/salome/gui/VISU/images/point_marker_dlg3.png and b/doc/salome/gui/VISU/images/point_marker_dlg3.png differ

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index a8c76b6b0a0274cb4f605f20199ee5464551464c..d323b9df44840b52a98087ac253c44f7cc4685d0 100644 (file)
--- 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