Changeset 2386 for trunk/MagicSoft/Mars/mbase

Timestamp:

10/15/03 19:15:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MEvtLoop.cc (modified) (7 diffs)
• MFilter.cc (modified) (1 diff)
• MReadSocket.cc (added)
• MReadSocket.h (added)
• MTime.h (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -14 +14 @@
 
 #pragma link C++ class MLog+;
+#pragma link C++ class MReadSocket+;
 
 #pragma link C++ class MIter+;

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -168 +168 @@
 {
     fProgress = bar;
-    fProgress->SetBit(kMustCleanup);
+    if (fProgress)
+        fProgress->SetBit(kMustCleanup);
 }
 
@@ -187 +188 @@
     MParContainer::SetDisplay(d);
     if (!d)
-    {
         fProgress=NULL;
-        return;
-    }
-
-    d->SetBit(kMustCleanup);
+    else
+        d->SetBit(kMustCleanup);
+
     if (fParList)
         fParList->SetDisplay(d);
@@ -269 +268 @@
 Bool_t MEvtLoop::ProcessGuiEvents(Int_t num, Int_t entries)
 {
-    if (!fProgress || gROOT->IsBatch())
+    if (gROOT->IsBatch())
         return kTRUE;
 
@@ -286 +285 @@
             fDisplay->ClearStatus();
             break;
+        //
+        // If the display is not on the heap (means: not created
+        // with the new operator) the object is deleted somewhere
+        // else in the code. It is the responsibility of the
+        // application which instantiated the object to make
+        // sure that the correct action is taken. This can be
+        // done by calling MStatusDisplay::CheckStatus()
+        //
+        // Because we are synchronous we can safely delete it here!
+        //
+        // Close means: Close the display but leave analysis running
+        // Exit means: Close the display and stop analysis
+        //
+        case MStatusDisplay::kFileClose:
+        case MStatusDisplay::kFileExit:
+            rc = fDisplay->CheckStatus() == MStatusDisplay::kFileClose;
+
+            if (fDisplay->IsOnHeap())
+                delete fDisplay;
+
+            //
+            // This makes the display really disappear physically on
+            // the screen in case of MStatusDisplay::kFileClose
+            //
+            gSystem->ProcessEvents();
+
+            return rc;
         default:
-            *fLog << warn << "MEvtloop: fDisplay->ChecStatus() has returned unknown status #" << fDisplay->CheckStatus() << "... cleared." << endl;
+            *fLog << warn << "MEvtloop: fDisplay->CheckStatus() has returned unknown status #" << fDisplay->CheckStatus() << "... cleared." << endl;
             fDisplay->ClearStatus();
             break;
@@ -293 +319 @@
 
     //
-    // Check System time (don't loose too much time by updates)
-    //
-
-    // FIXME: Not thread safe
+    // Check System time (don't loose too much time by updating the GUI)
+    //
+
+    // FIXME: Not thread safe (if you have more than one eventloop running)
     static Int_t start = num;
     static TTime t1 = gSystem->Now();
@@ -335 +361 @@
     // Set new progress bar position
     //
-    fProgress->SetPosition(num);
+    if (fProgress)
+        fProgress->SetPosition(num);
 
     //
@@ -346 +373 @@
         gSystem->ProcessEvents();
     else
-        gClient->ProcessEventsFor(fProgress);
+        if (fProgress)
+            gClient->ProcessEventsFor(fProgress);
 #endif
 

trunk/MagicSoft/Mars/mbase/MFilter.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  07/2001 <mailto:tbretz@uni-sw.gwdg.de>
+!   Author(s): Thomas Bretz, 07/2001 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2001
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !

trunk/MagicSoft/Mars/mbase/MTime.h

@@ -108 +108 @@
     }
 
+    operator double() const //[s]
+    {
+        return fNanoSec/1e9+(fHour*24*60*60+fMin*60+fSec);
+    }
+
     ClassDef(MTime, 1)  //A generalized MARS time stamp
 };

trunk/MagicSoft/Mars/mbase/Makefile

@@ -44 +44 @@
            MEvtLoop.cc \
            MIter.cc \
+           MReadSocket.cc \
            MDirIter.cc \
            MGList.cc \