Changeset 850

Timestamp:

06/13/01 13:09:40 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MWriteAsciiFile.cc (modified) (6 diffs)
• mbase/MWriteAsciiFile.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -8 +8 @@
    * mbase/MParContainer.[h,cc]:
      - added a 'dummy' function for AsciiRead, AsciiWrite
+
+   * mbase/MWriteAsciiFile.[h,cc]:
+     - added new constructor (specify directly the pointer to the class)
+
+   * mgui/MHexagon.cc:
+     - made Copy-function more readable
+
+   * mgui/MParContainer.cc:
+     - made Copy-function more readable
 
 

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -50 +50 @@
 // --------------------------------------------------------------------------
 //
-// Default constructor.
 // Specify the name of the ascii output file 'filename' and the name
 // of the container you want to write. (Normally this is the name
@@ -57 +56 @@
 //
 MWriteAsciiFile::MWriteAsciiFile(const char *filename, const char *contname,
-                                 const char *name, const char *title) : fOut(NULL)
+                                 const char *name, const char *title)
+    : fOut(NULL), fContainer(NULL)
 {
     *fName  = name  ? name  : "MWriteAsciiFile";
@@ -64 +64 @@
     fNameFile      = filename;
     fNameContainer = contname;
+}
+
+// --------------------------------------------------------------------------
+//
+// Specify a the name of the ascii output file 'filename' and a pointer to
+// the container you want to write. 
+//
+MWriteAsciiFile::MWriteAsciiFile(const char *filename, MParContainer *cont,
+                                 const char *name, const char *title)
+    : fOut(NULL), fContainer(cont)
+{
+    *fName  = name  ? name  : "MWriteAsciiFile";
+    *fTitle = title ? title : "Task to write one container to an ascii file";
+
+    fNameFile      = filename;
+    fNameContainer = cont->GetName();
 }
 
@@ -86 +102 @@
 Bool_t MWriteAsciiFile::PreProcess (MParList *pList)
 {
+    //
+    // Try to find the container which should be stored.
+    //
+    if (!fContainer)
+    {
+        fContainer = (MParContainer*)pList->FindObject(fNameContainer);
+        if (!fContainer)
+        {
+            *fLog << dbginf << "Cannot find parameter container '" << fContainer << "'." << endl;
+            return kFALSE;
+        }
+    }
+
+    //
+    // Try to open the output file
+    //
     fOut = new ofstream(fNameFile);
 
@@ -96 +128 @@
     *fLog << "Ascii file '" << fNameFile << "' opened for writing." << endl;
 
-    fContainer = (MParContainer*)pList->FindObject(fNameContainer);
-    if (!fContainer)
-    {
-        *fLog << dbginf << "Cannot find parameter container '" << fContainer << "'." << endl;
-        return kFALSE;
-    }
-
+    //
+    // write the container if it is already in changed state
+    //
     if (fContainer->HasChanged())
         fContainer->AsciiWrite(*fOut);
@@ -133 +161 @@
 Bool_t MWriteAsciiFile::PostProcess()
 {
+    //
+    // check if the container changed state is set
+    //
     if (fContainer->HasChanged())
         fContainer->AsciiWrite(*fOut);
 
+    //
+    // delete (close) file
+    //
     delete fOut;
     fOut = NULL;

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.h

@@ -10 +10 @@
 private:
     ofstream *fOut;
-    TString  fNameFile;
-    TString  fNameContainer;
+
+    TString fNameFile;
+    TString fNameContainer;
 
     MParContainer *fContainer;
 
 public:
-    MWriteAsciiFile(const char *filename, const char *contname, const char *name=NULL, const char *title=NULL);
+    MWriteAsciiFile(const char *filename, const char *contname,
+                    const char *name=NULL, const char *title=NULL);
+    MWriteAsciiFile(const char *filename, MParContainer *cont,
+                    const char *name=NULL, const char *title=NULL);
     ~MWriteAsciiFile();