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

#3272 Create multiple fractures. Dialog adjustments

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-08-24 15:12:10 +02:00
parent 1be8d335fa
commit e2d291cda9
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesFeature.cpp
View File

@ -220,7 +220,7 @@ void RicCreateMultipleFracturesFeature::onActionTriggered(bool isChecked)
m_dialog = &propertyDialog; m_dialog = &propertyDialog;
propertyDialog.resize(QSize(600, 400)); propertyDialog.resize(QSize(700, 400));
QDialogButtonBox* dialogButtonBox = propertyDialog.dialogButtonBox(); QDialogButtonBox* dialogButtonBox = propertyDialog.dialogButtonBox();
@ -231,13 +231,15 @@ void RicCreateMultipleFracturesFeature::onActionTriggered(bool isChecked)
connect(pushButton, SIGNAL(clicked()), this, SLOT(slotDeleteAndAppendFractures())); connect(pushButton, SIGNAL(clicked()), this, SLOT(slotDeleteAndAppendFractures()));
pushButton->setDefault(false); pushButton->setDefault(false);
pushButton->setAutoDefault(false); pushButton->setAutoDefault(false);
pushButton->setToolTip("Delete all existing fractures before adding new fractures");
} }
{ {
QPushButton* pushButton = dialogButtonBox->addButton("Append Fractures", QDialogButtonBox::ActionRole); QPushButton* pushButton = dialogButtonBox->addButton("Add Fractures", QDialogButtonBox::ActionRole);
connect(pushButton, SIGNAL(clicked()), this, SLOT(slotAppendFractures())); connect(pushButton, SIGNAL(clicked()), this, SLOT(slotAppendFractures()));
pushButton->setDefault(false); pushButton->setDefault(false);
pushButton->setAutoDefault(false); pushButton->setAutoDefault(false);
pushButton->setToolTip("Add new fractures");
} }
{ {

14
ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp
View File

@ -53,7 +53,7 @@ RiuCreateMultipleFractionsUi::RiuCreateMultipleFractionsUi()
m_options.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP); m_options.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
m_options.uiCapability()->setCustomContextMenuEnabled(true); m_options.uiCapability()->setCustomContextMenuEnabled(true);
CAF_PDM_InitFieldNoDefault(&m_fractureCreationSummary, "FractureCreationSummary", "Summary", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_fractureCreationSummary, "FractureCreationSummary", "Generated Fractures", "", "", "");
m_fractureCreationSummary.registerGetMethod(this, &RiuCreateMultipleFractionsUi::summaryText); m_fractureCreationSummary.registerGetMethod(this, &RiuCreateMultipleFractionsUi::summaryText);
m_fractureCreationSummary.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP); m_fractureCreationSummary.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
m_fractureCreationSummary.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName()); m_fractureCreationSummary.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName());
@ -184,7 +184,6 @@ QString RiuCreateMultipleFractionsUi::summaryText() const
} }
QString tableText; QString tableText;
tableText += "Fracture Template Count for selected wells\n\n";
{ {
QTextStream stream(&tableText); QTextStream stream(&tableText);
@ -193,7 +192,7 @@ QString RiuCreateMultipleFractionsUi::summaryText() const
formatter.setTableRowPrependText(" "); formatter.setTableRowPrependText(" ");
std::vector<RifEclipseOutputTableColumn> header; std::vector<RifEclipseOutputTableColumn> header;
header.push_back(RifEclipseOutputTableColumn("Well Name")); header.push_back(RifEclipseOutputTableColumn("Selected Wells"));
for (auto fracTemplate : fracTemplateSet) for (auto fracTemplate : fracTemplateSet)
{ {
@ -246,6 +245,15 @@ void RiuCreateMultipleFractionsUi::defineEditorAttribute(const caf::PdmFieldHand
attr->font = font; attr->font = font;
attr->heightHint = 100; attr->heightHint = 100;
attr->wrapMode = caf::PdmUiTextEditorAttribute::NoWrap;
}
}
else if (field == &m_options)
{
auto attr = dynamic_cast<caf::PdmUiTableViewEditorAttribute*>(attribute);
if (attr)
{
attr->columnWidths = { 90, 90, 400, 70 };
} }
} }
} }