Changeset 7824

Timestamp:

07/30/06 17:28:28 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mgui/MHexagon.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
    * mhist/MHCamera.[h,cc]:
      - replaced SavePrimitive(ofstream&) by SavePrimitive(ostream&)
+     - if necessary let SavePrimitive(ofstream&) call 
+       SavePrimitive(ostream&)
+
+   * mgui/MHexagon.[h,cc]:
+     - special solution for SavePrimitive because it calls a function
+       from the base class which also needs ofstream or ostream
 
 

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -334 +334 @@
 void MHexagon::SavePrimitive(ostream &out, Option_t *)
 {
+#if ROOT_VERSION_CODE >= ROOT_VERSION(5,12,00)
     if (gROOT->ClassSaved(Class()))
        out << "   ";
@@ -345 +346 @@
 
     out << "   hexagon->Draw();" << endl;
+#endif
 }
 
 void MHexagon::SavePrimitive(ofstream &out, Option_t *)
 {
+#if ROOT_VERSION_CODE < ROOT_VERSION(5,12,00)
+    if (gROOT->ClassSaved(Class()))
+       out << "   ";
+    else
+       out << "   MHexagon *";
+
+    out << "hexagon = new MHexagon(" << fX << "," << fY << "," << fD << ");" << endl;
+
+    SaveFillAttributes(out, "hexagon");
+    SaveLineAttributes(out, "hexagon");
+
+    out << "   hexagon->Draw();" << endl;
+#else
     MHexagon::SavePrimitive(static_cast<ostream&>(out), "");
-}
+#endif
+}