OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 22:13:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1767 Minor UI adjustments and whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2017-08-29 07:30:07 +02:00
parent 380b939897
commit 086eae50b1
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -32,14 +32,14 @@
#include "RigFlowDiagSolverInterface.h"
#include "RigMainGrid.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimFlowDiagSolution.h"
#include "RimMockModelSettings.h"
#include "RimProject.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimTimeStepFilter.h"
#include "RimTools.h"
#include "RimEclipseView.h"
#include "RimEclipseCellColors.h"
#include "cafPdmSettings.h"
#include "cafPdmUiFilePathEditor.h"
@ -149,7 +149,7 @@ bool RimEclipseResultCase::importGridAndResultMetaData(bool showTimeStepFilter)
m_timeStepFilter->setTimeStepsFromFile(timeSteps);
caf::PdmUiPropertyViewDialog propertyDialog(NULL, m_timeStepFilter, "Time Step Filter", "", QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
propertyDialog.resize(QSize(400, 600));
propertyDialog.resize(QSize(400, 400));
if (propertyDialog.exec() != QDialog::Accepted)
{

26
ApplicationCode/ProjectDataModel/RimTimeStepFilter.cpp
View File

@ -24,22 +24,22 @@
#include "RimReservoirCellResultsStorage.h"
#include "RimTools.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTextEditor.h"
#include <QDateTime>
#include "cafPdmUiPushButtonEditor.h"
namespace caf {
template<>
void caf::AppEnum< RimTimeStepFilter::TimeStepFilterTypeEnum >::setUp()
{
addItem(RimTimeStepFilter::TS_ALL, "TS_ALL", "All");
addItem(RimTimeStepFilter::TS_INTERVAL_DAYS, "TS_INTERVAL_DAYS", "Skip by Days");
addItem(RimTimeStepFilter::TS_INTERVAL_WEEKS, "TS_INTERVAL_WEEKS", "Skip by Weeks");
addItem(RimTimeStepFilter::TS_INTERVAL_MONTHS, "TS_INTERVAL_MONTHS", "Skip by Months");
addItem(RimTimeStepFilter::TS_INTERVAL_QUARTERS, "TS_INTERVAL_QUARTERS", "Skip by Quarters");
addItem(RimTimeStepFilter::TS_INTERVAL_YEARS, "TS_INTERVAL_YEARS", "Skip by Years");
addItem(RimTimeStepFilter::TS_ALL, "TS_ALL", "All");
addItem(RimTimeStepFilter::TS_INTERVAL_DAYS, "TS_INTERVAL_DAYS", "Skip by Days");
addItem(RimTimeStepFilter::TS_INTERVAL_WEEKS, "TS_INTERVAL_WEEKS", "Skip by Weeks");
addItem(RimTimeStepFilter::TS_INTERVAL_MONTHS, "TS_INTERVAL_MONTHS", "Skip by Months");
addItem(RimTimeStepFilter::TS_INTERVAL_QUARTERS, "TS_INTERVAL_QUARTERS", "Skip by Quarters");
addItem(RimTimeStepFilter::TS_INTERVAL_YEARS, "TS_INTERVAL_YEARS", "Skip by Years");
setDefault(RimTimeStepFilter::TS_ALL);
}
@ -62,7 +62,7 @@ RimTimeStepFilter::RimTimeStepFilter()
CAF_PDM_InitField(&m_lastTimeStep, "LastTimeStep", 0, "Last Time Step", "", "", "");
caf::AppEnum< RimTimeStepFilter::TimeStepFilterTypeEnum > filterType = TS_ALL;
CAF_PDM_InitField(&m_filterType, "FilterType", filterType, "Filter type", "", "", "");
CAF_PDM_InitField(&m_filterType, "FilterType", filterType, "Filter Type", "", "", "");
CAF_PDM_InitField(&m_interval, "Interval", 1, "Interval", "", "", "");
@ -338,7 +338,15 @@ void RimTimeStepFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderin
caf::PdmUiGroup* group = uiOrdering.addNewGroupWithKeyword(displayUiName, "FilteredTimeStepKeyword");
group->add(&m_filteredTimeStepsText);
group->setCollapsedByDefault(true);
if (m_timeStepsFromFile.size() == 0)
{
group->setCollapsedByDefault(true);
}
else
{
group->setCollapsedByDefault(false);
}
updateDerivedData();
updateFieldVisibility();