Changeset 6503 for trunk/MagicSoft/Mars
- Timestamp:
- 02/15/05 19:06:08 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r6502 r6503 115 115 * mbase/MTask.cc: 116 116 - 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 117 124 118 125 -
trunk/MagicSoft/Mars/mfileio/MReadMarsFile.cc
r5340 r6503 47 47 48 48 #include "MRawRunHeader.h" 49 #include "MStatusDisplay.h"50 49 51 50 #include "MMcRunHeader.hxx" … … 195 194 *fLog << warn << "Warning - You are mixing files with different run types ("; 196 195 *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);205 196 } 206 197 -
trunk/MagicSoft/Mars/mfileio/MReadTree.cc
r6499 r6503 67 67 #include "MParList.h" 68 68 #include "MTaskList.h" 69 #include "MStatusDisplay.h" 69 70 70 71 #include "MLog.h" … … 279 280 *fLog << " '" << GetFileName() << "' (before event #"; 280 281 *fLog << GetNumEntry()-1 << ")" << endl; 282 283 if (fDisplay) 284 { 285 TString txt = GetFileName(); 286 txt += " @ "; 287 txt += GetNumEntry()-1; 288 fDisplay->SetStatusLine2(txt); 289 } 281 290 282 291 // -
trunk/MagicSoft/Mars/mraw/MRawFileRead.cc
r6500 r6503 53 53 #include "MTime.h" 54 54 #include "MParList.h" 55 #include "MStatusDisplay.h" 55 56 56 57 #include "MRawRunHeader.h" … … 196 197 } 197 198 else 199 { 198 200 *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 } 199 210 200 211 delete [] expname;
Note:
See TracChangeset
for help on using the changeset viewer.