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

Renamed the multicase command to "Create Grid Case Group From Files"

Browse Source 
p4#: 20814
This commit is contained in:
Jacob Støren
2013-03-07 12:32:19 +01:00
parent aab18ba0a0
commit 78f2c359cb
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@@ -37,11 +37,11 @@ RimIdenticalGridCaseGroup::RimIdenticalGridCaseGroup()
{
CAF_PDM_InitObject("Grid Case Group", "", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Identical Grid Case Group"), "Name", "", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Grid Case Group"), "Name", "", "", "");
CAF_PDM_InitFieldNoDefault(&caseCollection, "CaseCollection", "Cases", "", "", "");
CAF_PDM_InitFieldNoDefault(&statisticalReservoirCollection, "StatisticalReservoirCollection", "Derived Statistics", "", "", "");
CAF_PDM_InitFieldNoDefault(&caseCollection, "CaseCollection", "Cases", "", "", "");
caseCollection = new RimCaseCollection;
statisticalReservoirCollection = new RimStatisticalCollection;

2
ApplicationCode/ProjectDataModel/RimStatisticalCollection.cpp
View File

@@ -58,7 +58,7 @@ RimStatisticalCalculation* RimStatisticalCollection::createAndAppendStatisticalC
newObject->setMainGrid(gridCaseGroup->mainGrid());
newObject->caseName = "Statistics 1";
newObject->caseName = QString("Statistics ") + QString::number(reservoirs.size()+1);
reservoirs.push_back(newObject);

3
ApplicationCode/UserInterface/RIMainWindow.cpp
View File

@@ -178,7 +178,7 @@ void RIMainWindow::createActions()
// File actions
m_openAction = new QAction(QIcon(":/AppLogo48x48.png"), "&Open Eclipse Case", this);
m_openInputEclipseFileAction= new QAction(QIcon(":/EclipseInput48x48.png"), "&Open Input Eclipse Case", this);
m_openMultipleEclipseCasesAction = new QAction(QIcon(":/EclipseInput48x48.png"), "&Open Multiple Eclipse Folders", this);
m_openMultipleEclipseCasesAction = new QAction(QIcon(":/AppLogo48x48.png"), "&Create Grid Case Group from Files", this);
m_openProjectAction = new QAction(style()->standardIcon(QStyle::SP_DirOpenIcon), "&Open Project", this);
m_openLastUsedProjectAction = new QAction("Open &Last Used Project", this);
@@ -350,6 +350,7 @@ void RIMainWindow::createToolBars()
// View toolbar
m_viewToolBar = addToolBar(tr("View"));
m_viewToolBar->setObjectName(m_viewToolBar->windowTitle());
m_viewToolBar->addAction(m_zoomAll);
m_viewToolBar->addAction(m_viewFromNorth);
m_viewToolBar->addAction(m_viewFromSouth);
m_viewToolBar->addAction(m_viewFromEast);

6
ApplicationCode/UserInterface/RiuMultiCaseImportDialog.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Import multiple cases</string>
<string>Create Grid Case Group From Files</string>
</property>
<property name="modal">
<bool>true</bool>
@@ -22,7 +22,7 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="3">
<widget class="QListView" name="m_searchFolderList">
@@ -80,7 +80,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0">
<item row="1" column="0" colspan="2">
<widget class="QListView" name="m_eclipseCasesList">