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

#1852 Curve Creator : Show fields in four columns

Browse Source
This commit is contained in:
Magne Sjaastad 2017-09-13 15:22:16 +02:00
parent 87364429f8
commit 6e4494dca1
4 changed files with 186 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.cpp
View File

@ -49,6 +49,7 @@ void RicEditSummaryCurves::onActionTriggered(bool isChecked)
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
/*
if (m_curveCreator == nullptr)
{
m_curveCreator = new RicSummaryCurveCreator();
@ -56,9 +57,10 @@ void RicEditSummaryCurves::onActionTriggered(bool isChecked)
}
if(!m_dialog->isVisible())
m_dialog->show();
*/
RicSummaryCurveCreatorUi summaryCurveCreator(nullptr, m_curveCreator);
RicSummaryCurveCreator curveCreator;
RicSummaryCurveCreatorUi summaryCurveCreator(nullptr, &curveCreator);
summaryCurveCreator.exec();
// openSelector(summaryCase);

4
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.h
View File

@ -40,6 +40,6 @@ protected:
virtual void setupActionLook(QAction* actionToSetup);
private:
RicSummaryCurveCreator* m_curveCreator;
caf::PdmUiPropertyViewDialog* m_dialog;
// RicSummaryCurveCreator* m_curveCreator;
// caf::PdmUiPropertyViewDialog* m_dialog;
};

179
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@ -244,7 +244,184 @@ void RicSummaryCurveCreator::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
caf::PdmUiGroup* itemTypesGroup = uiOrdering.addNewGroup("Items Types");
itemTypesGroup->add(&m_selectedSummaryCategory);
RifEclipseSummaryAddress::SummaryVarCategory sumCategory = m_selectedSummaryCategory();
if (sumCategory == RifEclipseSummaryAddress::SUMMARY_FIELD)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blank");
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_FIELD][0]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_AQUIFER)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blank");
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_AQUIFER][0]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_NETWORK)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blank");
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_NETWORK][0]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_MISC)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blank");
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_MISC][0]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_REGION)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Regions");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_REGION][0]->pdmField());
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_REGION][1]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Regions");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION][0]->pdmField());
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION][1]->pdmField());
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION][2]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL_GROUP)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Well Groups");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_GROUP][0]->pdmField());
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_GROUP][1]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Wells");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL][0]->pdmField());
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL][1]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Wells");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION][0]->pdmField());
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION][1]->pdmField());
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION][2]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Wells");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][0]->pdmField());
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][1]->pdmField());
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][2]->pdmField());
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][3]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL_LGR)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Wells");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_LGR][0]->pdmField());
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_LGR][1]->pdmField());
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_LGR][2]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Wells");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT][0]->pdmField());
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT][1]->pdmField());
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT][2]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_BLOCK)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blocks");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_BLOCK][0]->pdmField());
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_BLOCK][1]->pdmField());
}
}
else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR)
{
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blocks");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR][0]->pdmField());
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR][1]->pdmField());
}
{
caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR][2]->pdmField());
}
}
// Dynamic item input editors
/*
auto pdmFields = m_selectedIdentifiers[m_selectedSummaryCategory()];
if (pdmFields.size() > 0)
{
@ -253,6 +430,8 @@ void RicSummaryCurveCreator::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
for (const auto& pdmField : pdmFields)
itemInputGroup->add(pdmField->pdmField());
}
*/
caf::PdmUiGroup* curvesGroup = uiOrdering.addNewGroup("Curves");
curvesGroup->add(&m_selectedCurves);

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

@ -32,7 +32,7 @@ RicSummaryCurveCreatorUi::RicSummaryCurveCreatorUi(QWidget* parent, RicSummaryCu
m_summaryCurveCreator(summaryCurveCreator)
{
m_customObjectEditor = new RiuCustomObjectEditor;
m_customObjectEditor->defineGridLayout(4, 2);
m_customObjectEditor->defineGridLayout(2, 4);
QWidget* propertyWidget = m_customObjectEditor->getOrCreateWidget(this);