Changeset 9322 for trunk

Timestamp:

02/11/09 18:23:25 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msimreflector/MMirrorDisk.cc (modified) (1 diff)
• msimreflector/MMirrorHex.cc (modified) (1 diff)
• msimreflector/MMirrorSquare.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -172 +172 @@
    * ceres.rc:
      - added
+
+   * msimreflector/MMirrorSquare.cc, msimreflector/MMirrorHex.cc,
+     msimreflector/MMirrorDisk.cc:
+     - changed the grey colors
 
 

trunk/MagicSoft/Mars/msimreflector/MMirrorDisk.cc

@@ -118 +118 @@
 {
     TEllipse e;
+    e.SetFillColor(18);
     if (!TString(opt).Contains("line", TString::kIgnoreCase))
     {
+        e.SetFillColor(17);
         e.SetLineStyle(0);
-        e.SetFillColor(17);
     }
-    else
+    if (TString(opt).Contains("same", TString::kIgnoreCase))
         e.SetFillStyle(0);
     e.PaintEllipse(X(), Y(), fR, fR, 0, 360, 0);

trunk/MagicSoft/Mars/msimreflector/MMirrorHex.cc

@@ -123 +123 @@
     MHexagon h;
     TEllipse e;
+    h.SetFillColor(18);
     if (!TString(opt).Contains("line", TString::kIgnoreCase))
     {
+        h.SetFillColor(17);
         h.SetLineStyle(0);
-        h.SetFillColor(17);
         e.SetLineStyle(0);
         e.SetFillColor(gPad->GetFillColor());
     }
-    else
+
+    if (TString(opt).Contains("same", TString::kIgnoreCase))
     {
         h.SetFillStyle(0);

trunk/MagicSoft/Mars/msimreflector/MMirrorSquare.cc

@@ -119 +119 @@
     TBox b;
     TEllipse e;
+    b.SetFillColor(18);
 
     if (!TString(opt).Contains("line", TString::kIgnoreCase))
@@ -127 +128 @@
         e.SetFillColor(gPad->GetFillColor());
     }
-    else
+
+    if (TString(opt).Contains("same", TString::kIgnoreCase))
     {
         b.SetFillStyle(0);