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

#3528 Make Casing Design a child object under well path.

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-10-19 16:29:46 +02:00
parent 2194821609
commit 9abbdb2fd8
7 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Commands/WellPathCommands/RicDeleteWellPathAttributeFeature.cpp
View File

@ -17,9 +17,11 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RicDeleteWellPathAttributeFeature.h"
#include "RimProject.h"
#include "RimWellPath.h"
#include "RimWellPathAttribute.h"
#include "RimWellPathAttributeCollection.h"
#include "Riu3DMainWindowTools.h"
#include "cafSelectionManager.h"
#include <QAction>
@ -60,6 +62,14 @@ void RicDeleteWellPathAttributeFeature::onActionTriggered(bool isChecked)
wellPathAttributeCollection->deleteAttribute(attributeToDelete);
}
wellPathAttributeCollection->updateAllRequiredEditors();
if (wellPathAttributeCollection->attributes().empty())
{
RimWellPath* wellPath = nullptr;
wellPathAttributeCollection->firstAncestorOrThisOfTypeAsserted(wellPath);
wellPath->updateConnectedEditors();
Riu3DMainWindowTools::selectAsCurrentItem(wellPath);
}
}
}

15
ApplicationCode/Commands/WellPathCommands/RicNewWellPathAttributeFeature.cpp
View File

@ -17,9 +17,11 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RicNewWellPathAttributeFeature.h"
#include "RimProject.h"
#include "RimWellPath.h"
#include "RimWellPathAttribute.h"
#include "RimWellPathAttributeCollection.h"
#include "Riu3DMainWindowTools.h"
#include "cafSelectionManager.h"
@ -86,6 +88,10 @@ void RicNewWellPathAttributeFeature::onActionTriggered(bool isChecked)
attributeCollections[0]->insertAttribute(nullptr, attribute);
attributeCollections[0]->updateAllRequiredEditors();
wellPath->updateConnectedEditors();
Riu3DMainWindowTools::selectAsCurrentItem(attributeCollections[0]);
}
}
}
@ -101,12 +107,17 @@ void RicNewWellPathAttributeFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText(QString("Insert New Attribute before %1").arg(attributes[0]->componentTypeLabel()));
actionToSetup->setIcon(QIcon(":/Well.png"));
}
else
}
else if (caf::SelectionManager::instance()->selectedItemOfType<RimWellPathAttributeCollection>())
{
actionToSetup->setText("Append New Attribute");
actionToSetup->setIcon(QIcon(":/Well.png"));
}
else if(caf::SelectionManager::instance()->selectedItemOfType<RimWellPath>())
{
actionToSetup->setText("Create Casing Design");
actionToSetup->setIcon(QIcon(":/Well.png"));
}
}

3
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -289,13 +289,11 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicNewWellPathIntersectionFeature";
menuBuilder.addSeparator();
menuBuilder.subMenuStart("Completions", QIcon(":/FishBoneGroup16x16.png"));
menuBuilder << "RicNewWellPathFractureFeature";
menuBuilder << "RicNewFishbonesSubsFeature";
menuBuilder << "RicNewPerforationIntervalFeature";
menuBuilder << "RicNewValveFeature";
menuBuilder << "RicEditPerforationCollectionFeature";
menuBuilder.subMenuEnd();
@ -309,6 +307,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicShowWellPlanFeature";
}
menuBuilder << "RicCreateMultipleFracturesFeature";
menuBuilder << "RicNewWellPathAttributeFeature";
menuBuilder << "Separator";

14
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -118,10 +118,9 @@ RimWellPath::RimWellPath()
m_wellLogFile_OBSOLETE.uiCapability()->setUiHidden(true);
m_wellLogFile_OBSOLETE.xmlCapability()->setIOWritable(false);
CAF_PDM_InitFieldNoDefault(&m_wellPathAttributes, "WellPathAttributes", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_wellPathAttributes, "WellPathAttributes", "Casing Design Rubbish", "", "", "");
m_wellPathAttributes = new RimWellPathAttributeCollection;
m_wellPathAttributes->uiCapability()->setUiTreeHidden(true);
m_wellPathAttributes->uiCapability()->setUiTreeChildrenHidden(true);
m_wellPath = nullptr;
}
@ -564,8 +563,6 @@ void RimWellPath::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiO
formationFileInfoGroup->add(&m_wellPathFormationFilePath);
formationFileInfoGroup->add(&m_formationKeyInFile);
m_wellPathAttributes->uiOrdering(uiConfigName, uiOrdering);
uiOrdering.skipRemainingFields(true);
}
@ -578,12 +575,17 @@ void RimWellPath::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, Q
if (m_completions->hasCompletions())
{
uiTreeOrdering.add(&m_completions);
uiTreeOrdering.add(m_completions());
}
if (m_3dWellLogCurves->has3dWellLogCurves())
{
uiTreeOrdering.add(&m_3dWellLogCurves);
uiTreeOrdering.add(m_3dWellLogCurves());
}
if (!m_wellPathAttributes->attributes().empty())
{
uiTreeOrdering.add(m_wellPathAttributes());
}
uiTreeOrdering.skipRemainingChildren(true);

19
ApplicationCode/ProjectDataModel/RimWellPathAttributeCollection.cpp
View File

@ -22,6 +22,7 @@
#include "cafCmdFeatureMenuBuilder.h"
#include "cafPdmUiTableViewEditor.h"
#include "cafPdmUiTreeOrdering.h"
CAF_PDM_SOURCE_INIT(RimWellPathAttributeCollection, "WellPathAttributes");
@ -30,12 +31,11 @@ CAF_PDM_SOURCE_INIT(RimWellPathAttributeCollection, "WellPathAttributes");
//--------------------------------------------------------------------------------------------------
RimWellPathAttributeCollection::RimWellPathAttributeCollection()
{
CAF_PDM_InitObject("WellPathAttributes", ":/Well.png", "", "");
CAF_PDM_InitObject("Casing Design", ":/CompletionsSymbol16x16", "", "");
CAF_PDM_InitFieldNoDefault(&m_attributes, "Attributes", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_attributes, "Attributes", "Casing Design Attributes", "", "", "");
m_attributes.uiCapability()->setUiEditorTypeName(caf::PdmUiTableViewEditor::uiEditorTypeName());
m_attributes.uiCapability()->setUiTreeChildrenHidden(true);
m_attributes.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
m_attributes.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
m_attributes.uiCapability()->setCustomContextMenuEnabled(true);
}
@ -137,6 +137,13 @@ void RimWellPathAttributeCollection::defineEditorAttribute(const caf::PdmFieldHa
//--------------------------------------------------------------------------------------------------
void RimWellPathAttributeCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* attrGroup = uiOrdering.addNewGroup("Well Path Attributes");
attrGroup->add(&m_attributes);
uiOrdering.add(&m_attributes);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathAttributeCollection::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{
uiTreeOrdering.skipRemainingChildren(true);
}

4
ApplicationCode/ProjectDataModel/RimWellPathAttributeCollection.h
View File

@ -39,8 +39,10 @@ public:
protected:
void defineCustomContextMenu(const caf::PdmFieldHandle* fieldNeedingMenu, QMenu* menu, QWidget* fieldEditorWidget) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
private:
caf::PdmChildArrayField<RimWellPathAttribute*> m_attributes;
};

4
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -405,9 +405,9 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
menuBuilder.subMenuEnd();
menuBuilder.addSeparator();
menuBuilder << "RicNewWellPathAttributeFeature";
menuBuilder.subMenuStart("Completions", QIcon(":/FishBoneGroup16x16.png"));
menuBuilder << "RicNewWellPathFractureAtPosFeature";
menuBuilder << "RicNewFishbonesSubsAtMeasuredDepthFeature";
menuBuilder << "RicNewPerforationIntervalAtMeasuredDepthFeature";