From 619abd2f1f0aee8c137e004069da37bb817536e5 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 5 Feb 2019 08:18:49 +0100 Subject: [PATCH] #4000: Rename Observed Time History Data -> Observed Data --- ApplicationCode/Commands/RicImportObservedDataFeature.cpp | 4 ++-- .../Commands/RicImportObservedDataInMenuFeature.cpp | 2 +- .../ProjectDataModel/Summary/RimObservedDataCollection.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/Commands/RicImportObservedDataFeature.cpp b/ApplicationCode/Commands/RicImportObservedDataFeature.cpp index 3679c2c5b3..990755ac1b 100644 --- a/ApplicationCode/Commands/RicImportObservedDataFeature.cpp +++ b/ApplicationCode/Commands/RicImportObservedDataFeature.cpp @@ -51,7 +51,7 @@ void RicImportObservedDataFeature::selectObservedDataFileInDialog() { RiaApplication* app = RiaApplication::instance(); QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES"); - QStringList fileNames = QFileDialog::getOpenFileNames(nullptr, "Import Observed Time History Data", defaultDir, "Observed Data (*.RSM *.txt *.csv);;All Files (*.*)"); + QStringList fileNames = QFileDialog::getOpenFileNames(nullptr, "Import Observed Data", defaultDir, "Observed Data (*.RSM *.txt *.csv);;All Files (*.*)"); if (fileNames.isEmpty()) return; @@ -132,5 +132,5 @@ void RicImportObservedDataFeature::onActionTriggered(bool isChecked) void RicImportObservedDataFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setIcon(QIcon(":/ObservedDataFile16x16.png")); - actionToSetup->setText("Import Observed Time History Data"); + actionToSetup->setText("Import Observed Data"); } diff --git a/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp b/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp index 2c55ca6726..5fb9be56bd 100644 --- a/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp +++ b/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp @@ -62,6 +62,6 @@ void RicImportObservedDataInMenuFeature::onActionTriggered(bool isChecked) void RicImportObservedDataInMenuFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setIcon(QIcon(":/ObservedDataFile16x16.png")); - actionToSetup->setText("Import Observed Time History Data"); + actionToSetup->setText("Import Observed Data"); } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp index f5a91cbcb1..11363d5a5a 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp @@ -48,7 +48,7 @@ CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection"); //-------------------------------------------------------------------------------------------------- RimObservedDataCollection::RimObservedDataCollection() { - CAF_PDM_InitObject("Observed Time History Data", ":/Folder.png", "", ""); + CAF_PDM_InitObject("Observed Data", ":/Folder.png", "", ""); CAF_PDM_InitFieldNoDefault(&m_observedDataArray, "ObservedDataArray", "", "", "", "");