Changeset 8376 for trunk/MagicSoft/Cosy/gui

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGAccuracy.cc (modified) (3 diffs)
• MGCoordinate.cc (modified) (10 diffs)
• MGCoordinate.h (modified) (1 diff)
• MGCoordinates.cc (modified) (3 diffs)
• MGCoordinates.h (modified) (1 diff)
• MGCosy.cc (modified) (4 diffs)
• MGNumStars.cc (modified) (2 diffs)
• MGSkyPosition.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/gui/MGAccuracy.cc

@@ -1 +1 @@
 #include "MGAccuracy.h"
 
-#include <iostream.h>  // cout
+#include <iostream>  // cout
 
 #include <TArc.h>
@@ -16 +16 @@
 
 ClassImp(MGAccuracy);
+
+using namespace std;
 
 void MGAccuracy::DrawText(const char *c1, const char *c2, const char *c3, const char*txt)
@@ -163 +165 @@
     dist *= 3600.; // [sec]
 
-    int rs = (int)floor(fmod(dist, 60.));
+    int rs = TMath::FloorNint(fmod(dist, (float)60.));
 
     dist /= 60.;   // [min]

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)

trunk/MagicSoft/Cosy/gui/MGCoordinate.h

@@ -58 +58 @@
     Bool_t ProcessMessage(Long_t msg, Long_t mp1, Long_t mp2);
 
-    void Print();
+    void Print(Option_t *o="") const;
 
     ClassDef(MGCoordinate, 0)

trunk/MagicSoft/Cosy/gui/MGCoordinates.cc

@@ -7 +7 @@
 #include "MGCoordinates.h"
 
-#include <iostream.h>  // cout
+#include <iostream>  // cout
 
 #include "MGCoordinate.h"
@@ -13 +13 @@
 
 ClassImp(MGCoordinates);
+
+using namespace std;
 
 MGCoordinates::MGCoordinates(const TGWindow* p,
@@ -54 +56 @@
 }
 
-void MGCoordinates::Print()
+void MGCoordinates::Print(Option_t *o) const
 {
     fX->Print();

trunk/MagicSoft/Cosy/gui/MGCoordinates.h

@@ -37 +37 @@
     void SetCoordinates(const XY &xy);
 
-    void Print();
+    void Print(Option_t *o="") const;
 
     ClassDef(MGCoordinates, 0)

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -1 +1 @@
 #include "MGCosy.h"
 
-#include <iomanip.h>
-#include <iostream.h>
+#include <iomanip>
+#include <fstream>
 
 #include "msgqueue.h"
@@ -42 +42 @@
 
 ClassImp(MGCosy);
+
+using namespace std;
 
 #define IDM_EXIT   1
@@ -827 +829 @@
     cout << "MGCosy: Setting Size" << endl;
 #endif
-    const Int_t w = 1010;
-    const Int_t h =  700;
-    SetWMSizeHints(w, h, w, h, 1, 1);  // set the smallest and biggest size of the Main frame
+    const Int_t ww = 1010;
+    const Int_t hh =  700;
+    SetWMSizeHints(ww, hh, ww, hh, 1, 1);  // set the smallest and biggest size of the Main frame
 
     SetWindowName("Cosy Main Window");
@@ -838 +840 @@
 #endif
     MapSubwindows();
-    Resize(w, h); //GetDefaultSize());
+    Resize(ww, hh); //GetDefaultSize());
     MapWindow();
 }

trunk/MagicSoft/Cosy/gui/MGNumStars.cc

@@ -1 +1 @@
 #include "MGNumStars.h"
 
-#include <iostream.h>  // cout
+#include <iostream>  // cout
 
 #include <TLine.h>
@@ -13 +13 @@
 
 ClassImp(MGNumStars);
+
+using namespace std;
 
 void MGNumStars::DrawText(const char*txt)

trunk/MagicSoft/Cosy/gui/MGSkyPosition.cc

@@ -7 +7 @@
 #include "MGSkyPosition.h"
 
-#include <iostream.h>  // cout
+#include <iostream>  // cout
 
 #include <TArc.h>
@@ -21 +21 @@
 
 ClassImp(MGSkyPosition);
+
+using namespace std;
 
 void MGSkyPosition::InitArc(TArc *arc, Int_t fillstyle, Int_t fillcolor, Int_t linecolor)