From: vsr <vsr@opencascade.com>
Date: Mon, 8 Oct 2012 11:22:44 +0000 (+0000)
Subject: Merge from V6_main (04/10/2012)
X-Git-Tag: V7_0_0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=df04f83f4ef915d1f965328cc4ccccbbb408d423;p=modules%2Fvisu.git

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 9bcecefc..f7bd540c 100755
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 3a67294c..037ac73b 100755
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 bec4a9a3..63fd9e4f 100755
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 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