Changeset 6503 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
02/15/05 19:06:08 (20 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r6502 r6503  
    115115   * mbase/MTask.cc:
    116116     - don't preprocess a task if it has been preprocessed already
     117
     118   * mraw/MRawFileWrite.cc:
     119     - if display is set write output to status line
     120
     121   * mfileio/MReadTree.cc, mfileio/MReadMarsFile.cc:
     122     - moved code to display filename in status display from
     123       MReadMarsFile::Notify to MReadTree::Notify
    117124
    118125
  • trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc

    r5340 r6503  
    4747
    4848#include "MRawRunHeader.h"
    49 #include "MStatusDisplay.h"
    5049
    5150#include "MMcRunHeader.hxx"
     
    195194        *fLog << warn << "Warning - You are mixing files with different run types (";
    196195        *fLog << runtype << ", " << rawheader->GetRunType() << ")" << endl;
    197     }
    198 
    199     if (fDisplay)
    200     {
    201         TString txt = GetFileName();
    202         txt += " @ ";
    203         txt += GetNumEntry()-1;
    204         fDisplay->SetStatusLine2(txt);
    205196    }
    206197
  • trunk/MagicSoft/Mars/mfileio/MReadTree.cc

    r6499 r6503  
    6767#include "MParList.h"
    6868#include "MTaskList.h"
     69#include "MStatusDisplay.h"
    6970
    7071#include "MLog.h"
     
    279280    *fLog << " '" << GetFileName() << "' (before event #";
    280281    *fLog << GetNumEntry()-1 << ")" << endl;
     282
     283    if (fDisplay)
     284    {
     285        TString txt = GetFileName();
     286        txt += " @ ";
     287        txt += GetNumEntry()-1;
     288        fDisplay->SetStatusLine2(txt);
     289    }
    281290
    282291    //
  • trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

    r6500 r6503  
    5353#include "MTime.h"
    5454#include "MParList.h"
     55#include "MStatusDisplay.h"
    5556
    5657#include "MRawRunHeader.h"
     
    196197    }
    197198    else
     199    {
    198200        *fLog << inf << "Open file: '" << name << "'" << endl;
     201
     202        if (fDisplay)
     203        {
     204            TString txt = GetFileName();
     205            txt += " @ ";
     206            txt += GetNumExecutions()-1;
     207            fDisplay->SetStatusLine2(txt);
     208        }
     209    }
    199210
    200211    delete [] expname;
Note: See TracChangeset for help on using the changeset viewer.