From 7f7181fbabef2f7d802a0a774bd803e3566011fe Mon Sep 17 00:00:00 2001
From: imn <imn@opencascade.com>
Date: Fri, 28 Mar 2014 15:39:34 +0400
Subject: [PATCH] 0022531: [CEA 1112] the point markers o and x are inverted

---
 idl/GEOM_Gen.idl         |   4 ++--
 resources/marker_10.png  | Bin 333 -> 237 bytes
 resources/marker_11.png  | Bin 237 -> 234 bytes
 resources/marker_12.png  | Bin 234 -> 234 bytes
 resources/marker_13.png  | Bin 234 -> 333 bytes
 resources/marker_4.png   | Bin 274 -> 266 bytes
 resources/marker_5.png   | Bin 266 -> 274 bytes
 src/GEOM/GEOM_Engine.cxx |   4 ++--
 8 files changed, 4 insertions(+), 4 deletions(-)

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 aa7d857472f6d984f42f1e401041772d808b2658..ed1935ae1c381274d7ad4d8bc32031af03e9bcc5 100755
GIT binary patch
delta 147
zcmV;E0Brxw0__2iVt+9q-IGcs0001ONkl<ZILoDzK@xy42m>3&XS9d@|4|<FAMxfm
z6#;=`3z=?GK(bY8(+>NXFV*wdq4nbV0&UO}l0U;*pR{6uq|0pGON8^wKo_Bp=^}{Z
zcurttwi3GkK{UqIlX8p_aoS1*+A^hgp@fjF3y*_63o>nCEerqv002ovPDHLkV1oW~
BK{fyY

delta 243
zcmV<P01W@_0nGxCVt+Rcxe<Xt0002ZNkl<ZILob*Ar8YZ3`Ol|prB=eEhy_Da)Xi_
zrX(i_@nJ%GgC3%6V1s2F81qn~Oz|dl?Uw?Qe7}5I4l*+w(M39JyS|{_Z&#GOm?wyZ
zO<fhn$MYqE5+E-ghM@qg>ncK2ZffcZhzPXS#Udgx88S1pU2M<sWvw+>YhhWIWHQD;
z2m!WjOG#o1B{e1%d+#ydOH$u1y!SZIGe^j7fOC$=aYW}F?*<rS5+vXMoP*d%B7zV?
tVYJr5G)*53JY^2fo5WN8!aq`QP;XTwf3;VpUbO%K002ovPDHLkV1m8TWYPct

diff --git a/resources/marker_11.png b/resources/marker_11.png
index ed1935ae1c381274d7ad4d8bc32031af03e9bcc5..b6c09964b43f82cafffc9314326063a98f946eaa 100755
GIT binary patch
delta 143
zcmV;A0C4~90qOyeV}A&rA<{_z003%9L_t(I%dJx}62Kq`6V7L}ga3b&gZ_iAoQ6V+
zj2HruKq68yQBm@`+r~OaCxj(E0V?!}_)9Uu)kv4O2E0C6T6JFIxg>)fy*Yw8dX6A0
x!TKO;3mPAGqAS5#pXU)m$MpLaj{6`I53zbUaA*9h%m4rY00>D%PDHLkV1nUsJLdoZ

delta 146
zcmV;D0B!&30qp^hV}BvtlS(B3003=CL_t(I%cYY+5`ZuW0~^L?w1@uxQ6BUk@#Z)c
z0fA!+nQl@*vQ=u+4*Qrd)$`b)_2T&gZO{{vKf_v|v|@pz%WU0Cg!9Wl7om^oB8cO7
zPGDuW61x9EG{)7Fa*Psj+DZi4GNpH+gpjQZkApo6GHqck01E&B07*qoM6N<$g7D=*
AApigX

diff --git a/resources/marker_12.png b/resources/marker_12.png
index b6c09964b43f82cafffc9314326063a98f946eaa..16162a752649e417dc92d6cf333ecd00fe86bde1 100755
GIT binary patch
delta 144
zcmV;B0B`^50qOyeVt+6x%2V@J0001LNkl<ZILl-F|NlP&C4dE+pp2{{hN({;-)F?8
zmJ!(n*fbI{2yOtfW^A_Ml4l~;skp?MkWI&>2;C55*Dx_q2=E#pBdbW60Z$&^r_2DN
yy?`xn@Fg(3(TK|sT;kMAiB!o8R8I%Q002h%MGLTN86p4x00{s|MNUMnLSTZdkvpyc

delta 144
zcmV;B0B`^50qOyeVt+9RpCQso0001LNkl<ZILob5F%rNa2oug{w1fYDl!N|*uAGKK
zi;Nfokw79+GEq_Ty4%J&M<;|OJpn58i1<q}!qrHZw+6gET3U5p<GCb*9lbe%IeLyD
yEW!F9YYQ45cA_i6TA$|;LdW#`7LNNM5)ZL@IB;kDtIPlZ00{s|MNUMnLSTaY%{&zV

diff --git a/resources/marker_13.png b/resources/marker_13.png
index 16162a752649e417dc92d6cf333ecd00fe86bde1..aa7d857472f6d984f42f1e401041772d808b2658 100755
GIT binary patch
delta 243
zcmV<P01W@?0nGxCVt+Rcxe<Xt0002ZNkl<ZILob*Ar8YZ3`Ol|prB=eEhy_Da)Xi_
zrX(i_@nJ%GgC3%6V1s2F81qn~Oz|dl?Uw?Qe7}5I4l*+w(M39JyS|{_Z&#GOm?wyZ
zO<fhn$MYqE5+E-ghM@qg>ncK2ZffcZhzPXS#Udgx88S1pU2M<sWvw+>YhhWIWHQD;
z2m!WjOG#o1B{e1%d+#ydOH$u1y!SZIGe^j7fOC$=aYW}F?*<rS5+vXMoP*d%B7zV?
tVYJr5G)*53JY^2fo5WN8!aq`QP;XTwf3;VpUbO%K002ovPDHLkV1l~%WX}Kq

delta 144
zcmV;B0B`@z0_p*fVt+6x%2V@J0001LNkl<ZILl-F|NlP&C4dE+pp2{{hN({;-)F?8
zmJ!(n*fbI{2yOtfW^A_Ml4l~;skp?MkWI&>2;C55*Dx_q2=E#pBdbW60Z$&^r_2DN
yy?`xn@Fg(3(TK|sT;kMAiB!o8R8I%Q002h%MGLTN86p4x00{s|MNUMnLSTZN&^wX<

diff --git a/resources/marker_4.png b/resources/marker_4.png
index 78c8055325e4c2bc3fa924015482adbf401fb3f2..a994c1100412a856d0609296d30fa92a841f1fa2 100755
GIT binary patch
delta 157
zcmbQl)WtNRw7$X9#WAGfR??sU|LvJo85A03NNBJyFtV6CxP?vBSiWF2Glv4(1o4E3
zD7T09M)I=Bli4{G7KuC*22nYOo*OkVD7}bry2k`m7WB8LkCCY(Nt}U2;AkR)fP=_!
zCI^PVIeZLE9ZMJvFXK~akkCBq!@%fLm<Cke#mm4UX28HDbi6U8&Ps&=2s~Z=T-G@y
GGywph$}Z&q

delta 165
zcmeBTn#44rw7$dB#WAGfR??sU|LvJo859~KHgKLgp_Me_*OQO6ZaG<uOdYJV-Ez7L
zPcpIyFrVO7(9vD|LH^jW_KR160>aF#KrJ4dWM^wLFm)t}Gq4C8WkV${atJtx>;|fm
znE08=Qd1Df*qEvo^ohxV!7yl+oHWpaM+OWW1`OQaS595>xQB-U2s~Z=T-G@yGywo%
Cls4!9

diff --git a/resources/marker_5.png b/resources/marker_5.png
index a994c1100412a856d0609296d30fa92a841f1fa2..78c8055325e4c2bc3fa924015482adbf401fb3f2 100755
GIT binary patch
delta 165
zcmeBTn#44rw7$dB#WAGfR??sU|LvJo859~KHgKLgp_Me_*OQO6ZaG<uOdYJV-Ez7L
zPcpIyFrVO7(9vD|LH^jW_KR160>aF#KrJ4dWM^wLFm)t}Gq4C8WkV${atJtx>;|fm
znE08=Qd1Df*qEvo^ohxV!7yl+oHWpaM+OWW1`OQaS595>xQB-U2s~Z=T-G@yGywo%
Cls4!9

delta 157
zcmbQl)WtNRw7$X9#WAGfR??sU|LvJo85A03NNBJyFtV6CxP?vBSiWF2Glv4(1o4E3
zD7T09M)I=Bli4{G7KuC*22nYOo*OkVD7}bry2k`m7WB8LkCCY(Nt}U2;AkR)fP=_!
zCI^PVIeZLE9ZMJvFXK~akkCBq!@%fLm<Cke#mm4UX28HDbi6U8&Ps&=2s~Z=T-G@y
GGywph$}Z&q

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 += ", ";
-- 
2.39.2