#962 Added axis-icons in the project tree.

This commit is contained in:
Jacob Støren committed 2016-11-18 10:48:35 +01:00
1 parent 5f72310f67
commit 8b95f1c06d
11 files changed
+14 -5

No files matched your search

@@ -478,7 +478,7 @@ QImage RimSummaryPlot::snapshotWindowContent()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{ {
caf::PdmUiTreeOrdering* axisFolder = uiTreeOrdering.add("Axis", ":/Folder.png"); caf::PdmUiTreeOrdering* axisFolder = uiTreeOrdering.add("Axes", ":/Axes16x16.png");
axisFolder->add(&m_timeAxisProperties); axisFolder->add(&m_timeAxisProperties);
axisFolder->add(&m_leftYAxisProperties); axisFolder->add(&m_leftYAxisProperties);
axisFolder->add(&m_rightYAxisProperties); axisFolder->add(&m_rightYAxisProperties);
@@ -32,7 +32,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryTimeAxisProperties, "SummaryTimeAxisProperties");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryTimeAxisProperties::RimSummaryTimeAxisProperties() RimSummaryTimeAxisProperties::RimSummaryTimeAxisProperties()
{ {
CAF_PDM_InitObject("Time Axis", ":/SummaryPlot16x16.png", "", ""); CAF_PDM_InitObject("Time Axis", ":/BottomAxis16x16.png", "", "");
CAF_PDM_InitField(&m_isActive, "Active", true, "Active", "", "", ""); CAF_PDM_InitField(&m_isActive, "Active", true, "Active", "", "", "");
m_isActive.uiCapability()->setUiHidden(true); m_isActive.uiCapability()->setUiHidden(true);
@@ -42,7 +42,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryYAxisProperties, "SummaryYAxisProperties");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryYAxisProperties::RimSummaryYAxisProperties() RimSummaryYAxisProperties::RimSummaryYAxisProperties()
{ {
CAF_PDM_InitObject("Y-Axis Properties", ":/SummaryPlot16x16.png", "", ""); CAF_PDM_InitObject("Y-Axis Properties", ":/LeftAxis16x16.png", "", "");
CAF_PDM_InitField(&m_isActive, "Active", true, "Active", "", "", ""); CAF_PDM_InitField(&m_isActive, "Active", true, "Active", "", "", "");
m_isActive.uiCapability()->setUiHidden(true); m_isActive.uiCapability()->setUiHidden(true);
@@ -106,6 +106,8 @@ void RimSummaryYAxisProperties::setNameAndAxis(const QString& name, QwtPlot::Axi
{ {
m_name = name; m_name = name;
m_axis = axis; m_axis = axis;
if (axis == QwtPlot::yRight) this->setUiIcon(QIcon(":/RightAxis16x16.png"));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
Binary file not shown.

After

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 269 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 200 B

+9 -2
View File
@@ -62,8 +62,8 @@
<file>SummaryCurveFilter16x16.png</file> <file>SummaryCurveFilter16x16.png</file>
<file>FormationCollection16x16.png</file> <file>FormationCollection16x16.png</file>
<file>Formations16x16.png</file> <file>Formations16x16.png</file>
<file>Parallel16x16.png</file> <file>Parallel24x24.png</file>
<file>Perspective16x16.png</file> <file>Perspective24x24.png</file>
<file>IntersectionBox16x16.png</file> <file>IntersectionBox16x16.png</file>
<file>IntersectionXPlane16x16.png</file> <file>IntersectionXPlane16x16.png</file>
<file>IntersectionYPlane16x16.png</file> <file>IntersectionYPlane16x16.png</file>
@@ -73,6 +73,13 @@
<file>3DView16x16.png</file> <file>3DView16x16.png</file>
<file>SummaryCase48x48.png</file> <file>SummaryCase48x48.png</file>
<file>openFolder24x24.png</file> <file>openFolder24x24.png</file>
<file>clipboard.png</file>
<file>Copy.png</file>
<file>Erase.png</file>
<file>LeftAxis16x16.png</file>
<file>RightAxis16x16.png</file>
<file>BottomAxis16x16.png</file>
<file>Axes16x16.png</file>
</qresource> </qresource>
<qresource prefix="/Shader/"> <qresource prefix="/Shader/">
<file>fs_CellFace.glsl</file> <file>fs_CellFace.glsl</file>
Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 293 B