#1071 Updated icons for fractures

This commit is contained in:
Magne Sjaastad committed 2017-01-05 14:57:04 +01:00
1 parent 18fde7621e
commit 508c2ba1a2
16 files changed
+14 -12

No files matched your search

@@ -65,7 +65,7 @@ void RicNewFractureDefinitionFeature::onActionTriggered(bool isChecked)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewFractureDefinitionFeature::setupActionLook(QAction* actionToSetup) void RicNewFractureDefinitionFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setIcon(QIcon(":/Fracture16x16.png")); actionToSetup->setIcon(QIcon(":/FractureTemplate16x16.png"));
actionToSetup->setText("New Fracture Template"); actionToSetup->setText("New Fracture Template");
} }
@@ -99,7 +99,7 @@ void RicNewSimWellFractureAtPosFeature::onActionTriggered(bool isChecked)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewSimWellFractureAtPosFeature::setupActionLook(QAction* actionToSetup) void RicNewSimWellFractureAtPosFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setIcon(QIcon(":/Fracture16x16.png")); actionToSetup->setIcon(QIcon(":/FractureSymbol16x16.png"));
actionToSetup->setText("New Fracture"); actionToSetup->setText("New Fracture");
} }
@@ -81,7 +81,7 @@ void RicNewSimWellFractureFeature::onActionTriggered(bool isChecked)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewSimWellFractureFeature::setupActionLook(QAction* actionToSetup) void RicNewSimWellFractureFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setIcon(QIcon(":/Fracture16x16.png")); actionToSetup->setIcon(QIcon(":/FractureSymbol16x16.png"));
actionToSetup->setText("New Fracture"); actionToSetup->setText("New Fracture");
} }
@@ -104,7 +104,7 @@ void RicNewWellPathFractureAtPosFeature::onActionTriggered(bool isChecked)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewWellPathFractureAtPosFeature::setupActionLook(QAction* actionToSetup) void RicNewWellPathFractureAtPosFeature::setupActionLook(QAction* actionToSetup)
{ {
// actionToSetup->setIcon(QIcon(":/CrossSection16x16.png")); actionToSetup->setIcon(QIcon(":/FractureSymbol16x16.png"));
actionToSetup->setText("New Fracture"); actionToSetup->setText("New Fracture");
} }
@@ -82,7 +82,7 @@ void RicNewWellPathFractureFeature::onActionTriggered(bool isChecked)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicNewWellPathFractureFeature::setupActionLook(QAction* actionToSetup) void RicNewWellPathFractureFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setIcon(QIcon(":/Fracture16x16.png")); actionToSetup->setIcon(QIcon(":/FractureSymbol16x16.png"));
actionToSetup->setText("New Fracture"); actionToSetup->setText("New Fracture");
} }
@@ -44,7 +44,7 @@ CAF_PDM_SOURCE_INIT(RimFractureDefinition, "FractureDefinition");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimFractureDefinition::RimFractureDefinition(void) RimFractureDefinition::RimFractureDefinition(void)
{ {
CAF_PDM_InitObject("Fracture Template", ":/Fracture16x16.png", "", ""); CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Template"), "Name", "", "", ""); CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Template"), "Name", "", "", "");
@@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimFractureDefinitionCollection, "FractureDefinitionCollecti
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimFractureDefinitionCollection::RimFractureDefinitionCollection(void) RimFractureDefinitionCollection::RimFractureDefinitionCollection(void)
{ {
CAF_PDM_InitObject("Fracture Templates", ":/Fracture16x16.png", "", ""); CAF_PDM_InitObject("Fracture Templates", ":/FractureTemplate16x16.png", "", "");
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", ""); CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");
@@ -43,7 +43,7 @@ CAF_PDM_SOURCE_INIT(RimSimWellFracture, "SimWellFracture");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSimWellFracture::RimSimWellFracture(void) RimSimWellFracture::RimSimWellFracture(void)
{ {
CAF_PDM_InitObject("SimWellFracture", ":/Fracture16x16.png", "", ""); CAF_PDM_InitObject("SimWellFracture", ":/FractureSymbol16x16.png", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Name"), "Name", "", "", ""); CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Name"), "Name", "", "", "");
@@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimSimWellFractureCollection, "SimWellFractureCollection");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSimWellFractureCollection::RimSimWellFractureCollection(void) RimSimWellFractureCollection::RimSimWellFractureCollection(void)
{ {
CAF_PDM_InitObject("Fractures", ":/Fracture16x16.png", "", ""); CAF_PDM_InitObject("Fractures", ":/FractureSymbol16x16.png", "", "");
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", ""); CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");
@@ -44,7 +44,7 @@ CAF_PDM_SOURCE_INIT(RimWellPathFracture, "WellPathFracture");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWellPathFracture::RimWellPathFracture(void) RimWellPathFracture::RimWellPathFracture(void)
{ {
CAF_PDM_InitObject("Fracture", ":/Fracture16x16.png", "", ""); CAF_PDM_InitObject("Fracture", ":/FractureSymbol16x16.png", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Name"), "Name", "", "", ""); CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Name"), "Name", "", "", "");
@@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimWellPathFractureCollection, "WellPathFractureCollection")
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWellPathFractureCollection::RimWellPathFractureCollection(void) RimWellPathFractureCollection::RimWellPathFractureCollection(void)
{ {
CAF_PDM_InitObject("Fractures", ":/Fracture16x16.png", "", ""); CAF_PDM_InitObject("Fractures", ":/FractureSymbol16x16.png", "", "");
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", ""); CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");
Binary file not shown.

Before

Width:  |  Height:  |  Size: 665 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 656 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 614 B

+3 -1
View File
@@ -80,7 +80,9 @@
<file>RightAxis16x16.png</file> <file>RightAxis16x16.png</file>
<file>BottomAxis16x16.png</file> <file>BottomAxis16x16.png</file>
<file>Axes16x16.png</file> <file>Axes16x16.png</file>
<file>Fracture16x16.png</file> <file>FractureLayout16x16.png</file>
<file>FractureSymbol16x16.png</file>
<file>FractureTemplate16x16.png</file>
</qresource> </qresource>
<qresource prefix="/Shader/"> <qresource prefix="/Shader/">
<file>fs_CellFace.glsl</file> <file>fs_CellFace.glsl</file>