From: imn Date: Fri, 28 Mar 2014 11:39:34 +0000 (+0400) Subject: 0022531: [CEA 1112] the point markers o and x are inverted X-Git-Tag: V7_4_0a1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7f7181fbabef2f7d802a0a774bd803e3566011fe;p=modules%2Fgeom.git 0022531: [CEA 1112] the point markers o and x are inverted --- diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 542a1e8e8..9950494cb 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -61,8 +61,8 @@ module GEOM /*! * \brief Marker type */ - enum marker_type { MT_NONE, MT_POINT, MT_PLUS, MT_STAR, MT_O, MT_X, MT_O_POINT, MT_O_PLUS, - MT_O_STAR, MT_O_X, MT_BALL, MT_RING1, MT_RING2, MT_RING3, MT_USER }; + enum marker_type { MT_NONE, MT_POINT, MT_PLUS, MT_STAR, MT_X, MT_O, MT_O_POINT, MT_O_PLUS, + MT_O_STAR, MT_O_X, MT_RING1, MT_RING2, MT_RING3, MT_BALL, MT_USER }; /*! * /brief Marker size diff --git a/resources/marker_10.png b/resources/marker_10.png index aa7d85747..ed1935ae1 100755 Binary files a/resources/marker_10.png and b/resources/marker_10.png differ diff --git a/resources/marker_11.png b/resources/marker_11.png index ed1935ae1..b6c09964b 100755 Binary files a/resources/marker_11.png and b/resources/marker_11.png differ diff --git a/resources/marker_12.png b/resources/marker_12.png index b6c09964b..16162a752 100755 Binary files a/resources/marker_12.png and b/resources/marker_12.png differ diff --git a/resources/marker_13.png b/resources/marker_13.png index 16162a752..aa7d85747 100755 Binary files a/resources/marker_13.png and b/resources/marker_13.png differ diff --git a/resources/marker_4.png b/resources/marker_4.png index 78c805532..a994c1100 100755 Binary files a/resources/marker_4.png and b/resources/marker_4.png differ diff --git a/resources/marker_5.png b/resources/marker_5.png index a994c1100..78c805532 100755 Binary files a/resources/marker_5.png and b/resources/marker_5.png differ diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index 940294a91..9d804abfd 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -1615,16 +1615,16 @@ void AddObjectColors (int theDocID, case Aspect_TOM_POINT: aCommand += "GEOM.MT_POINT"; break; case Aspect_TOM_PLUS: aCommand += "GEOM.MT_PLUS"; break; case Aspect_TOM_STAR: aCommand += "GEOM.MT_STAR"; break; - case Aspect_TOM_O: aCommand += "GEOM.MT_O"; break; case Aspect_TOM_X: aCommand += "GEOM.MT_X"; break; + case Aspect_TOM_O: aCommand += "GEOM.MT_O"; break; case Aspect_TOM_O_POINT: aCommand += "GEOM.MT_O_POINT"; break; case Aspect_TOM_O_PLUS: aCommand += "GEOM.MT_O_PLUS"; break; case Aspect_TOM_O_STAR: aCommand += "GEOM.MT_O_STAR"; break; case Aspect_TOM_O_X: aCommand += "GEOM.MT_O_X"; break; - case Aspect_TOM_BALL: aCommand += "GEOM.MT_BALL"; break; case Aspect_TOM_RING1: aCommand += "GEOM.MT_RING1"; break; case Aspect_TOM_RING2: aCommand += "GEOM.MT_RING2"; break; case Aspect_TOM_RING3: aCommand += "GEOM.MT_RING3"; break; + case Aspect_TOM_BALL: aCommand += "GEOM.MT_BALL"; break; default: aCommand += "GEOM.MT_NONE"; break; // just for completeness, should not get here } aCommand += ", ";