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

#1071 Added icons for fracture templates

Browse Source
This commit is contained in:
Magne Sjaastad 2017-01-04 14:48:09 +01:00
parent d0b669b987
commit 18fde7621e
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Commands/RicNewFractureDefinitionFeature.cpp
View File

@ -41,7 +41,6 @@ CAF_CMD_SOURCE_INIT(RicNewFractureDefinitionFeature, "RicNewFractureDefinitionFe
//--------------------------------------------------------------------------------------------------
void RicNewFractureDefinitionFeature::onActionTriggered(bool isChecked)
{
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
@ -50,7 +49,6 @@ void RicNewFractureDefinitionFeature::onActionTriggered(bool isChecked)
RimFractureDefinitionCollection* fracDefColl = oilfield->fractureDefinitionCollection();
if (fracDefColl)
{
RimFractureDefinition* fractureDef = new RimFractureDefinition();
@ -59,12 +57,7 @@ void RicNewFractureDefinitionFeature::onActionTriggered(bool isChecked)
fracDefColl->updateConnectedEditors();
RiuMainWindow::instance()->selectAsCurrentItem(fractureDef);
}
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimFractureDefinition.cpp
View File

@ -44,7 +44,7 @@ CAF_PDM_SOURCE_INIT(RimFractureDefinition, "FractureDefinition");
//--------------------------------------------------------------------------------------------------
RimFractureDefinition::RimFractureDefinition(void)
{
CAF_PDM_InitObject("Fracture Template", "", "", "");
CAF_PDM_InitObject("Fracture Template", ":/Fracture16x16.png", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Template"), "Name", "", "", "");
@ -90,6 +90,4 @@ void RimFractureDefinition::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Fracture properties");
group->add(&permeability);
group->add(&skinFactor);
}

2
ApplicationCode/ProjectDataModel/RimFractureDefinitionCollection.cpp
View File

@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimFractureDefinitionCollection, "FractureDefinitionCollecti
//--------------------------------------------------------------------------------------------------
RimFractureDefinitionCollection::RimFractureDefinitionCollection(void)
{
CAF_PDM_InitObject("Fracture Templates", "", "", "");
CAF_PDM_InitObject("Fracture Templates", ":/Fracture16x16.png", "", "");
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");