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

Add option for word wrap in label and checkbox

Browse Source 
* Add support for word wrap in checkbox label
* QLabelEditor: Add word wrap and support for wide label
Add support for one label widget spanning the area usually consumed by a label widget and an editor widget.
* Use word wrap in summary calculation dialog
This commit is contained in:
Magne Sjaastad
2023-03-09 12:46:55 +01:00
committed by GitHub
parent 527743a845
commit f5171310bf
12 changed files with 220 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp
View File

@@ -41,6 +41,7 @@
#include "RiuExpressionContextMenuManager.h"
#include "cafPdmUiCheckBoxEditor.h"
#include "cafPdmUiLineEditor.h"
#include "cafPdmUiTableViewEditor.h"
#include "cafPdmUiTextEditor.h"
@@ -194,6 +195,23 @@ bool RimSummaryCalculation::detectCyclicCalculation( int id, std::set<int>& ids
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCalculation::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
{
RimUserDefinedCalculation::defineEditorAttribute( field, uiConfigName, attribute );
if ( field == &m_distributeToOtherItems )
{
auto myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>( attribute );
if ( myAttr )
{
myAttr->setWordWrap( true );
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.h
View File

@@ -85,8 +85,10 @@ protected:
std::optional<std::vector<SummaryCalculationVariable>> getVariables() const;
bool checkVariables() const;
bool detectCyclicCalculation( int id, std::set<int>& ids ) const;
void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
private:
caf::PdmField<bool> m_distributeToOtherItems;
};

8
ApplicationLibCode/ProjectDataModel/RimUserDefinedCalculation.cpp
View File

@@ -396,6 +396,14 @@ void RimUserDefinedCalculation::defineEditorAttribute( const caf::PdmFieldHandle
attrib->m_buttonText = "Open Help Page";
}
}
else if ( field == &m_helpText )
{
auto* attrib = dynamic_cast<caf::PdmUiLabelEditorAttribute*>( attribute );
if ( attrib )
{
attrib->m_useWordWrap = true;
}
}
}
//--------------------------------------------------------------------------------------------------