Skip to content

Commit

Permalink
Refs #5665 - Remove Y-Axis values when autoscale is selected.
Browse files Browse the repository at this point in the history
Remove (and store) the contents of the Y-Axis fields when the autoscale
checkbox is checked, replacing them with "N\A".  Also, disable the minimum
field when "Start at First Good Data" is chosen.

These two changes now ensure a bigger visual difference between the concept
of "disable and do not use", and "disable but still use", and clears the way
for adding a "Custom Value" option to the dropdown box.
  • Loading branch information
PeterParker committed Aug 15, 2012
1 parent 5ea11c3 commit 83b59ec
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class MuonAnalysisOptionTab : public QWidget
Q_OBJECT
public:
/// Constructor
MuonAnalysisOptionTab(Ui::MuonAnalysis& uiForm, const QString& group) : m_uiForm(uiForm), m_settingsGroup(group) {}
MuonAnalysisOptionTab(Ui::MuonAnalysis& uiForm, const QString& group) : m_uiForm(uiForm), m_settingsGroup(group), m_yAxisMinimum(), m_yAxisMaximum() {}

/// Initialise the layout of Muon Analysis.
void initLayout();
Expand All @@ -72,6 +72,12 @@ class MuonAnalysisOptionTab : public QWidget
/// When data loaded set various buttons etc to active
void nowDataAvailable();

/// Set the *stored" yAxisMinimum value.
void setStoredYAxisMinimum(QString yAxisMinimum);

/// Set the *stored" yAxisMaximum value.
void setStoredYAxisMaximum(QString yAxisMaximum);


public slots:
/// Set the run time in muon analysis and save into settings.
Expand Down Expand Up @@ -99,6 +105,11 @@ public slots:
/// group defaults are saved to
const QString& m_settingsGroup;

/// Store value when autoscale has been selected, for when it is deselected again.
QString m_yAxisMinimum;

/// Store value when autoscale has been selected, for when it is deselected again.
QString m_yAxisMaximum;

private slots:
/// Save the settings for time axis start and validate the entry.
Expand Down
22 changes: 18 additions & 4 deletions Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysis.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2982,13 +2982,27 @@ void MuonAnalysis::loadAutoSavedValues(const QString& group)
QStringList kusse = prevPlotStyle.childKeys();
if ( kusse.contains("yAxisStart") )
{
double yAxisStart = prevPlotStyle.value("yAxisStart").toDouble();
m_uiForm.yAxisMinimumInput->setText(QString::number(yAxisStart));
if( ! m_uiForm.yAxisAutoscale->isChecked() )
{
double yAxisStart = prevPlotStyle.value("yAxisStart").toDouble();
m_uiForm.yAxisMinimumInput->setText(QString::number(yAxisStart));
}
else
{
m_optionTab->setStoredYAxisMinimum(prevPlotStyle.value("yAxisStart").toString());
}
}
if ( kusse.contains("yAxisFinish") )
{
double yAxisFinish = prevPlotStyle.value("yAxisFinish").toDouble();
m_uiForm.yAxisMaximumInput->setText(QString::number(yAxisFinish));
if( ! m_uiForm.yAxisAutoscale->isChecked() )
{
double yAxisFinish = prevPlotStyle.value("yAxisFinish").toDouble();
m_uiForm.yAxisMaximumInput->setText(QString::number(yAxisFinish));
}
else
{
m_optionTab->setStoredYAxisMaximum(prevPlotStyle.value("yAxisFinish").toString());
}
}

// Load Plot Binning Options
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,20 @@ void MuonAnalysisOptionTab::runyAxisAutoscale(bool state)
m_uiForm.yAxisMinimumInput->setEnabled(!state);
m_uiForm.yAxisMaximumInput->setEnabled(!state);

if(state)
{
m_yAxisMinimum = m_uiForm.yAxisMinimumInput->text();
m_yAxisMaximum = m_uiForm.yAxisMaximumInput->text();

m_uiForm.yAxisMinimumInput->setText("N/A");
m_uiForm.yAxisMaximumInput->setText("N/A");
}
else
{
m_uiForm.yAxisMinimumInput->setText(m_yAxisMinimum);
m_uiForm.yAxisMaximumInput->setText(m_yAxisMaximum);
}

QSettings group;
group.beginGroup(m_settingsGroup + "plotStyleOptions");
group.setValue("axisAutoScaleOnOff", state);
Expand All @@ -194,7 +208,7 @@ void MuonAnalysisOptionTab::runTimeComboBox(int index)

if ( index == 0 ) // Start at First Good Data
{
m_uiForm.timeAxisStartAtInput->setEnabled(true);
m_uiForm.timeAxisStartAtInput->setEnabled(false);
m_uiForm.timeAxisStartAtInput->setText(m_uiForm.firstGoodBinFront->text());
}

Expand Down Expand Up @@ -426,6 +440,18 @@ void MuonAnalysisOptionTab::openDirectoryDialog()
ad->setFocus();
}

/// Set the *stored" yAxisMinimum value.
void MuonAnalysisOptionTab::setStoredYAxisMinimum(QString yAxisMinimum)
{
m_yAxisMinimum = yAxisMinimum;
}

/// Set the *stored" yAxisMaximum value.
void MuonAnalysisOptionTab::setStoredYAxisMaximum(QString yAxisMaximum)
{
m_yAxisMaximum = yAxisMaximum;
}

}
}
}

0 comments on commit 83b59ec

Please sign in to comment.