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

#964 Improve code robustness in defineEditorAttribute

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-04-25 10:31:37 +02:00
parent 68cb4ab54f
commit 63cd817b85
13 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Application/RiaPreferences.cpp
View File

@@ -113,7 +113,7 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
if (field == &scriptDirectories) if (field == &scriptDirectories)
{ {
caf::PdmUiFilePathEditorAttribute* myAttr = static_cast<caf::PdmUiFilePathEditorAttribute*>(attribute); caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
myAttr->m_selectDirectory = true; myAttr->m_selectDirectory = true;
@@ -129,7 +129,7 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
field == &showLasCurveWithoutTvdWarning || field == &showLasCurveWithoutTvdWarning ||
field == &autoCreatePlotsOnImport) field == &autoCreatePlotsOnImport)
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
myAttr->m_useNativeCheckBoxLabel = true; myAttr->m_useNativeCheckBoxLabel = true;

2
ApplicationCode/Application/RiaRegressionTest.cpp
View File

@@ -51,7 +51,7 @@ void RiaRegressionTest::defineEditorAttribute(const caf::PdmFieldHandle* field,
{ {
if (field == &applicationWorkingFolder || field == &regressionTestFolder) if (field == &applicationWorkingFolder || field == &regressionTestFolder)
{ {
caf::PdmUiFilePathEditorAttribute* myAttr = static_cast<caf::PdmUiFilePathEditorAttribute*>(attribute); caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
myAttr->m_selectDirectory = true; myAttr->m_selectDirectory = true;

4
ApplicationCode/Commands/RicExportToLasFileResampleUi.cpp
View File

@@ -121,7 +121,7 @@ void RicExportToLasFileResampleUi::defineEditorAttribute(const caf::PdmFieldHand
{ {
if (field == &exportFolder) if (field == &exportFolder)
{ {
caf::PdmUiFilePathEditorAttribute* myAttr = static_cast<caf::PdmUiFilePathEditorAttribute*>(attribute); caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
myAttr->m_selectDirectory = true; myAttr->m_selectDirectory = true;
@@ -130,7 +130,7 @@ void RicExportToLasFileResampleUi::defineEditorAttribute(const caf::PdmFieldHand
if (field == &exportTvdrkb || field == &activateResample) if (field == &exportTvdrkb || field == &activateResample)
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
myAttr->m_useNativeCheckBoxLabel = true; myAttr->m_useNativeCheckBoxLabel = true;

2
ApplicationCode/FileInterface/RifReaderSettings.cpp
View File

@@ -52,7 +52,7 @@ void RifReaderSettings::defineEditorAttribute(const caf::PdmFieldHandle* field,
field == &importAdvancedMswData || field == &importAdvancedMswData ||
field == &importNNCs) field == &importNNCs)
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
myAttr->m_useNativeCheckBoxLabel = true; myAttr->m_useNativeCheckBoxLabel = true;

2
ApplicationCode/ProjectDataModel/RimBinaryExportSettings.cpp
View File

@@ -43,7 +43,7 @@ void RimBinaryExportSettings::defineEditorAttribute(const caf::PdmFieldHandle* f
{ {
if (field == &fileName) if (field == &fileName)
{ {
caf::PdmUiFilePathEditorAttribute* myAttr = static_cast<caf::PdmUiFilePathEditorAttribute*>(attribute); caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
myAttr->m_selectSaveFileName = true; myAttr->m_selectSaveFileName = true;

2
ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp
View File

@@ -171,7 +171,7 @@ RimCellRangeFilterCollection* RimCellRangeFilter::parentContainer()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellRangeFilter::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute) void RimCellRangeFilter::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute)
{ {
caf::PdmUiSliderEditorAttribute* myAttr = static_cast<caf::PdmUiSliderEditorAttribute*>(attribute); caf::PdmUiSliderEditorAttribute* myAttr = dynamic_cast<caf::PdmUiSliderEditorAttribute*>(attribute);
if (!myAttr || !parentContainer()) if (!myAttr || !parentContainer())
{ {
return; return;

10
ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
View File

@@ -613,13 +613,19 @@ void RimEclipseStatisticsCase::defineEditorAttribute(const caf::PdmFieldHandle*
if (&m_selectionSummary == field) if (&m_selectionSummary == field)
{ {
caf::PdmUiTextEditorAttribute* textEditAttrib = dynamic_cast<caf::PdmUiTextEditorAttribute*> (attribute); caf::PdmUiTextEditorAttribute* textEditAttrib = dynamic_cast<caf::PdmUiTextEditorAttribute*> (attribute);
textEditAttrib->textMode = caf::PdmUiTextEditorAttribute::HTML; if (textEditAttrib)
{
textEditAttrib->textMode = caf::PdmUiTextEditorAttribute::HTML;
}
} }
if (&m_calculateEditCommand == field) if (&m_calculateEditCommand == field)
{ {
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute); caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute);
attrib->m_buttonText = hasComputedStatistics() ? "Edit (Will DELETE current results)": "Compute"; if (attrib)
{
attrib->m_buttonText = hasComputedStatistics() ? "Edit (Will DELETE current results)": "Compute";
}
} }
} }

2
ApplicationCode/ProjectDataModel/RimExportInputPropertySettings.cpp
View File

@@ -42,7 +42,7 @@ void RimExportInputSettings::defineEditorAttribute(const caf::PdmFieldHandle* fi
{ {
if (field == &fileName) if (field == &fileName)
{ {
caf::PdmUiFilePathEditorAttribute* myAttr = static_cast<caf::PdmUiFilePathEditorAttribute*>(attribute); caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
myAttr->m_selectSaveFileName = true; myAttr->m_selectSaveFileName = true;

30
ApplicationCode/ProjectDataModel/RimIntersection.cpp
View File

@@ -553,13 +553,16 @@ void RimIntersection::defineEditorAttribute(const caf::PdmFieldHandle* field, QS
{ {
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute); caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute);
if (inputPolyLineFromViewerEnabled) if (attrib)
{ {
attrib->m_buttonText = "Stop picking points"; if (inputPolyLineFromViewerEnabled)
} {
else attrib->m_buttonText = "Stop picking points";
{ }
attrib->m_buttonText = "Start picking points"; else
{
attrib->m_buttonText = "Start picking points";
}
} }
} }
else if (field == &m_userPolyline) else if (field == &m_userPolyline)
@@ -574,13 +577,16 @@ void RimIntersection::defineEditorAttribute(const caf::PdmFieldHandle* field, QS
{ {
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute); caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute);
if (inputExtrusionPointsFromViewerEnabled) if (attrib)
{ {
attrib->m_buttonText = "Stop picking points"; if (inputExtrusionPointsFromViewerEnabled)
} {
else attrib->m_buttonText = "Stop picking points";
{ }
attrib->m_buttonText = "Start picking points"; else
{
attrib->m_buttonText = "Start picking points";
}
} }
} }
else if (field == &m_customExtrusionPoints) else if (field == &m_customExtrusionPoints)

16
ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp
View File

@@ -404,14 +404,18 @@ void RimIntersectionBox::defineEditorAttribute(const caf::PdmFieldHandle* field,
{ {
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute); caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute);
if (m_show3DManipulator) if (attrib)
{ {
attrib->m_buttonText = "Hide 3D manipulator"; if (m_show3DManipulator)
} {
else attrib->m_buttonText = "Hide 3D manipulator";
{ }
attrib->m_buttonText = "Show 3D manipulator"; else
{
attrib->m_buttonText = "Show 3D manipulator";
}
} }
} }
} }

7
ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
View File

@@ -187,7 +187,10 @@ void RimScriptCollection::defineEditorAttribute(const caf::PdmFieldHandle* field
{ {
if (field == &directory) if (field == &directory)
{ {
caf::PdmUiFilePathEditorAttribute* myAttr = static_cast<caf::PdmUiFilePathEditorAttribute*>(attribute); caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>(attribute);
myAttr->m_selectDirectory = true; if (myAttr)
{
myAttr->m_selectDirectory = true;
}
} }
} }

5
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp
View File

@@ -423,7 +423,10 @@ void RimSummaryCurveFilter::defineEditorAttribute(const caf::PdmFieldHandle* fie
if(&m_applyButtonField == field) if(&m_applyButtonField == field)
{ {
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute); caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute);
attrib->m_buttonText = "Apply"; if (attrib)
{
attrib->m_buttonText = "Apply";
}
} }
} }

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -984,7 +984,7 @@ void RimSummaryPlot::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
{ {
if (field == &m_showLegend || field == &m_showPlotTitle) if (field == &m_showLegend || field == &m_showPlotTitle)
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
myAttr->m_useNativeCheckBoxLabel = true; myAttr->m_useNativeCheckBoxLabel = true;