Changeset 1935 for trunk

Timestamp:

04/10/03 10:26:07 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MContinue.cc (modified) (3 diffs)
• mbase/MContinue.h (modified) (1 diff)
• mbase/MTaskList.cc (modified) (1 diff)
• mbase/MTaskList.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/04/10: Thomas Bretz
+ 
+   * mbase/MContinue.[h,cc]:
+     - changed, so that also a filter given as a pointer is added to
+       the tasklist automatically
+ 
+   * mbase/MTaskList.[h,cc]:
+     - added RemoveFromList-function
+
+
 
  2003/04/09: Thomas Bretz

trunk/MagicSoft/Mars/mbase/MContinue.cc

@@ -105 +105 @@
 // --------------------------------------------------------------------------
 //
-//  In case the filter was created automatically, PreProcess tries to find
-//  the tasklist MTaskList, adds the filter before this instance to the
-//  tasklist and preprocesses the filter.
+//  PreProcess tries to find the tasklist MTaskList, adds the filter
+//  before this instance to the tasklist and preprocesses the filter.
 //
 Bool_t MContinue::PreProcess(MParList *list)
 {
-    if (!TestBit(kIsOwner))
-        return kTRUE;
-
-    MTaskList *tlist = (MTaskList*)list->FindObject("MTaskList");
-    if (!tlist)
-    {
-        *fLog << err << dbginf << "ERROR - Tasklist 'MTaskList' not found... abort." << endl;
-        return kFALSE;
-    }
-
     if (!GetFilter())
     {
@@ -127 +116 @@
     }
 
-    if (!tlist->AddToListBefore(GetFilter(), this))
+    fTaskList = (MTaskList*)list->FindObject("MTaskList");
+    if (!fTaskList)
+    {
+        *fLog << err << dbginf << "ERROR - Tasklist 'MTaskList' not found... abort." << endl;
+        return kFALSE;
+    }
+
+    if (fTaskList->FindObject(GetFilter()))
+    {
+        *fLog << warn << dbginf << "WARNING - The filter is already in the tasklist..." << endl;
+        return kTRUE;
+    }
+
+    if (!fTaskList->AddToListBefore(GetFilter(), this))
     {
         *fLog << err << dbginf << "ERROR - Adding filter before MContinue... abort." << endl;
@@ -133 +135 @@
     }
 
+    SetBit(kFilterIsPrivate);
+
     return GetFilter()->CallPreProcess(list);
 }
+
+// --------------------------------------------------------------------------
+//
+// If the filter was added to the tasklist automatically it is removed
+// from the tasklist.
+//
+Bool_t MContinue::PostProcess()
+{
+    if (!TestBit(kFilterIsPrivate))
+        return kTRUE;
+
+    if (fTaskList->RemoveFromList(GetFilter()))
+        return kTRUE;
+
+    *fLog << err << "ERROR: MContinue::PostProcess - Cannot remove Filter from tasklist" << endl;
+
+    return kFALSE;
+}

trunk/MagicSoft/Mars/mbase/MContinue.h

@@ -16 +16 @@
 
 class MFilter;
+class MTaskList;
 
 class MContinue : public MTask
 {
 private:
+    MTaskList *fTaskList;  //! pointer to the present tasklist
+
     Bool_t PreProcess(MParList *list);
     Bool_t Process() { return kCONTINUE; }
+    Bool_t PostProcess();
 
-    enum { kIsOwner = BIT(14) };
+    enum { kIsOwner = BIT(14), kFilterIsPrivate = BIT(15) };
 
 public:

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -754 +754 @@
     return kTRUE;
 }
+
+// --------------------------------------------------------------------------
+//
+// Removes a task from the tasklist. Returns kFALSE if the object was not
+// found in the list.
+//
+Bool_t MTaskList::RemoveFromList(MTask *task)
+{
+    TObject *obj = fTasks->Remove(task);
+
+    //
+    // If the task was found in the list try to remove it from the second
+    // list, too.
+    //
+    if (obj)
+        fTasksProcess.Remove(task);
+
+    return obj ? kTRUE : kFALSE;
+
+}

trunk/MagicSoft/Mars/mbase/MTaskList.h

@@ -49 +49 @@
     Bool_t AddToList(MTask *task, const char *tType="All");
 
+    Bool_t RemoveFromList(MTask *task);
+
     TObject *FindObject(const char *name) const;
     TObject *FindObject(const TObject *obj) const;