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

Added several new icons, including zoom all

Browse Source 
p4#: 20823
This commit is contained in:
Jacob Støren 2013-03-07 16:47:42 +01:00
parent 208e904f57
commit d4a28126d1
13 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@ -35,12 +35,12 @@ CAF_PDM_SOURCE_INIT(RimIdenticalGridCaseGroup, "RimIdenticalGridCaseGroup");
//--------------------------------------------------------------------------------------------------
RimIdenticalGridCaseGroup::RimIdenticalGridCaseGroup()
{
CAF_PDM_InitObject("Grid Case Group", "", "", "");
CAF_PDM_InitObject("Grid Case Group", ":/GridCaseGroup16x16.png", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Grid Case Group"), "Name", "", "", "");
CAF_PDM_InitFieldNoDefault(&statisticalReservoirCollection, "StatisticalReservoirCollection", "Derived Statistics", "", "", "");
CAF_PDM_InitFieldNoDefault(&caseCollection, "CaseCollection", "Cases", "", "", "");
CAF_PDM_InitFieldNoDefault(&statisticalReservoirCollection, "StatisticalReservoirCollection", "Derived Statistics", ":/Histograms16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&caseCollection, "CaseCollection", "Cases", ":/Cases16x16.png", "", "");
caseCollection = new RimCaseCollection;
statisticalReservoirCollection = new RimStatisticalCollection;

2
ApplicationCode/ProjectDataModel/RimResultReservoir.cpp
View File

@ -35,6 +35,8 @@ CAF_PDM_SOURCE_INIT(RimResultReservoir, "EclipseCase");
RimResultReservoir::RimResultReservoir()
: RimReservoir()
{
CAF_PDM_InitObject("Eclipse Case", ":/AppLogo48x48.png", "", "");
CAF_PDM_InitField(&caseFileName, "CaseFileName", QString(), "Case file name", "", "" ,"");
CAF_PDM_InitField(&caseDirectory, "CaseFolder", QString(), "Directory", "", "" ,"");
}

1
ApplicationCode/ProjectDataModel/RimStatisticalCalculation.cpp
View File

@ -37,6 +37,7 @@ CAF_PDM_SOURCE_INIT(RimStatisticalCalculation, "RimStatisticalCalculation");
RimStatisticalCalculation::RimStatisticalCalculation()
: RimReservoir()
{
CAF_PDM_InitObject("Case Group Statistics", ":/Histogram16x16.png", "", "");
CAF_PDM_InitField(&m_resultName, "ResultName", QString("PRESSURE"), "ResultName", "", "", "");
m_readerInterface = new RifReaderStatisticalCalculation;

BIN
ApplicationCode/Resources/AppLogo48x48.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
ApplicationCode/Resources/Cases16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 686 B

BIN
ApplicationCode/Resources/CreateGridCaseGroup16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 669 B

BIN
ApplicationCode/Resources/GridCaseGroup16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 525 B

BIN
ApplicationCode/Resources/Histogram16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 280 B

BIN
ApplicationCode/Resources/Histograms16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 454 B

8
ApplicationCode/Resources/ResInsight.qrc
View File

@ -23,7 +23,13 @@
<file>octave.png</file>
<file>Folder.png</file>
<file>EclipseInput48x48.png</file>
</qresource>
<file>Cases16x16.png</file>
<file>CreateGridCaseGroup16x16.png</file>
<file>GridCaseGroup16x16.png</file>
<file>Histogram16x16.png</file>
<file>Histograms16x16.png</file>
<file>ZoomAll16x16.png</file>
</qresource>
<qresource prefix="/Shader/">
<file>fs_CellFace.glsl</file>
<file>vs_CellFace.glsl</file>

BIN
ApplicationCode/Resources/ZoomAll16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 899 B

BIN
ApplicationCode/Resources/new16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 342 B

4
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(":/AppLogo48x48.png"), "&Create Grid Case Group from Files", this);
m_openMultipleEclipseCasesAction = new QAction(QIcon(":/CreateGridCaseGroup16x16.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);
@ -238,7 +238,7 @@ void RIMainWindow::createActions()
m_viewFromBelow = new QAction(QIcon(":/UpViewArrow.png"),"Look Up", this);
m_viewFromBelow->setToolTip("Look Up");
m_zoomAll = new QAction(QIcon(),"Zoom all", this);
m_zoomAll = new QAction(QIcon(":/ZoomAll16x16.png"),"Zoom all", this);
m_zoomAll->setToolTip("Zoom to view all");
connect(m_viewFromNorth, SIGNAL(triggered()), SLOT(slotViewFromNorth()));