#3428 Text string creation based on date and time : Use toStringUsingApplicationLocale() at relevant places

This commit is contained in:
Magne Sjaastad
2018-10-01 20:50:43 +02:00
parent a083e70ea1
commit 2b1c6e9706
9 changed files with 44 additions and 11 deletions

View File

@@ -19,6 +19,7 @@
#include "RimWellPlotTools.h"
#include "RiaApplication.h"
#include "RiaQDateTimeTools.h"
#include "RiaWellNameComparer.h"
#include "RifReaderEclipseRft.h"
@@ -31,6 +32,7 @@
#include "RimEclipseResultCase.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimTools.h"
#include "RimWellLogExtractionCurve.h"
#include "RimWellLogFile.h"
#include "RimWellLogFileChannel.h"
@@ -39,7 +41,6 @@
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "RimTools.h"
#include <regex>
//--------------------------------------------------------------------------------------------------
@@ -986,7 +987,8 @@ void RimWellPlotTools::calculateValueOptionsForTimeSteps(
for (const std::pair<QDateTime, std::set<RifDataSourceForRftPlt>>& timeStepPair : timestepsToShowWithSources)
{
QString optionText = timeStepPair.first.toString(dateFormatString);
QString optionText = RiaQDateTimeTools::toStringUsingApplicationLocale(timeStepPair.first, dateFormatString);
bool hasObs = false;
bool hasRft = false;
bool hasGrid = false;

View File

@@ -21,6 +21,7 @@
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaDateStringParser.h"
#include "RiaQDateTimeTools.h"
#include "RiaWellNameComparer.h"
#include "RifReaderEclipseRft.h"
@@ -528,7 +529,8 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
curveName += sourceDef.eclCase() ? sourceDef.eclCase()->caseUserDescription() : "";
curveName += sourceDef.wellLogFile() ? sourceDef.wellLogFile()->name() : "";
if ( sourceDef.sourceType() == RifDataSourceForRftPlt::RFT ) curveName += ", RFT";
curveName += ", " + timeStep.toString(dateFormatString);
curveName += ", " + RiaQDateTimeTools::toStringUsingApplicationLocale(timeStep, dateFormatString);
}
RimEclipseResultCase* rimEclipseResultCase = dynamic_cast<RimEclipseResultCase*>(sourceDef.eclCase());