Changeset 2230 for trunk/MagicSoft/Mars/mgui

Timestamp:

06/24/03 16:19:04 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mgui/MHexagon.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -64 +64 @@
 //    normal constructor for MHexagon
 //
-MHexagon::MHexagon(MGeomPix &pix)
+MHexagon::MHexagon(const MGeomPix &pix)
 : TAttLine(1, 1, 1), TAttFill(0, 1001)
 {
@@ -76 +76 @@
 //    copy constructor for MHexagon
 //
-MHexagon::MHexagon(const MHexagon &hexagon)
-{
-    ((MHexagon&) hexagon).Copy(*this);
+MHexagon::MHexagon(const MHexagon &hexagon) : TObject(hexagon), TAttLine(hexagon), TAttFill(hexagon)
+{
+    fX = hexagon.fX;
+    fY = hexagon.fY;
+    fD = hexagon.fD;
 } 
 
@@ -89 +91 @@
 const
 #endif
-
 {
     MHexagon &hex = (MHexagon&) obj;
@@ -245 +246 @@
     const Float_t dy[np+1] = { .2886,  .5772,  .2886, -.2886, -.5772, -.2886, .2886 };
 
-    TAttLine::Modify();    // Change line attributes only if neccessary
-    TAttFill::Modify();    // Change fill attributes only if neccessary
-
     //
     //  calculate the positions of the pixel corners
@@ -257 +255 @@
         y[i] = inY + dy[i]*inD;
     }
+
+    TAttLine::Modify();    // Change line attributes only if neccessary
+    TAttFill::Modify();    // Change fill attributes only if neccessary
 
     //