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

Major modularization adjustments

Browse Source 
Use uiField() when issuing setUi....() commands
Use PdmChildArrayField instead of PdmPointersFielc
Use PdmChildField instead of PdmField to pdm pointer objects
Use PdmChildArrayField instead of PdmField< std::list< caf::PdmPointer<
type > > >
Use PdmObjectHandle instead of PdmObject
Replaced parentFields(std::vector)  with parentField()
Use PdmUiPropertyViewDialog instead of PdmUiPropertyDialog
This commit is contained in:
Magne Sjaastad
2015-07-31 18:58:23 +02:00
parent d56cde087f
commit 737936d846
85 changed files with 710 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -1293,6 +1293,11 @@ bool RiaApplication::launchProcessForMultipleCases(const QString& program, const
//--------------------------------------------------------------------------------------------------
void RiaApplication::readFieldsFromApplicationStore(caf::PdmObject* object, const QString context)
{
// MODTODO
// Replace with existing caf functionality
/*
QSettings settings;
std::vector<caf::PdmFieldHandle*> fields;
@@ -1302,11 +1307,11 @@ void RiaApplication::readFieldsFromApplicationStore(caf::PdmObject* object, cons
{
caf::PdmFieldHandle* fieldHandle = fields[i];
std::vector<caf::PdmObject*> children;
std::vector<caf::PdmObjectHandle*> children;
fieldHandle->childObjects(&children);
for (size_t childIdx = 0; childIdx < children.size(); childIdx++)
{
caf::PdmObject* child = children[childIdx];
caf::PdmObjectHandle* child = children[childIdx];
QString subContext = context + child->classKeyword() + "/";
readFieldsFromApplicationStore(child, subContext);
}
@@ -1322,6 +1327,7 @@ void RiaApplication::readFieldsFromApplicationStore(caf::PdmObject* object, cons
}
}
}
*/
}
//--------------------------------------------------------------------------------------------------
@@ -1329,6 +1335,12 @@ void RiaApplication::readFieldsFromApplicationStore(caf::PdmObject* object, cons
//--------------------------------------------------------------------------------------------------
void RiaApplication::writeFieldsToApplicationStore(const caf::PdmObject* object, const QString context)
{
// MODTODO
// Replace with existing caf functionality
/*
CVF_ASSERT(object);
QSettings settings;
@@ -1360,6 +1372,7 @@ void RiaApplication::writeFieldsToApplicationStore(const caf::PdmObject* object,
settings.setValue(context + fieldHandle->keyword(), fieldHandle->uiValue());
}
}
*/
}
//--------------------------------------------------------------------------------------------------
@@ -1665,7 +1678,7 @@ void RiaApplication::runRegressionTest(const QString& testRootPath)
this->preferences()->fields(fields);
for (size_t i = 0; i < fields.size(); i++)
{
QVariant v = fields[i]->uiValue();
QVariant v = fields[i]->capability<caf::PdmUiFieldHandle>()->uiValue();
preferencesValues.push_back(v);
}
}
@@ -1721,7 +1734,7 @@ void RiaApplication::runRegressionTest(const QString& testRootPath)
for (size_t i = 0; i < preferencesValues.size(); i++)
{
fields[i]->setValueFromUi(preferencesValues[i]);
fields[i]->capability<caf::PdmUiFieldHandle>()->setValueFromUi(preferencesValues[i]);
}
}
}
@@ -2140,7 +2153,12 @@ void RiaApplication::regressionTestConfigureProject()
if (resvView)
{
resvView->faultCollection->setShowFaultsOutsideFilters(false);
resvView->faultResultSettings->showCustomFaultResult.setValueFromUi(false);
caf::PdmUiFieldHandle* uiFieldHandle = uiField(&resvView->faultResultSettings->showCustomFaultResult);
if (uiFieldHandle)
{
uiFieldHandle->setValueFromUi(false);
}
}
}
}

22
ApplicationCode/Application/RiaPreferences.cpp
View File

@@ -21,10 +21,12 @@
#include "RiaStdInclude.h"
#include "RiaPreferences.h"
#include "cafPdmUiFilePathEditor.h"
#include "RifReaderSettings.h"
#include "cafPdmFieldCvfColor.h"
#include "cafPdmUiCheckBoxEditor.h"
#include "RifReaderSettings.h"
#include "cafPdmUiFieldHandle.h"
#include "cafPdmUiFilePathEditor.h"
CAF_PDM_SOURCE_INIT(RiaPreferences, "RiaPreferences");
//--------------------------------------------------------------------------------------------------
@@ -35,17 +37,17 @@ RiaPreferences::RiaPreferences(void)
CAF_PDM_InitField(&navigationPolicy, "navigationPolicy", caf::AppEnum<RiaApplication::RINavigationPolicy>(RiaApplication::NAVIGATION_POLICY_CEETRON), "Navigation mode", "", "", "");
CAF_PDM_InitFieldNoDefault(&scriptDirectories, "scriptDirectory", "Shared Script Folder(s)", "", "", "");
scriptDirectories.setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
scriptDirectories.capability<caf::PdmUiFieldHandle>()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
CAF_PDM_InitField(&scriptEditorExecutable, "scriptEditorExecutable", QString("kate"), "Script Editor", "", "", "");
scriptEditorExecutable.setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
scriptEditorExecutable.capability<caf::PdmUiFieldHandle>()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
CAF_PDM_InitField(&octaveExecutable, "octaveExecutable", QString("octave"), "Octave executable location", "", "", "");
octaveExecutable.setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
octaveExecutable.setUiLabelPosition(caf::PdmUiItemInfo::TOP);
octaveExecutable.capability<caf::PdmUiFieldHandle>()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
octaveExecutable.capability<caf::PdmUiFieldHandle>()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
CAF_PDM_InitField(&octaveShowHeaderInfoWhenExecutingScripts, "octaveShowHeaderInfoWhenExecutingScripts", false, "Show text header when executing scripts", "", "", "");
octaveShowHeaderInfoWhenExecutingScripts.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
octaveShowHeaderInfoWhenExecutingScripts.capability<caf::PdmUiFieldHandle>()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&ssihubAddress, "ssihubAddress", QString("http://"), "ssihub Address", "", "", "");
@@ -62,13 +64,13 @@ RiaPreferences::RiaPreferences(void)
CAF_PDM_InitField(&showHud, "showHud", false, "Show 3D Information", "", "", "");
CAF_PDM_InitFieldNoDefault(&lastUsedProjectFileName,"lastUsedProjectFileName", "Last Used Project File", "", "", "");
lastUsedProjectFileName.setUiHidden(true);
lastUsedProjectFileName.capability<caf::PdmUiFieldHandle>()->setUiHidden(true);
CAF_PDM_InitField(&autocomputeDepthRelatedProperties, "autocomputeDepth", true, "Compute DEPTH related properties", "", "DEPTH, DX, DY, DZ, TOP, BOTTOM", "");
autocomputeDepthRelatedProperties.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
autocomputeDepthRelatedProperties.capability<caf::PdmUiFieldHandle>()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&loadAndShowSoil, "loadAndShowSoil", true, "Load and show SOIL", "", "", "");
loadAndShowSoil.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
loadAndShowSoil.capability<caf::PdmUiFieldHandle>()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
readerSettings = new RifReaderSettings;
CAF_PDM_InitFieldNoDefault(&readerSettings, "readerSettings", "Reader settings", "", "", "");

7
ApplicationCode/Application/RiaPreferences.h
View File

@@ -22,9 +22,10 @@
#include "RiaApplication.h"
#include "cafPdmObject.h"
#include "cafPdmField.h"
#include "cafAppEnum.h"
#include "cafPdmChildField.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
// Include to make Pdm work for cvf::Color
#include "cafPdmFieldCvfColor.h"
@@ -67,7 +68,7 @@ public: // Pdm Fields
caf::PdmField<bool> autocomputeDepthRelatedProperties;
caf::PdmField<bool> loadAndShowSoil;
caf::PdmField<RifReaderSettings*> readerSettings;
caf::PdmChildField<RifReaderSettings*> readerSettings;
protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);

4
ApplicationCode/Application/RiaRegressionTest.cpp
View File

@@ -28,10 +28,10 @@ CAF_PDM_SOURCE_INIT(RiaRegressionTest, "RiaRegressionTest");
RiaRegressionTest::RiaRegressionTest(void)
{
CAF_PDM_InitFieldNoDefault(&applicationWorkingFolder, "workingFolder", "Folder containing <b>compare</b>", "", "Location of compare tool from Image Magic suite", "");
applicationWorkingFolder.setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
applicationWorkingFolder.capability<caf::PdmUiFieldHandle>()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&regressionTestFolder, "regressionTestFolder", "Regression Test Folder", "", "", "");
regressionTestFolder.setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
regressionTestFolder.capability<caf::PdmUiFieldHandle>()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
}
//--------------------------------------------------------------------------------------------------