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

#2809, #2858, #2859 Fix icon inconsistencies. Edd icons for ensemble curves and new icons for cross plot

Browse Source
This commit is contained in:
Jacob Støren
2018-05-06 10:07:49 +02:00
parent 4108c72680
commit 9885c9d2d7
26 changed files with 135 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/SummaryPlotCommands/RicDuplicateSummaryCrossPlotFeature.cpp
View File

@@ -70,6 +70,6 @@ void RicDuplicateSummaryCrossPlotFeature::onActionTriggered(bool isChecked)
void RicDuplicateSummaryCrossPlotFeature::setupActionLook(QAction* actionToSetup) void RicDuplicateSummaryCrossPlotFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("Duplicate Summary Cross Plot"); actionToSetup->setText("Duplicate Summary Cross Plot");
actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png")); actionToSetup->setIcon(QIcon(":/SummaryXPlotLight16x16.png"));
} }

2
ApplicationCode/Commands/SummaryPlotCommands/RicDuplicateSummaryPlotFeature.cpp
View File

@@ -70,6 +70,6 @@ void RicDuplicateSummaryPlotFeature::onActionTriggered(bool isChecked)
void RicDuplicateSummaryPlotFeature::setupActionLook(QAction* actionToSetup) void RicDuplicateSummaryPlotFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("Duplicate Summary Plot"); actionToSetup->setText("Duplicate Summary Plot");
actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png")); actionToSetup->setIcon(QIcon(":/SummaryPlotLight16x16.png"));
} }

2
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp
View File

@@ -108,7 +108,7 @@ void RicEditSummaryCrossPlotFeature::onActionTriggered(bool isChecked)
void RicEditSummaryCrossPlotFeature::setupActionLook(QAction* actionToSetup) void RicEditSummaryCrossPlotFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("Edit Summary Plot"); actionToSetup->setText("Edit Summary Plot");
actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png")); actionToSetup->setIcon(QIcon(":/SummaryXPlotLight16x16.png"));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp
View File

@@ -110,7 +110,7 @@ void RicEditSummaryPlotFeature::onActionTriggered(bool isChecked)
void RicEditSummaryPlotFeature::setupActionLook(QAction* actionToSetup) void RicEditSummaryPlotFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("Edit Summary Plot"); actionToSetup->setText("Edit Summary Plot");
actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png")); actionToSetup->setIcon(QIcon(":/SummaryPlotLight16x16.png"));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotFeature.cpp
View File

@@ -77,6 +77,6 @@ void RicNewSummaryCrossPlotFeature::onActionTriggered(bool isChecked)
void RicNewSummaryCrossPlotFeature::setupActionLook(QAction* actionToSetup) void RicNewSummaryCrossPlotFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("New Summary Cross Plot"); actionToSetup->setText("New Summary Cross Plot");
actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png")); actionToSetup->setIcon(QIcon(":/SummaryXPlotLight16x16.png"));
} }

2
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
View File

@@ -86,7 +86,7 @@ void RicNewSummaryEnsembleCurveSetFeature::onActionTriggered(bool isChecked)
void RicNewSummaryEnsembleCurveSetFeature::setupActionLook(QAction* actionToSetup) void RicNewSummaryEnsembleCurveSetFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("New Summary Ensemble Curve Set"); actionToSetup->setText("New Summary Ensemble Curve Set");
actionToSetup->setIcon(QIcon(":/SummaryCurve16x16.png")); actionToSetup->setIcon(QIcon(":/EnsembleCurveSet16x16.png"));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
View File

@@ -86,6 +86,6 @@ void RicNewSummaryPlotFeature::onActionTriggered(bool isChecked)
void RicNewSummaryPlotFeature::setupActionLook(QAction* actionToSetup) void RicNewSummaryPlotFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("New Summary Plot"); actionToSetup->setText("New Summary Plot");
actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png")); actionToSetup->setIcon(QIcon(":/SummaryPlotLight16x16.png"));
} }

2
ApplicationCode/Commands/WellLogCommands/RicNewPltPlotFeature.cpp
View File

@@ -135,7 +135,7 @@ void RicNewPltPlotFeature::onActionTriggered(bool isChecked)
void RicNewPltPlotFeature::setupActionLook(QAction* actionToSetup) void RicNewPltPlotFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("New PLT Plot"); actionToSetup->setText("New PLT Plot");
actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png")); actionToSetup->setIcon(QIcon(":/WellFlowPlot16x16.png"));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/Commands/WellLogCommands/RicNewRftPlotFeature.cpp
View File

@@ -96,7 +96,7 @@ void RicNewRftPlotFeature::onActionTriggered(bool isChecked)
void RicNewRftPlotFeature::setupActionLook(QAction* actionToSetup) void RicNewRftPlotFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("New RFT Plot"); actionToSetup->setText("New RFT Plot");
actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png")); actionToSetup->setIcon(QIcon(":/FlowCharPlot16x16.png"));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@@ -101,7 +101,7 @@ const char RimWellPltPlot::PLOT_NAME_QFORMAT_STRING[] = "PLT: %1";
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWellPltPlot::RimWellPltPlot() RimWellPltPlot::RimWellPltPlot()
{ {
CAF_PDM_InitObject("Well Allocation Plot", ":/WellAllocPlot16x16.png", "", ""); CAF_PDM_InitObject("Well Allocation Plot", ":/WellFlowPlot16x16.png", "", "");
CAF_PDM_InitField(&m_userName, "PlotDescription", QString("PLT Plot"), "Name", "", "", ""); CAF_PDM_InitField(&m_userName, "PlotDescription", QString("PLT Plot"), "Name", "", "", "");
m_userName.uiCapability()->setUiReadOnly(true); m_userName.uiCapability()->setUiReadOnly(true);

2
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@@ -70,7 +70,7 @@ const char RimWellRftPlot::PLOT_NAME_QFORMAT_STRING[] = "RFT: %1";
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWellRftPlot::RimWellRftPlot() RimWellRftPlot::RimWellRftPlot()
{ {
CAF_PDM_InitObject("Well Allocation Plot", ":/WellAllocPlot16x16.png", "", ""); CAF_PDM_InitObject("Well Allocation Plot", ":/FlowCharPlot16x16.png", "", "");
CAF_PDM_InitField(&m_userName, "PlotDescription", QString("RFT Plot"), "Name", "", "", ""); CAF_PDM_InitField(&m_userName, "PlotDescription", QString("RFT Plot"), "Name", "", "", "");
m_userName.uiCapability()->setUiReadOnly(true); m_userName.uiCapability()->setUiReadOnly(true);

4
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -262,7 +262,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder.addSeparator(); menuBuilder.addSeparator();
menuBuilder.subMenuStart("Well Plots", QIcon(":/SummaryPlot16x16.png")); menuBuilder.subMenuStart("Well Plots", QIcon(":/WellLogTrack16x16.png"));
menuBuilder << "RicNewRftPlotFeature"; menuBuilder << "RicNewRftPlotFeature";
menuBuilder << "RicNewPltPlotFeature"; menuBuilder << "RicNewPltPlotFeature";
menuBuilder << "RicShowWellAllocationPlotFeature"; menuBuilder << "RicShowWellAllocationPlotFeature";
@@ -537,7 +537,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicNewWellLogRftCurveFeature"; menuBuilder << "RicNewWellLogRftCurveFeature";
menuBuilder << "RicNewSimWellIntersectionFeature"; menuBuilder << "RicNewSimWellIntersectionFeature";
menuBuilder.subMenuStart("Well Plots", QIcon(":/SummaryPlot16x16.png")); menuBuilder.subMenuStart("Well Plots", QIcon(":/WellLogTrack16x16.png"));
menuBuilder << "RicNewRftPlotFeature"; menuBuilder << "RicNewRftPlotFeature";
menuBuilder << "RicNewPltPlotFeature"; menuBuilder << "RicNewPltPlotFeature";
menuBuilder << "Separator"; menuBuilder << "Separator";

2
ApplicationCode/ProjectDataModel/RimPltPlotCollection.cpp
View File

@@ -39,7 +39,7 @@ CAF_PDM_SOURCE_INIT(RimPltPlotCollection, "WellPltPlotCollection");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimPltPlotCollection::RimPltPlotCollection() RimPltPlotCollection::RimPltPlotCollection()
{ {
CAF_PDM_InitObject("PLT Plots", ":/WellLogPlots16x16.png", "", ""); CAF_PDM_InitObject("PLT Plots", ":/WellAllocPlots16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_pltPlots, "PltPlots", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_pltPlots, "PltPlots", "", "", "", "");
m_pltPlots.uiCapability()->setUiHidden(true); m_pltPlots.uiCapability()->setUiHidden(true);

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

@@ -74,7 +74,7 @@ CAF_PDM_SOURCE_INIT(RimEnsembleCurveSet, "RimEnsembleCurveSet");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimEnsembleCurveSet::RimEnsembleCurveSet() RimEnsembleCurveSet::RimEnsembleCurveSet()
{ {
CAF_PDM_InitObject("Ensemble Curve Set", ":/SummaryCurveFilter16x16.png", "", ""); CAF_PDM_InitObject("Ensemble Curve Set", ":/EnsembleCurveSet16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_curves, "EnsembleCurveSet", "Ensemble Curve Set", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_curves, "EnsembleCurveSet", "Ensemble Curve Set", "", "", "");
m_curves.uiCapability()->setUiHidden(true); m_curves.uiCapability()->setUiHidden(true);

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

@@ -42,7 +42,7 @@ CAF_PDM_SOURCE_INIT(RimEnsembleCurveSetCollection, "RimEnsembleCurveSetCollectio
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimEnsembleCurveSetCollection::RimEnsembleCurveSetCollection() RimEnsembleCurveSetCollection::RimEnsembleCurveSetCollection()
{ {
CAF_PDM_InitObject("Ensemble Curve Sets", ":/SummaryCurveFilter16x16.png", "", ""); CAF_PDM_InitObject("Ensemble Curve Sets", ":/EnsembleCurveSets16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_curveSets, "EnsembleCurveSets", "Ensemble Curve Sets", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_curveSets, "EnsembleCurveSets", "Ensemble Curve Sets", "", "", "");
m_curveSets.uiCapability()->setUiHidden(true); m_curveSets.uiCapability()->setUiHidden(true);

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

@@ -26,7 +26,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryCrossPlot, "SummaryCrossPlot");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCrossPlot::RimSummaryCrossPlot() RimSummaryCrossPlot::RimSummaryCrossPlot()
{ {
CAF_PDM_InitObject("Summary Cross Plot", ":/SummaryPlotLight16x16.png", "", ""); CAF_PDM_InitObject("Summary Cross Plot", ":/SummaryXPlotLight16x16.png", "", "");
setAsCrossPlot(); setAsCrossPlot();
} }

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

@@ -29,7 +29,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryCrossPlotCollection, "SummaryCrossPlotCollection")
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCrossPlotCollection::RimSummaryCrossPlotCollection() RimSummaryCrossPlotCollection::RimSummaryCrossPlotCollection()
{ {
CAF_PDM_InitObject("Summary Cross Plots", ":/SummaryPlots16x16.png", "", ""); CAF_PDM_InitObject("Summary Cross Plots", ":/SummaryXPlotsLight16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_summaryCrossPlots, "SummaryCrossPlots", "Summary Cross Plots", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_summaryCrossPlots, "SummaryCrossPlots", "Summary Cross Plots", "", "", "");
m_summaryCrossPlots.uiCapability()->setUiHidden(true); m_summaryCrossPlots.uiCapability()->setUiHidden(true);

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

@@ -28,7 +28,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryPlotCollection, "SummaryPlotCollection");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryPlotCollection::RimSummaryPlotCollection() RimSummaryPlotCollection::RimSummaryPlotCollection()
{ {
CAF_PDM_InitObject("Summary Plots", ":/SummaryPlots16x16.png", "", ""); CAF_PDM_InitObject("Summary Plots", ":/SummaryPlotsLight16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&summaryPlots, "SummaryPlots", "Summary Plots", "", "", ""); CAF_PDM_InitFieldNoDefault(&summaryPlots, "SummaryPlots", "Summary Plots", "", "", "");
summaryPlots.uiCapability()->setUiHidden(true); summaryPlots.uiCapability()->setUiHidden(true);

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 662 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 939 B

8
ApplicationCode/Resources/ResInsight.qrc
View File

@@ -56,10 +56,15 @@
<file>CrossSection16x16.png</file> <file>CrossSection16x16.png</file>
<file>CrossSections16x16.png</file> <file>CrossSections16x16.png</file>
<file>Refresh-32.png</file> <file>Refresh-32.png</file>
<file>SummaryPlot16x16.png</file> <file>SummaryPlotLight16x16.png</file>
<file>SummaryPlots16x16.png</file> <file>SummaryPlots16x16.png</file>
<file>SummaryPlotsLight16x16.png</file>
<file>SummaryCurve16x16.png</file> <file>SummaryCurve16x16.png</file>
<file>SummaryCurveFilter16x16.png</file> <file>SummaryCurveFilter16x16.png</file>
<file>EnsembleCurveSet16x16.png</file>
<file>EnsembleCurveSets16x16.png</file>
<file>SummaryXPlotLight16x16.png</file>
<file>SummaryXPlotsLight16x16.png</file>
<file>FormationCollection16x16.png</file> <file>FormationCollection16x16.png</file>
<file>Formations16x16.png</file> <file>Formations16x16.png</file>
<file>Parallel24x24.png</file> <file>Parallel24x24.png</file>
@@ -92,7 +97,6 @@
<file>WellFlowPlot16x16.png</file> <file>WellFlowPlot16x16.png</file>
<file>WellAllocPie16x16.png</file> <file>WellAllocPie16x16.png</file>
<file>WellAllocLegend16x16.png</file> <file>WellAllocLegend16x16.png</file>
<file>SummaryPlotLight16x16.png</file>
<file>FractureLayout16x16.png</file> <file>FractureLayout16x16.png</file>
<file>FractureSymbol16x16.png</file> <file>FractureSymbol16x16.png</file>
<file>FractureTemplate16x16.png</file> <file>FractureTemplate16x16.png</file>

BIN
ApplicationCode/Resources/SummaryPlot16x16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 505 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 915 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 627 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 685 B

4
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -367,7 +367,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
menuBuilder.addSeparator(); menuBuilder.addSeparator();
menuBuilder.subMenuStart("Well Plots", QIcon(":/SummaryPlot16x16.png")); menuBuilder.subMenuStart("Well Plots", QIcon(":/WellLogTrack16x16.png"));
menuBuilder << "RicNewRftPlotFeature"; menuBuilder << "RicNewRftPlotFeature";
menuBuilder << "RicNewPltPlotFeature"; menuBuilder << "RicNewPltPlotFeature";
@@ -419,7 +419,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
menuBuilder.addSeparator(); menuBuilder.addSeparator();
menuBuilder.subMenuStart("Well Plots", QIcon(":/SummaryPlot16x16.png")); menuBuilder.subMenuStart("Well Plots", QIcon(":/WellLogTrack16x16.png"));
menuBuilder << "RicNewRftPlotFeature"; menuBuilder << "RicNewRftPlotFeature";
menuBuilder << "RicNewPltPlotFeature"; menuBuilder << "RicNewPltPlotFeature";