Changeset 8958 for trunk

Timestamp:

06/14/08 17:21:48 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/macros/fillstar.C (modified) (1 diff)
• mbase/BaseLinkDef.h (modified) (1 diff)
• mbase/MAGIC.h (modified) (1 diff)
• mimage/MNewImagePar.cc (modified) (2 diffs)
• mpointing/MPointing.cc (modified) (2 diffs)
• mtools/MCalendar.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -105 +105 @@
      - removed an old obsolete workaround (ProjectionX/Y)
 
-   * mimage/Makefile, mimage/IMageLinkDef.h:
+   * mimage/Makefile, mimage/ImageLinkDef.h:
      - removed MCameraSmooth
+
+   * mbase/MAGIC.h:
+     - added a new namespace UTF8 with double char characters
+
+   * mbase/BaseLinkDef.h:
+     - added the new namespace UTF8
+ 
+   * mimage/MNewImagePar.cc, mpointing/MPointing.cc,
+     datacenter/macros/fillstar.C:
+     - some characters replaced by the new UTF8 characters
 
 

trunk/MagicSoft/Mars/datacenter/macros/fillstar.C

@@ -265 +265 @@
     cout << "  Average Humidity [%]     " << avghum    << endl;
     cout << "  Average WindSpeed [km/h] " << avgwind   << endl;
-    cout << "  Average Temp [°C]        " << avgtemp   << endl;
+    cout << "  Average Temp [" << UTF8::kDeg << "C]        " << avgtemp   << endl;
     cout << "  Average Sky Temp [K]     " << avgsky    << endl;
     cout << "  Cloundiness [%]          " << avgclouds        << " +/- " << rmsclouds        << endl;

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -26 +26 @@
 #pragma link C++ namespace MARS;
 #pragma link C++ namespace MMath;
-//#pragma link C++ namespace UTF8;
+#pragma link C++ namespace UTF8;
+
 #pragma link C++ class MString+;
 #pragma link C++ class MEnv+;

trunk/MagicSoft/Mars/mbase/MAGIC.h

@@ -40 +40 @@
 }
 
+// Check for example: http://www.utf8-zeichentabelle.de
+namespace UTF8
+{
+    const char *const kCent        = "\xc2\xa2";
+    const char *const kPound       = "\xc2\xa3";
+    const char *const kYen         = "\xc2\xa5";
+    const char *const kParagraph   = "\xc2\xa7";
+    const char *const kCopyright   = "\xc2\xa9";
+    const char *const kRegistered  = "\xc2\xae";
+    const char *const kDeg         = "\xc2\xb0";
+    const char *const kPlusMinus   = "\xc2\xb1";
+    const char *const kSquare      = "\xc2\xb2";
+    const char *const kThird       = "\xc2\xb3";
+    const char *const kMu          = "\xc2\xb5";
+    const char *const kDot         = "\xc2\xb7";
+    const char *const kQuarter     = "\xc2\xbc";
+    const char *const kHalf        = "\xc2\xbd";
+    const char *const kSmaller     = "\xc2\xab";
+    const char *const kLarger      = "\xc2\xbb";
+    const char *const kThreeFourth = "\xc2\xbe";
+    const char *const kTimes       = "\xc3\x97";
+    const char *const kCapGamma    = "\xce\x93";
+    const char *const kCapDelta    = "\xce\x94";
+    const char *const kCapSigma    = "\xce\xa3";
+    const char *const kCapTheta    = "\xce\x98";
+    const char *const kCapLambda   = "\xce\x9b";
+    const char *const kCapXi       = "\xce\x9e";
+    const char *const kCapPi       = "\xce\xa0";
+    const char *const kCapPhi      = "\xce\xa6";
+    const char *const kCapPsi      = "\xce\xa8";
+    const char *const kCapOmega    = "\xce\xa9";
+    const char *const kAlpha       = "\xce\xb1";
+    const char *const kBata        = "\xce\xb2";
+    const char *const kGamma       = "\xce\xb3";
+    const char *const kDelta       = "\xce\xb4";
+    const char *const kEpsilon     = "\xce\xb5";
+    const char *const kZeta        = "\xce\xb6";
+    const char *const kEta         = "\xce\xb7";
+    const char *const kTheta       = "\xce\xb8";
+    const char *const kIota        = "\xce\xb9";
+    const char *const kKappa       = "\xce\xba";
+    const char *const kLambda      = "\xce\xbb";
+    const char *const kNu          = "\xce\xbd";
+    const char *const kXi          = "\xce\xbe";
+    const char *const kOmicron     = "\xce\xbf";
+    const char *const kPi          = "\xce\xc0";
+    const char *const kRho         = "\xce\xc1";
+    const char *const kSigma       = "\xce\xc3";
+    const char *const kTau         = "\xce\xc4";
+    const char *const kPhi         = "\xce\xc6";
+    const char *const kChi         = "\xce\xc7";
+    const char *const kPsi         = "\xce\xc8";
+    const char *const kOmega       = "\xce\xc9";
+    const char *const kEuro        = "\xe2\x82\xac";
+}
+
 #endif

trunk/MagicSoft/Mars/mimage/MNewImagePar.cc

@@ -295 +295 @@
     *fLog << " - Num Used Pixels  [#] = " << fNumUsedPixels << endl;
     *fLog << " - Num Core Pixels  [#] = " << fNumCorePixels << endl;
-    *fLog << " - Used Area     [mm^2] = " << fUsedArea      << endl;
-    *fLog << " - Core Area     [mm^2] = " << fCoreArea      << endl;
+    *fLog << " - Used Area      [mm" << UTF8::kSquare << "] = " << fUsedArea      << endl;
+    *fLog << " - Core Area      [mm" << UTF8::kSquare << "] = " << fCoreArea      << endl;
 }
 
@@ -316 +316 @@
     *fLog << " - Num Used Pixels  [#] = " << fNumUsedPixels << endl;
     *fLog << " - Num Core Pixels  [#] = " << fNumCorePixels << endl;
-    *fLog << " - Used Area    [deg^2] = " << fUsedArea*geom.GetConvMm2Deg()*geom.GetConvMm2Deg() << endl;
-    *fLog << " - Core Area    [deg^2] = " << fCoreArea*geom.GetConvMm2Deg()*geom.GetConvMm2Deg() << endl;
-}
+    *fLog << " - Used Area     [deg" << UTF8::kSquare << "] = " << fUsedArea*geom.GetConvMm2Deg()*geom.GetConvMm2Deg() << endl;
+    *fLog << " - Core Area     [deg" << UTF8::kSquare << "] = " << fCoreArea*geom.GetConvMm2Deg()*geom.GetConvMm2Deg() << endl;
+}

trunk/MagicSoft/Mars/mpointing/MPointing.cc

@@ -282 +282 @@
 
         fin >> val;
-        sout += Form("%9f°", val);
+        sout += Form("%9f%s", val, UTF8::kDeg);
 
         if (*fCoeff[n]!=0 || val>0)
@@ -829 +829 @@
     cout << setprecision(3);
 
-    Double_t par, err;
+    Double_t par, er;
 
     while (n--)
     {
-        m.GetParameter(n, par, err);
+        m.GetParameter(n, par, er);
         cout << Form(" %2d %6s: ", n, (const char*)fNames[n]);
-        cout << setw(8) << par << " \xb1 " << setw(6) <<  err << endl;
-    }
-}
+        cout << setw(8) << par << " \xb1 " << setw(6) <<  er << endl;
+    }
+}

trunk/MagicSoft/Mars/mtools/MCalendar.cc

@@ -916 +916 @@
 }
 
-void MCalendar::Paint(Option_t *o)
+void MCalendar::Paint(Option_t *opt)
 {
     /*
@@ -1267 +1267 @@
 void MCalendar::Remove(Int_t align)
 {
-    const TString cont = fEnv->GetValue("Contents", "");
-    TObjArray *arr = cont.Tokenize(" ");
+    TObjArray *arr = TString(fEnv->GetValue("Contents", "")).Tokenize(" ");
 
     TIter Next(arr);