OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4000: Rename Observed Time History Data -> Observed Data

Browse Source
This commit is contained in:
Magne Sjaastad 2019-02-05 08:18:49 +01:00
parent 47abb3c6a1
commit 619abd2f1f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/RicImportObservedDataFeature.cpp
View File

@ -51,7 +51,7 @@ void RicImportObservedDataFeature::selectObservedDataFileInDialog()
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES"); 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; if (fileNames.isEmpty()) return;
@ -132,5 +132,5 @@ void RicImportObservedDataFeature::onActionTriggered(bool isChecked)
void RicImportObservedDataFeature::setupActionLook(QAction* actionToSetup) void RicImportObservedDataFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setIcon(QIcon(":/ObservedDataFile16x16.png")); actionToSetup->setIcon(QIcon(":/ObservedDataFile16x16.png"));
actionToSetup->setText("Import Observed Time History Data"); actionToSetup->setText("Import Observed Data");
} }

2
ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp
View File

@ -62,6 +62,6 @@ void RicImportObservedDataInMenuFeature::onActionTriggered(bool isChecked)
void RicImportObservedDataInMenuFeature::setupActionLook(QAction* actionToSetup) void RicImportObservedDataInMenuFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setIcon(QIcon(":/ObservedDataFile16x16.png")); actionToSetup->setIcon(QIcon(":/ObservedDataFile16x16.png"));
actionToSetup->setText("Import Observed Time History Data"); actionToSetup->setText("Import Observed Data");
} }

2
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@ -48,7 +48,7 @@ CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimObservedDataCollection::RimObservedDataCollection() RimObservedDataCollection::RimObservedDataCollection()
{ {
CAF_PDM_InitObject("Observed Time History Data", ":/Folder.png", "", ""); CAF_PDM_InitObject("Observed Data", ":/Folder.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_observedDataArray, "ObservedDataArray", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_observedDataArray, "ObservedDataArray", "", "", "", "");