Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/7170_muon_time_format'
Browse files Browse the repository at this point in the history
  • Loading branch information
jawrainey committed Oct 18, 2013
2 parents c776935 + 014449c commit 2e44a02
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1259,22 +1259,23 @@ void MuonAnalysis::inputFileChanged(const QStringList& files)
infoStr += matrix_workspace->getComment();

const Run& runDetails = matrix_workspace->run();

Mantid::Kernel::DateAndTime start, end;

// Add the start time for the run
infoStr += "\nStart: ";
if ( runDetails.hasProperty("run_start") )
{
start = runDetails.getProperty("run_start")->value();
infoStr += runDetails.getProperty("run_start")->value();
infoStr += start.toSimpleString();
}

// Add the end time for the run
infoStr += "\nEnd: ";
if ( runDetails.hasProperty("run_end") )
{
end = runDetails.getProperty("run_end")->value();
infoStr += runDetails.getProperty("run_end")->value();
infoStr += end.toSimpleString();
}

// Add counts to run information
Expand Down

0 comments on commit 2e44a02

Please sign in to comment.