From e2d291cda9b2fd6dccbc6ebdf483d20d1d6f72c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Fri, 24 Aug 2018 15:12:10 +0200 Subject: [PATCH] #3272 Create multiple fractures. Dialog adjustments --- .../RicCreateMultipleFracturesFeature.cpp | 6 ++++-- .../RicCreateMultipleFracturesUi.cpp | 14 +++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesFeature.cpp b/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesFeature.cpp index 3bfc96defb..60853ce17d 100644 --- a/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesFeature.cpp +++ b/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesFeature.cpp @@ -220,7 +220,7 @@ void RicCreateMultipleFracturesFeature::onActionTriggered(bool isChecked) m_dialog = &propertyDialog; - propertyDialog.resize(QSize(600, 400)); + propertyDialog.resize(QSize(700, 400)); QDialogButtonBox* dialogButtonBox = propertyDialog.dialogButtonBox(); @@ -231,13 +231,15 @@ void RicCreateMultipleFracturesFeature::onActionTriggered(bool isChecked) connect(pushButton, SIGNAL(clicked()), this, SLOT(slotDeleteAndAppendFractures())); pushButton->setDefault(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())); pushButton->setDefault(false); pushButton->setAutoDefault(false); + pushButton->setToolTip("Add new fractures"); } { diff --git a/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp b/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp index dd4819b1f7..8152f92cec 100644 --- a/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp +++ b/ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.cpp @@ -53,7 +53,7 @@ RiuCreateMultipleFractionsUi::RiuCreateMultipleFractionsUi() m_options.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP); 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.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP); m_fractureCreationSummary.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName()); @@ -184,7 +184,6 @@ QString RiuCreateMultipleFractionsUi::summaryText() const } QString tableText; - tableText += "Fracture Template Count for selected wells\n\n"; { QTextStream stream(&tableText); @@ -193,7 +192,7 @@ QString RiuCreateMultipleFractionsUi::summaryText() const formatter.setTableRowPrependText(" "); std::vector header; - header.push_back(RifEclipseOutputTableColumn("Well Name")); + header.push_back(RifEclipseOutputTableColumn("Selected Wells")); for (auto fracTemplate : fracTemplateSet) { @@ -246,6 +245,15 @@ void RiuCreateMultipleFractionsUi::defineEditorAttribute(const caf::PdmFieldHand attr->font = font; attr->heightHint = 100; + attr->wrapMode = caf::PdmUiTextEditorAttribute::NoWrap; + } + } + else if (field == &m_options) + { + auto attr = dynamic_cast(attribute); + if (attr) + { + attr->columnWidths = { 90, 90, 400, 70 }; } } }