Changeset 8376 for trunk/MagicSoft/Cosy/gui/MGCoordinate.cc

Timestamp:

03/14/07 19:12:17 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/gui/MGCoordinate.cc (modified) (10 diffs)

trunk/MagicSoft/Cosy/gui/MGCoordinate.cc

@@ -8 +8 @@
 
 #include <stdlib.h>    // atoi
-#include <iostream.h>  // cout
+#include <iostream>  // cout
 
 #include <TSystem.h>
@@ -18 +18 @@
 
 ClassImp(MGCoordinate);
+
+using namespace std;
 
 enum {
@@ -25 +27 @@
 };
 
-MGCoordinate::MGCoordinate(const TGWindow* p, const Int_t type=kETypeDeg,
+MGCoordinate::MGCoordinate(const TGWindow* p, const Int_t type,
                            const Int_t flag, const char *txt,
                            const Int_t deg, const UInt_t min, const UInt_t sec)
@@ -91 +93 @@
     TGLabel *label;
 
-    const char *deg = type==kETypeDeg ? "\xb0" : "h";
-    const char *min = type==kETypeDeg ? "'"    : "m";
-    const char *sec = type==kETypeDeg ? "\""   : "s";
+    const char *sdeg = type==kETypeDeg ? "\xb0" : "h";
+    const char *smin = type==kETypeDeg ? "'"    : "m";
+    const char *ssec = type==kETypeDeg ? "\""   : "s";
 
     if (flag==1)
     {
-        label = new TGLabel(this, deg);
+        label = new TGLabel(this, sdeg);
         label->SetTextJustify(kTextLeft);
         label->Move(37, 29-offset);
@@ -103 +105 @@
         fList->Add(label);
 
-        label = new TGLabel(this, min);
+        label = new TGLabel(this, smin);
         label->SetTextJustify(kTextLeft);
         label->Move(71, 29-offset);
@@ -109 +111 @@
         fList->Add(label);
 
-        label = new TGLabel(this, sec);
+        label = new TGLabel(this, ssec);
         label->SetTextJustify(kTextLeft);
         label->Move(107, 29-offset);
@@ -116 +118 @@
     }
 
-    label = new TGLabel(this, deg);
+    label = new TGLabel(this, sdeg);
     label->SetTextJustify(kTextLeft);
     label->Move(39, ypos);
@@ -122 +124 @@
     fList->Add(label);
 
-    label = new TGLabel(this, min);
+    label = new TGLabel(this, smin);
     label->SetTextJustify(kTextLeft);
     label->Move(73, ypos);
@@ -128 +130 @@
     fList->Add(label);
  
-    label = new TGLabel(this, sec);
+    label = new TGLabel(this, ssec);
     label->SetTextJustify(kTextLeft);
     label->Move(107, ypos);
@@ -149 +151 @@
 }
 
-void MGCoordinate::Print()
+void MGCoordinate::Print(Option_t *o) const
 {
     if (fLabel)