Changeset 2052 for trunk/MagicSoft/Mars/mbase

Timestamp:

05/02/03 08:56:31 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (6 diffs)
• MLog.cc (modified) (3 diffs)
• MLog.h (modified) (3 diffs)
• MParList.cc (modified) (4 diffs)
• MTask.cc (modified) (4 diffs)
• MTaskList.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -190 +190 @@
         fDisplay->SetWindowName(TString("Status Display: ")+fName);
         fDisplay->SetIconName(fName);
-        // Set status lines
-        fDisplay->SetStatusLine1("PreProcessing...");
-        fDisplay->SetStatusLine2("");
         // Start automatic update
         fDisplay->StartUpdate();
@@ -207 +204 @@
     if (!fTaskList->PreProcess(fParList))
     {
-        *fLog << err << "Error detected while PreProcessing" << endl;
+        *fLog << err << "Error detected while PreProcessing." << endl;
         return kFALSE;
     }
@@ -422 +419 @@
     //  execute the post process of all tasks
     //
-    if (fDisplay)
-    {
-        // Set status lines
-        fDisplay->SetStatusLine1("PostProcessing...");
-        fDisplay->SetStatusLine2("");
-    }
     return fTaskList->PostProcess();
 }
@@ -433 +424 @@
 // --------------------------------------------------------------------------
 //
-//  See class description above.
+// See class description above. Returns kTRUE if PreProcessing,
+// Processing and PostProcessing was successfull, otherwise kFALSE.
 //
 Bool_t MEvtLoop::Eventloop(Int_t maxcnt, const char *tlist)
@@ -446 +438 @@
 
     //
-    // Now postprocess all tasks. Only successfully preprocessed tasks are
-    // postprocessed. If the Postprocessing of one task fail return an error.
+    // Now postprocess all tasks. Only successfully preprocessed tasks
+    // are postprocessed. If the Postprocessing of one task fails
+    // return an error.
     //
     if (!PostProcess())
-        return kFALSE;
+    {
+        *fLog << err << "Error detected while PostProcessing." << endl;
+        rc = kFALSE;
+    }
 
     if (!fDisplay)
@@ -457 +453 @@
     // Set status lines
     fDisplay->SetStatusLine1(fName);
-    fDisplay->SetStatusLine2(rc ? "Done." : "ERROR");
+    fDisplay->SetStatusLine2(rc ? "Done." : "Error!");
     // Stop automatic update
     fDisplay->StopUpdate();

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -175 +175 @@
 MLog::MLog(MLog &log)
 {
-    fOutputLevel  = log.fOutputLevel;
-    fDebugLevel   = log.fDebugLevel;
-    fDevice       = log.fDevice;
+    fOutputLevel = log.fOutputLevel;
+    fDebugLevel  = log.fDebugLevel;
+    fDevice      = log.fDevice;
 }
 
@@ -208 +208 @@
     if (fDevice&eGui && fgui)
     {
-        char **newstr = new char*[fNumLines+1];
-
-        for (int i=0; i<fNumLines; i++)
-            newstr[i] = fGuiLines[i];
-
-        if (fNumLines>0)
-            delete fGuiLines;
-
-        char *dummy = new char[len];
-        memcpy(dummy, fBase, len-1);
-        dummy[len-1]='\0';
-
-        newstr[fNumLines++] = dummy;
-
-        fGuiLines = newstr;
+        // check whether the current text was flushed or endl'ed
+        const Bool_t flushed = fBase[len-1]!='\n';
+
+        // for the gui remove trailing characters ('\n' or '\0')
+        fBase[len-1]='\0';
+
+        // add new text to line storage
+        fGuiLine += fBase;
+
+        if (!flushed)
+        {
+            // add a new TString* to the array of gui lines
+            TString **newstr = new TString*[fNumLines+1];
+            memcpy(newstr, fGuiLines, fNumLines*sizeof(TString*));
+            if (fNumLines>0)
+                delete fGuiLines;
+            fGuiLines = newstr;
+
+            // add Gui line as last line of array
+            fGuiLines[fNumLines++] = new TString(fGuiLine);
+            fGuiLine = "";
+        }
     }
 }
@@ -231 +238 @@
         return;
 
+    // lock mutex
     Lock();
 
+    // copy lines to TGListBox
     for (int i=0; i<fNumLines; i++)
     {
-        fgui->AddEntry(fGuiLines[i], fGuiLineId++);
+        // Replace all tabs by 7 white spaces
+        fGuiLines[i]->ReplaceAll("\t", "       ");
+        fgui->AddEntry(*fGuiLines[i], fGuiLineId++);
         delete fGuiLines[i];
     }
-
     delete fGuiLines;
 
     fNumLines=0;
 
+    // cut list box top 1000 lines
     fgui->RemoveEntries(0, fGuiLineId-1000);
+    // show last entry
     fgui->SetTopEntry(fGuiLineId-1);
+    // tell a main loop, that list box contents have changed
     fgui->SetBit(kHasChanged);
 
+    // release mutex
     UnLock();
 }

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -4 +4 @@
 #ifndef ROOT_TObject
 #include <TObject.h>
+#endif
+#ifndef ROOT_TString
+#include <TString.h>
 #endif
 
@@ -23 +26 @@
 
 private:
-    char        fBuffer;     //!
-    char        fBase[bsz];  //! Buffer to store the data in
-    char       *fPPtr;       //! Pointer to present position in buffer
-    const char *fEPtr;       //! Pointer to end of buffer
+    char        fBuffer;      //!
+    char        fBase[bsz+1]; //! Buffer to store the data in
+    char       *fPPtr;        //! Pointer to present position in buffer
+    const char *fEPtr;        //! Pointer to end of buffer
 
-    UInt_t fOutputLevel;     //! Present output level of the stream
-    UInt_t fDebugLevel;      //! Present global debug level
-    UInt_t fDevice;          //! Flag to indicate the present streams
+    UInt_t fOutputLevel;      //! Present output level of the stream
+    UInt_t fDebugLevel;       //! Present global debug level
+    UInt_t fDevice;           //! Flag to indicate the present streams
 
-    Bool_t fIsNull;          //! Switch output completely off
+    Bool_t fIsNull;           //! Switch output completely off
 
-    Int_t fGuiLineId;
+    Int_t fGuiLineId;         //!
 
     ofstream  *fout;          //! possible file output stream
@@ -40 +43 @@
     TGListBox *fgui;          //! Listbox output
 
-    Bool_t fIsDirectGui;      //! Pipe text directly to the GUI (for single threaded environments)
-    char   **fGuiLines;      //! Lines to pipe to gui
-    Int_t     fNumLines;
+    Bool_t     fIsDirectGui;  //! Pipe text directly to the GUI (for single threaded environments)
+    TString  **fGuiLines;     //! Lines to pipe to gui
+    Int_t      fNumLines;     //!
+//    Bool_t     fGuiLineFlushed;
+    TString    fGuiLine;  //!
 
 #ifdef _REENTRANT

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -222 +222 @@
         return;
 
-    TObjArrayIter Next(list);
+    MIter Next(list);
 
     MParContainer *cont = NULL;
-    while ((cont=(MParContainer*)Next()))
+    while ((cont=Next()))
         AddToList(cont);
 }
@@ -505 +505 @@
     *fLog << all << " " << GetDescriptor() << endl;
     *fLog << setfill('-') << setw(strlen(GetDescriptor())+2) << "" << endl;
+
     MParContainer *obj = NULL;
-    TIter Next(fContainer);
-    while ((obj=(MParContainer*)Next()))
+    MIter Next(fContainer);
+    while ((obj=Next()))
     {
         *fLog << " " << obj->GetDescriptor();
@@ -802 +803 @@
     MParContainer *cont = NULL;
 
-    TIter Next(fContainer);
-    while ((cont=(MParContainer*)Next()))
+    MIter Next(fContainer);
+    while ((cont=Next()))
     {
         if (cont->InheritsFrom("MTaskList"))
@@ -878 +879 @@
     MParContainer *cont = NULL;
 
-    TIter Next(fContainer);
-    while ((cont=(MParContainer*)Next()))
+    MIter Next(fContainer);
+    while ((cont=Next()))
         if (!cont->WriteEnv(env, prefix, print))
             return kFALSE;

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz <mailto:tbretz@uni-sw.gwdg.de>, 12/2000
-!
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Author(s): Thomas Bretz, 12/2000 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !
@@ -76 +76 @@
 #include "MFilter.h"
 #include "MGGroupFrame.h"
+#include "MStatusDisplay.h"
 
 ClassImp(MTask);
@@ -166 +167 @@
     fNumExecutions = 0;
 
+    *fLog << all << fName << "... " << flush;
+    if (fDisplay)
+        fDisplay->SetStatusLine2(*this);
+
     switch (PreProcess(plist))
     {
@@ -220 +225 @@
 
     fIsPreprocessed = kFALSE;
+
+    *fLog << all << fName << "... " << flush;
+    if (fDisplay)
+        fDisplay->SetStatusLine2(*this);
 
     return PostProcess();

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -65 +65 @@
 #include "MLogManip.h"
 
+#include "MIter.h"
 #include "MFilter.h"
 #include "MParList.h"
@@ -288 +289 @@
     MTask *task=NULL;
     //
-    // loop over all tasks for preproccesing
+    // loop over all tasks for reinitialization
     //
     while ((task=(MTask*)Next()))
@@ -330 +331 @@
 {
     *fLog << all << "Preprocessing... " << flush;
+    if (fDisplay)
+    {
+        // Set status lines
+        fDisplay->SetStatusLine1("PreProcessing...");
+        fDisplay->SetStatusLine2("");
+    }
 
     fParList = pList;
@@ -347 +354 @@
     while ((task=(MTask*)Next()))
     {
-        *fLog << all << task->GetName() << "... " << flush;
-        if (fDisplay)
-            fDisplay->SetStatusLine2(*task);
-
         //
         // PreProcess the task and check for it's return value.
@@ -494 +497 @@
 {
     *fLog << all << "Postprocessing... " << flush;
+    if (fDisplay)
+    {
+        // Set status lines
+        fDisplay->SetStatusLine1("PostProcessing...");
+        fDisplay->SetStatusLine2("");
+    }
 
     //
@@ -518 +527 @@
     while ( (task=(MTask*)Next()) )
     {
-        *fLog << all << task->GetName() << "... " << flush;
-        if (fDisplay)
-            fDisplay->SetStatusLine2(*task);
-
         if (!task->CallPostProcess())
             return kFALSE;
@@ -602 +607 @@
     out << ";" << endl << endl;
 
-    TIter Next(fTasks);
+    MIter Next(fTasks);
 
     MParContainer *cont = NULL;
-    while ((cont=(MParContainer*)Next()))
+    while ((cont=Next()))
     {
         cont->SavePrimitive(out, "");
@@ -654 +659 @@
     MParContainer *cont = NULL;
 
-    TIter Next(fTasks);
-    while ((cont=(MParContainer*)Next()))
+    MIter Next(fTasks);
+    while ((cont=Next()))
     {
         if (cont->InheritsFrom("MTaskList"))
@@ -730 +735 @@
     MParContainer *cont = NULL;
 
-    TIter Next(fTasks);
-    while ((cont=(MParContainer*)Next()))
+    MIter Next(fTasks);
+    while ((cont=Next()))
         if (!cont->WriteEnv(env, prefix, print))
             return kFALSE;