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

#3384 Add RiaApplication::enableDebugFeatures method that checks environment for RESINSIGHT_DEBUG

Browse Source 
* Disable System tab of preferences if this is not enabled.
This commit is contained in:
Gaute Lindkvist 2018-09-19 14:43:06 +02:00
parent 38d3b666e6
commit e4a5eb2769
4 changed files with 77 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Application/RiaApplication.cpp
View File

@ -99,6 +99,7 @@
#include <QFileDialog> #include <QFileDialog>
#include <QMdiSubWindow> #include <QMdiSubWindow>
#include <QMessageBox> #include <QMessageBox>
#include <QProcessEnvironment>
#include <QTreeView> #include <QTreeView>
@ -1596,6 +1597,15 @@ void RiaApplication::saveWinGeoAndDockToolBarLayout()
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaApplication::enableDevelopmentFeatures()
{
QString environmentVar = QProcessEnvironment::systemEnvironment().value("RESINSIGHT_DEVEL", QString("0"));
return environmentVar.toInt() == 1;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/Application/RiaApplication.h
View File

@ -106,7 +106,7 @@ public:
RimViewWindow* activePlotWindow() const; RimViewWindow* activePlotWindow() const;
RimProject* project(); RimProject* project();
void createMockModel(); void createMockModel();
void createResultsMockModel(); void createResultsMockModel();
@ -203,6 +203,8 @@ public:
void waitUntilCommandObjectsHasBeenProcessed(); void waitUntilCommandObjectsHasBeenProcessed();
void saveWinGeoAndDockToolBarLayout(); void saveWinGeoAndDockToolBarLayout();
static bool enableDevelopmentFeatures();
private: private:
void onProjectOpenedOrClosed(); void onProjectOpenedOrClosed();
void setWindowCaptionFromAppState(); void setWindowCaptionFromAppState();

71
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -81,14 +81,14 @@ RiaPreferences::RiaPreferences(void)
useShaders.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); useShaders.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&showHud, "showHud", false, "Show 3D Information", "", "", ""); CAF_PDM_InitField(&showHud, "showHud", false, "Show 3D Information", "", "", "");
showHud.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); showHud.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names", "", "", ""); CAF_PDM_InitField(&m_appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names", "", "", "");
appendClassNameToUiText.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); m_appendClassNameToUiText.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&appendFieldKeywordToToolTipText, "appendFieldKeywordToToolTipText", false, "Show Field Keyword in ToolTip", "", "", ""); CAF_PDM_InitField(&m_appendFieldKeywordToToolTipText, "appendFieldKeywordToToolTipText", false, "Show Field Keyword in ToolTip", "", "", "");
appendFieldKeywordToToolTipText.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); m_appendFieldKeywordToToolTipText.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar", "", "", ""); CAF_PDM_InitField(&m_showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar", "", "", "");
showTestToolbar.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); m_showTestToolbar.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&includeFractureDebugInfoFile, "includeFractureDebugInfoFile", false, "Include Fracture Debug Info for Completion Export", "", "", ""); CAF_PDM_InitField(&m_includeFractureDebugInfoFile, "includeFractureDebugInfoFile", false, "Include Fracture Debug Info for Completion Export", "", "", "");
includeFractureDebugInfoFile.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN); m_includeFractureDebugInfoFile.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&showLegendBackground, "showLegendBackground", true, "Enable Legend Background", "", "", ""); CAF_PDM_InitField(&showLegendBackground, "showLegendBackground", true, "Enable Legend Background", "", "", "");
@ -111,7 +111,10 @@ RiaPreferences::RiaPreferences(void)
m_tabNames << "General"; m_tabNames << "General";
m_tabNames << "Eclipse"; m_tabNames << "Eclipse";
m_tabNames << "Octave"; m_tabNames << "Octave";
m_tabNames << "System"; if (RiaApplication::enableDevelopmentFeatures())
{
m_tabNames << "System";
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -143,10 +146,10 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
field == &loadAndShowSoil || field == &loadAndShowSoil ||
field == &useShaders || field == &useShaders ||
field == &showHud || field == &showHud ||
field == &appendClassNameToUiText || field == &m_appendClassNameToUiText ||
field == &appendFieldKeywordToToolTipText || field == &m_appendFieldKeywordToToolTipText ||
field == &showTestToolbar || field == &m_showTestToolbar ||
field == &includeFractureDebugInfoFile || field == &m_includeFractureDebugInfoFile ||
field == &showLasCurveWithoutTvdWarning) field == &showLasCurveWithoutTvdWarning)
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
@ -210,12 +213,12 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
scriptGroup->add(&scriptDirectories); scriptGroup->add(&scriptDirectories);
scriptGroup->add(&scriptEditorExecutable); scriptGroup->add(&scriptEditorExecutable);
} }
else if (uiConfigName == m_tabNames[3]) else if (RiaApplication::enableDevelopmentFeatures() && uiConfigName == m_tabNames[3])
{ {
uiOrdering.add(&appendClassNameToUiText); uiOrdering.add(&m_appendClassNameToUiText);
uiOrdering.add(&appendFieldKeywordToToolTipText); uiOrdering.add(&m_appendFieldKeywordToToolTipText);
uiOrdering.add(&showTestToolbar); uiOrdering.add(&m_showTestToolbar);
uiOrdering.add(&includeFractureDebugInfoFile); uiOrdering.add(&m_includeFractureDebugInfoFile);
} }
uiOrdering.skipRemainingFields(true); uiOrdering.skipRemainingFields(true);
@ -272,3 +275,35 @@ const RifReaderSettings* RiaPreferences::readerSettings() const
return m_readerSettings; return m_readerSettings;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaPreferences::appendClassNameToUiText() const
{
return RiaApplication::enableDevelopmentFeatures() && m_appendClassNameToUiText();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaPreferences::appendFieldKeywordToToolTipText() const
{
return RiaApplication::enableDevelopmentFeatures() && m_appendFieldKeywordToToolTipText();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaPreferences::showTestToolbar() const
{
return RiaApplication::enableDevelopmentFeatures() && m_showTestToolbar();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaPreferences::includeFractureDebugInfoFile() const
{
return RiaApplication::enableDevelopmentFeatures() && m_includeFractureDebugInfoFile();
}

17
ApplicationCode/Application/RiaPreferences.h
View File

@ -47,6 +47,12 @@ public:
const RifReaderSettings* readerSettings() const; const RifReaderSettings* readerSettings() const;
// Debug settings
bool appendClassNameToUiText() const;
bool appendFieldKeywordToToolTipText() const;
bool showTestToolbar() const;
bool includeFractureDebugInfoFile() const;
public: // Pdm Fields public: // Pdm Fields
caf::PdmField<caf::AppEnum< RiaApplication::RINavigationPolicy > > navigationPolicy; caf::PdmField<caf::AppEnum< RiaApplication::RINavigationPolicy > > navigationPolicy;
@ -69,11 +75,7 @@ public: // Pdm Fields
caf::PdmField<bool> showLegendBackground; caf::PdmField<bool> showLegendBackground;
caf::PdmField<bool> useShaders; caf::PdmField<bool> useShaders;
caf::PdmField<bool> showHud; caf::PdmField<bool> showHud;
caf::PdmField<bool> appendClassNameToUiText;
caf::PdmField<bool> appendFieldKeywordToToolTipText;
caf::PdmField<bool> showTestToolbar;
caf::PdmField<bool> includeFractureDebugInfoFile;
caf::PdmField<QString> lastUsedProjectFileName; caf::PdmField<QString> lastUsedProjectFileName;
@ -91,6 +93,9 @@ protected:
private: private:
caf::PdmChildField<RifReaderSettings*> m_readerSettings; caf::PdmChildField<RifReaderSettings*> m_readerSettings;
caf::PdmField<bool> m_appendClassNameToUiText;
caf::PdmField<bool> m_appendFieldKeywordToToolTipText;
caf::PdmField<bool> m_showTestToolbar;
caf::PdmField<bool> m_includeFractureDebugInfoFile;
QStringList m_tabNames; QStringList m_tabNames;
}; };