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

#3629 System : Use disableWriteAndSetFieldHidden()

Browse Source
This commit is contained in:
Magne Sjaastad 2018-11-05 14:28:07 +01:00
parent 174998335f
commit 5970d217a8
16 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@ -20,6 +20,7 @@
#include "Rim3dView.h"
#include "RiaApplication.h"
#include "RiaFieldHandleTools.h"
#include "RiaPreferences.h"
#include "RiaViewRedrawScheduler.h"
@ -919,8 +920,8 @@ void Rim3dView::forceShowWindowOn()
void Rim3dView::disableGridBoxField()
{
m_showGridBox = false;
m_showGridBox.uiCapability()->setUiHidden(true);
m_showGridBox.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_showGridBox);
}
//--------------------------------------------------------------------------------------------------
@ -929,8 +930,8 @@ void Rim3dView::disableGridBoxField()
void Rim3dView::disablePerspectiveProjectionField()
{
isPerspectiveView = false;
isPerspectiveView.uiCapability()->setUiHidden(true);
isPerspectiveView.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&isPerspectiveView);
}
//--------------------------------------------------------------------------------------------------

29
ApplicationCode/ProjectDataModel/RimCalcScript.cpp
View File

@ -1,46 +1,45 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2011-2012 Statoil ASA, Ceetron AS
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "cafPdmField.h"
#include "RimCalcScript.h"
#include "RiaFieldHandleTools.h"
#include "cafPdmField.h"
#include "cafPdmUiFilePathEditor.h"
CAF_PDM_SOURCE_INIT(RimCalcScript, "CalcScript");
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RimCalcScript::RimCalcScript()
{
CAF_PDM_InitObject("CalcScript", ":/OctaveScriptFile16x16.png", "Calc Script", "");
CAF_PDM_InitField(&absolutePath, "AbsolutePath", QString(), "Location", "", "" ,"");
CAF_PDM_InitField(&content, "Content", QString(), "Directory", "", "" ,"");
content.uiCapability()->setUiHidden(true);
content.xmlCapability()->setIOWritable(false);
CAF_PDM_InitField(&absolutePath, "AbsolutePath", QString(), "Location", "", "", "");
CAF_PDM_InitField(&content, "Content", QString(), "Directory", "", "", "");
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&content);
absolutePath.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RimCalcScript::~RimCalcScript()
{
}
RimCalcScript::~RimCalcScript() {}

7
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -22,6 +22,7 @@
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaFieldHandleTools.h"
#include "RiaPreferences.h"
#include "CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h"
@ -106,12 +107,10 @@ RimEclipseCase::RimEclipseCase()
// Obsolete fields
CAF_PDM_InitFieldNoDefault(&m_filesContainingFaults_OBSOLETE, "FilesContainingFaults", "", "", "", "");
m_filesContainingFaults_OBSOLETE.xmlCapability()->setIOWritable(false);
m_filesContainingFaults_OBSOLETE.uiCapability()->setUiHidden(true);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_filesContainingFaults_OBSOLETE);
CAF_PDM_InitField(&m_caseName_OBSOLETE, "CaseName", QString(), "Obsolete", "", "" ,"");
m_caseName_OBSOLETE.xmlCapability()->setIOWritable(false);
m_caseName_OBSOLETE.uiCapability()->setUiHidden(true);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_caseName_OBSOLETE);
// Init

4
ApplicationCode/ProjectDataModel/RimEclipseInputCase.cpp
View File

@ -20,6 +20,7 @@
#include "RimEclipseInputCase.h"
#include "RiaFieldHandleTools.h"
#include "RiaPreferences.h"
#include "RifEclipseInputFileTools.h"
@ -67,8 +68,7 @@ RimEclipseInputCase::RimEclipseInputCase()
CAF_PDM_InitFieldNoDefault(&m_additionalFilenames_OBSOLETE, "AdditionalFileNames", "Additional Files", "", "" ,"");
m_additionalFilenames_OBSOLETE.uiCapability()->setUiReadOnly(true);
m_additionalFilenames_OBSOLETE.uiCapability()->setUiHidden(true);
m_additionalFilenames_OBSOLETE.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_additionalFilenames_OBSOLETE);
}

4
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@ -21,6 +21,7 @@
#include "RimEclipsePropertyFilter.h"
#include "RiaDefines.h"
#include "RiaFieldHandleTools.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
@ -67,8 +68,7 @@ RimEclipsePropertyFilter::RimEclipsePropertyFilter()
CAF_PDM_InitObject("Cell Property Filter", ":/CellFilter_Values.png", "", "");
CAF_PDM_InitFieldNoDefault(&obsoleteField_evaluationRegion, "EvaluationRegion", "Evaluation Region", "", "", "");
obsoleteField_evaluationRegion.uiCapability()->setUiHidden(true);
obsoleteField_evaluationRegion.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&obsoleteField_evaluationRegion);
CAF_PDM_InitFieldNoDefault(&resultDefinition, "ResultDefinition", "Result Definition", "", "", "");
resultDefinition = new RimEclipseResultDefinition();

6
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -20,10 +20,11 @@
#include "RimEclipseResultCase.h"
#include "RiaApplication.h"
#include "RiaFieldHandleTools.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RiaRegressionTestRunner.h"
#include "RiaApplication.h"
#include "RifEclipseOutputFileTools.h"
#include "RifReaderEclipseOutput.h"
@ -83,8 +84,7 @@ RimEclipseResultCase::RimEclipseResultCase()
// Obsolete, unused field
CAF_PDM_InitField(&caseDirectory, "CaseFolder", QString(), "Directory", "", "" ,"");
caseDirectory.xmlCapability()->setIOWritable(false);
caseDirectory.uiCapability()->setUiHidden(true);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&caseDirectory);
m_flipXAxis.xmlCapability()->setIOWritable(true);
//flipXAxis.uiCapability()->setUiHidden(true);

8
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -22,6 +22,7 @@
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaFieldHandleTools.h"
#include "RiaPreferences.h"
#include "RigActiveCellInfo.h"
@ -35,6 +36,7 @@
#include "RigSimWellData.h"
#include "RigVirtualPerforationTransmissibilities.h"
#include "Rim2dIntersectionView.h"
#include "Rim3dOverlayInfoConfig.h"
#include "RimCellEdgeColors.h"
#include "RimCellRangeFilterCollection.h"
@ -50,9 +52,9 @@
#include "RimGridCollection.h"
#include "RimIntersection.h"
#include "RimIntersectionCollection.h"
#include "RimRegularLegendConfig.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimRegularLegendConfig.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimSimWellInView.h"
#include "RimSimWellInViewCollection.h"
@ -96,7 +98,6 @@
#include <QMessageBox>
#include <limits.h>
#include "Rim2dIntersectionView.h"
@ -146,8 +147,7 @@ RimEclipseView::RimEclipseView()
// Visualization fields
CAF_PDM_InitField(&m_showMainGrid_OBSOLETE, "ShowMainGrid", true, "Show Main Grid", "", "", "");
m_showMainGrid_OBSOLETE.uiCapability()->setUiHidden(true);
m_showMainGrid_OBSOLETE.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_showMainGrid_OBSOLETE);
CAF_PDM_InitField(&m_showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells", "", "", "");
CAF_PDM_InitField(&m_showInvalidCells, "ShowInvalidCells", false, "Show Invalid Cells", "", "", "");

12
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -21,9 +21,11 @@
#include "RimProject.h"
#include "RiaApplication.h"
#include "RiaCompletionTypeCalculationScheduler.h"
#include "RiaFieldHandleTools.h"
#include "RiaFilePathTools.h"
#include "RiaProjectFileVersionTools.h"
#include "RiaVersionInfo.h"
#include "RiaFilePathTools.h"
#include "RigEclipseCaseData.h"
#include "RigGridBase.h"
@ -78,7 +80,6 @@
#include <QDir>
#include <QMenu>
#include "RiaCompletionTypeCalculationScheduler.h"
CAF_PDM_SOURCE_INIT(RimProject, "ResInsightProject");
@ -145,11 +146,10 @@ RimProject::RimProject(void)
// Obsolete fields. The content is moved to OilFields and friends
CAF_PDM_InitFieldNoDefault(&casesObsolete, "Reservoirs", "", "", "", "");
casesObsolete.uiCapability()->setUiHidden(true);
casesObsolete.xmlCapability()->setIOWritable(false); // read but not write, they will be moved into RimAnalysisGroups
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&casesObsolete);
CAF_PDM_InitFieldNoDefault(&caseGroupsObsolete, "CaseGroups", "", "", "", "");
caseGroupsObsolete.uiCapability()->setUiHidden(true);
caseGroupsObsolete.xmlCapability()->setIOWritable(false); // read but not write, they will be moved into RimAnalysisGroups
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&caseGroupsObsolete);
// Initialization

18
ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp
View File

@ -22,6 +22,7 @@
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaFieldHandleTools.h"
#include "RiaPreferences.h"
#include "RigEclipseCaseData.h"
@ -181,27 +182,20 @@ RimSimWellInViewCollection::RimSimWellInViewCollection()
m_showWellCellFence.xmlCapability()->disableIO();
CAF_PDM_InitField(&obsoleteField_wellPipeVisibility, "GlobalWellPipeVisibility", WellVisibilityEnum(PIPES_INDIVIDUALLY), "Global well pipe visibility", "", "", "");
obsoleteField_wellPipeVisibility.uiCapability()->setUiHidden(true);
obsoleteField_wellPipeVisibility.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&obsoleteField_wellPipeVisibility);
CAF_PDM_InitField(&obsoleteField_wellCellsToRangeFilterMode, "GlobalWellCellVisibility", WellCellsRangeFilterEnum(RANGE_ADD_INDIVIDUAL), "Add cells to range filter", "", "", "");
obsoleteField_wellCellsToRangeFilterMode.uiCapability()->setUiHidden(true);
obsoleteField_wellCellsToRangeFilterMode.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&obsoleteField_wellCellsToRangeFilterMode);
CAF_PDM_InitField(&obsoleteField_showWellHead, "ShowWellHead", true, "Show Well Head", "", "", "");
CAF_PDM_InitField(&obsoleteField_showWellLabel, "ShowWellLabel", true, "Show Well Label", "", "", "");
CAF_PDM_InitField(&obsoleteField_showWellCellFence, "ShowWellFences", false, "Show Well Cell Fence", "", "", "");
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&obsoleteField_showWellHead);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&obsoleteField_showWellLabel);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&obsoleteField_showWellCellFence);
CAF_PDM_InitField(&m_showWellCommunicationLines, "ShowWellCommunicationLines", false, "Communication Lines", "", "", "");
obsoleteField_showWellHead.uiCapability()->setUiHidden(true);
obsoleteField_showWellLabel.uiCapability()->setUiHidden(true);
obsoleteField_showWellCellFence.uiCapability()->setUiHidden(true);
obsoleteField_showWellHead.xmlCapability()->setIOWritable(false);
obsoleteField_showWellLabel.xmlCapability()->setIOWritable(false);
obsoleteField_showWellCellFence.xmlCapability()->setIOWritable(false);
m_reservoirView = nullptr;
}

8
ApplicationCode/ProjectDataModel/RimViewWindow.cpp
View File

@ -17,8 +17,13 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimViewWindow.h"
#include "RiaFieldHandleTools.h"
#include "RimMdiWindowController.h"
#include "cvfAssert.h"
#include <QWidget>
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimViewWindow, "ViewWindow"); // Do not use. Abstract class
@ -37,8 +42,7 @@ RimViewWindow::RimViewWindow(void)
// Obsolete field
CAF_PDM_InitFieldNoDefault(&obsoleteField_windowGeometry, "WindowGeometry", "", "", "", "");
obsoleteField_windowGeometry.uiCapability()->setUiHidden(true);
obsoleteField_windowGeometry.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&obsoleteField_windowGeometry);
}
//--------------------------------------------------------------------------------------------------

26
ApplicationCode/ProjectDataModel/RimWellLogFile.cpp
View File

@ -18,25 +18,26 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimWellLogFile.h"
#include "RimWellLogFileChannel.h"
#include "RimFileWellPath.h"
#include "RimWellPathCollection.h"
#include "RimTools.h"
//#include "RimWellPltPlot.h"
#include "RimWellPlotTools.h"
#include "RiaDateStringParser.h"
#include "RiaFieldHandleTools.h"
#include "RiaQDateTimeTools.h"
#include "RigWellLogFile.h"
#include "RimFileWellPath.h"
#include "RimTools.h"
#include "RimWellLogFileChannel.h"
#include "RimWellPathCollection.h"
#include "RimWellPlotTools.h"
#include "Riu3DMainWindowTools.h"
#include "cafPdmUiDateEditor.h"
#include <QStringList>
#include <QFileInfo>
#include <QMessageBox>
#include "RiaQDateTimeTools.h"
#include <QStringList>
CAF_PDM_SOURCE_INIT(RimWellLogFile, "WellLogFile");
@ -65,8 +66,7 @@ RimWellLogFile::RimWellLogFile()
CAF_PDM_InitFieldNoDefault(&m_wellName, "WellName", "", "", "", "");
m_wellName.uiCapability()->setUiReadOnly(true);
m_wellName.uiCapability()->setUiHidden(true);
m_wellName.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_wellName);
CAF_PDM_InitFieldNoDefault(&m_date, "Date", "Date", "", "", "");
m_date.uiCapability()->setUiReadOnly(true);
@ -76,12 +76,10 @@ RimWellLogFile::RimWellLogFile()
CAF_PDM_InitFieldNoDefault(&m_name, "Name", "", "", "", "");
m_name.uiCapability()->setUiReadOnly(true);
m_name.uiCapability()->setUiHidden(true);
m_name.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_name);
CAF_PDM_InitFieldNoDefault(&m_wellLogChannelNames, "WellLogFileChannels", "", "", "", "");
m_wellLogChannelNames.uiCapability()->setUiHidden(true);
m_wellLogChannelNames.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_wellLogChannelNames);
CAF_PDM_InitField(&m_wellFlowCondition, "WellFlowCondition", caf::AppEnum<RimWellLogFile::WellFlowCondition>(RimWellLogFile::WELL_FLOW_COND_STANDARD), "Well Flow Rates", "", "", "");

5
ApplicationCode/ProjectDataModel/RimWellLogFileChannel.cpp
View File

@ -19,6 +19,8 @@
#include "RimWellLogFileChannel.h"
#include "RiaFieldHandleTools.h"
#include <QString>
@ -32,8 +34,7 @@ RimWellLogFileChannel::RimWellLogFileChannel()
CAF_PDM_InitObject("Well Log File Channel", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_name, "Name", "", "", "", "");
m_name.uiCapability()->setUiHidden(true);
m_name.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_name);
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -22,6 +22,7 @@
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaFieldHandleTools.h"
#include "RiaSimWellBranchTools.h"
#include "RiaWellNameComparer.h"
@ -113,8 +114,7 @@ RimWellPath::RimWellPath()
m_wellPathFormationFilePath.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitFieldNoDefault(&m_wellLogFile_OBSOLETE, "WellLogFile", "Well Log File", "", "", "");
m_wellLogFile_OBSOLETE.uiCapability()->setUiHidden(true);
m_wellLogFile_OBSOLETE.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_wellLogFile_OBSOLETE);
CAF_PDM_InitFieldNoDefault(&m_wellPathAttributes, "WellPathAttributes", "Casing Design Rubbish", "", "", "");
m_wellPathAttributes = new RimWellPathAttributeCollection;

29
ApplicationCode/ProjectDataModel/RimWellPathGeometryDef.cpp
View File

@ -17,25 +17,29 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimWellPathGeometryDef.h"
#include "cafCmdFeatureMenuBuilder.h"
#include "cafPdmUiTableViewEditor.h"
#include "cafPdmUiTreeOrdering.h"
#include "WellPathCommands/RicCreateWellTargetsPickEventHandler.h"
#include "RiaFieldHandleTools.h"
#include "RiaJCurveCalculator.h"
#include "RiaLogging.h"
#include "RiaOffshoreSphericalCoords.h"
#include "RiaPolyArcLineSampler.h"
#include "RiaSCurveCalculator.h"
#include "RigWellPath.h"
#include "RiaPolyArcLineSampler.h"
#include "RiaOffshoreSphericalCoords.h"
#include "RimWellPathTarget.h"
#include "RimModeledWellPath.h"
#include "RiaSCurveCalculator.h"
#include "RiaLogging.h"
#include "RiaJCurveCalculator.h"
#include "cafPdmUiPushButtonEditor.h"
#include "RimWellPathTarget.h"
#include "WellPathCommands/RicCreateWellTargetsPickEventHandler.h"
#include "RiuViewerCommands.h"
#include "cafCmdFeatureMenuBuilder.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTableViewEditor.h"
#include "cafPdmUiTreeOrdering.h"
#include "cvfGeometryTools.h"
namespace caf
{
template<>
@ -76,8 +80,7 @@ RimWellPathGeometryDef::RimWellPathGeometryDef()
// Temp conversion field.
CAF_PDM_InitField(&m_referencePointXyz_OBSOLETE, "ReferencePos", cvf::Vec3d(0,0,0), "UTM Reference Point", "", "", "");
m_referencePointXyz_OBSOLETE.uiCapability()->setUiHidden(true);
m_referencePointXyz_OBSOLETE.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_referencePointXyz_OBSOLETE);
/// To be removed ?

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

@ -18,6 +18,8 @@
#include "RimSummaryCaseCollection.h"
#include "RiaFieldHandleTools.h"
#include "RimDerivedEnsembleCaseCollection.h"
#include "RimEnsembleCurveSet.h"
#include "RimGridSummaryCase.h"
@ -48,8 +50,7 @@ RimSummaryCaseCollection::RimSummaryCaseCollection()
CAF_PDM_InitFieldNoDefault(&m_nameAndItemCount, "NameCount", "Name", "", "", "");
m_nameAndItemCount.registerGetMethod(this, &RimSummaryCaseCollection::nameAndItemCount);
m_nameAndItemCount.uiCapability()->setUiHidden(true);
m_nameAndItemCount.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_nameAndItemCount);
CAF_PDM_InitField(&m_isEnsemble, "IsEnsemble", false, "Is Ensemble", "", "", "");
m_isEnsemble.uiCapability()->setUiHidden(true);

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

@ -19,6 +19,7 @@
#include "RimSummaryPlot.h"
#include "RiaApplication.h"
#include "RiaFieldHandleTools.h"
#include "RiaSummaryCurveAnalyzer.h"
#include "RiaTimeHistoryCurveResampler.h"
@ -177,8 +178,7 @@ RimSummaryPlot::RimSummaryPlot()
m_timeAxisProperties = new RimSummaryTimeAxisProperties;
CAF_PDM_InitField(&m_isAutoZoom_OBSOLETE, "AutoZoom", true, "Auto Zoom", "", "", "");
m_isAutoZoom_OBSOLETE.uiCapability()->setUiHidden(true);
m_isAutoZoom_OBSOLETE.xmlCapability()->setIOWritable(false);
RiaFieldhandleTools::disableWriteAndSetFieldHidden(&m_isAutoZoom_OBSOLETE);
m_isCrossPlot = false;