Skip to content

Commit

Permalink
Make slot names consistent.
Browse files Browse the repository at this point in the history 
Refs #7555
  • Loading branch information
@arturbekasov
arturbekasov committed Aug 30, 2013
1 parent aac6e76 commit f4e2dc3
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 34 deletions.
18 changes: 9 additions & 9 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/MuonAnalysisOptionTab.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ class MuonAnalysisOptionTab : public QWidget

public slots:
/// Set the run time in muon analysis and save into settings.
void runTimeComboBox(int index);
void timeComboBoxChanged(int index);

/// Enable/Disable editing of Y axis and save the setting.
void runyAxisAutoscale(bool state);
void yAxisAutoscaleChanged(bool state);

/// Set whether the user can see and edit the rebin steps. Also saves setting.
void runRebinComboBox(int index);
void rebinComboBoxChanged(int index);


signals:
Expand Down Expand Up @@ -118,22 +118,22 @@ public slots:

private slots:
/// Save the settings for time axis start and validate the entry.
void runTimeAxisStartAtInput();
void timeAxisStartAtInputChanged();

/// Save the settings for time axis end and validate the entry.
void runTimeAxisFinishAtInput();
void timeAxisFinishAtInputChanged();

/// Save the settings for Y axis min and validate the entry.
void runyAxisMinimumInput();
void yAxisMinimumInputChanged();

/// Save the settings for Y axis max and validate the entry.
void runyAxisMaximumInput();
void yAxisMaximumInputChanged();

/// Save the settings for rebin steps and validate the entry.
void runOptionStepSizeText();
void optionStepSizeTextChanged();

/// Save the settings for rebin variables and validate the entry.
void runBinBoundaries();
void binBoundariesChanged();

/// Open the Muon Analysis Settings help (Wiki).
void muonAnalysisHelpSettingsClicked();
Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysis.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3107,11 +3107,11 @@ void MuonAnalysis::loadAutoSavedValues(const QString& group)

int timeComboBoxIndex = prevPlotStyle.value("timeComboBoxIndex", 0).toInt();
m_uiForm.timeComboBox->setCurrentIndex(timeComboBoxIndex);
m_optionTab->runTimeComboBox(timeComboBoxIndex);
m_optionTab->timeComboBoxChanged(timeComboBoxIndex);

bool axisAutoScaleOnOff = prevPlotStyle.value("axisAutoScaleOnOff", 1).toBool();
m_uiForm.yAxisAutoscale->setChecked(axisAutoScaleOnOff);
m_optionTab->runyAxisAutoscale(axisAutoScaleOnOff);
m_optionTab->yAxisAutoscaleChanged(axisAutoScaleOnOff);

QStringList kusse = prevPlotStyle.childKeys();
if ( kusse.contains("yAxisStart") )
Expand Down Expand Up @@ -3148,7 +3148,7 @@ void MuonAnalysis::loadAutoSavedValues(const QString& group)

int rebinComboBoxIndex = prevPlotBinning.value("rebinComboBoxIndex", 0).toInt();
m_uiForm.rebinComboBox->setCurrentIndex(rebinComboBoxIndex);
m_optionTab->runRebinComboBox(rebinComboBoxIndex);
m_optionTab->rebinComboBoxChanged(rebinComboBoxIndex);

// Load Setting tab options
QSettings prevSettingTabOptions;
Expand Down
44 changes: 22 additions & 22 deletions Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysisOptionTab.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,28 @@ void MuonAnalysisOptionTab::initLayout()
connect(m_uiForm.connectPlotType, SIGNAL(currentIndexChanged(int)), this, SIGNAL(settingsTabUpdatePlot()));

// Time axis drop-down
connect(m_uiForm.timeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(runTimeComboBox(int)));
connect(m_uiForm.timeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(timeComboBoxChanged(int)));
connect(m_uiForm.timeComboBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(settingsTabUpdatePlot()));

// Start & finish time input boxes
connect(m_uiForm.timeAxisStartAtInput, SIGNAL(lostFocus()), this, SLOT(runTimeAxisStartAtInput()));
connect(m_uiForm.timeAxisStartAtInput, SIGNAL(lostFocus()), this, SLOT(timeAxisStartAtInputChanged()));
connect(m_uiForm.timeAxisStartAtInput, SIGNAL(returnPressed ()), this, SIGNAL(settingsTabUpdatePlot()));
connect(m_uiForm.timeAxisStartAtInput, SIGNAL(editingFinished()), this, SLOT(storeCustomTimeValue()));

connect(m_uiForm.timeAxisFinishAtInput, SIGNAL(lostFocus()), this, SLOT(runTimeAxisFinishAtInput()));
connect(m_uiForm.timeAxisFinishAtInput, SIGNAL(lostFocus()), this, SLOT(timeAxisFinishAtInputChanged()));
connect(m_uiForm.timeAxisFinishAtInput, SIGNAL(returnPressed ()), this, SIGNAL(settingsTabUpdatePlot()));

// Y-axis min & max input boxes
connect(m_uiForm.yAxisMinimumInput, SIGNAL(lostFocus()), this, SLOT(runyAxisMinimumInput()));
connect(m_uiForm.yAxisMinimumInput, SIGNAL(editingFinished ()), this, SLOT(runyAxisMinimumInput()));
connect(m_uiForm.yAxisMinimumInput, SIGNAL(lostFocus()), this, SLOT(yAxisMinimumInputChanged()));
connect(m_uiForm.yAxisMinimumInput, SIGNAL(editingFinished ()), this, SLOT(yAxisMinimumInputChanged()));
connect(m_uiForm.yAxisMinimumInput, SIGNAL(returnPressed ()), this, SLOT(validateYMin()));

connect(m_uiForm.yAxisMaximumInput, SIGNAL(lostFocus()), this, SLOT(runyAxisMaximumInput()));
connect(m_uiForm.yAxisMaximumInput, SIGNAL(editingFinished ()), this, SLOT(runyAxisMaximumInput()));
connect(m_uiForm.yAxisMaximumInput, SIGNAL(lostFocus()), this, SLOT(yAxisMaximumInputChanged()));
connect(m_uiForm.yAxisMaximumInput, SIGNAL(editingFinished ()), this, SLOT(yAxisMaximumInputChanged()));
connect(m_uiForm.yAxisMaximumInput, SIGNAL(returnPressed ()), this, SLOT(validateYMax()));

// Autoscale checkbo0x
connect(m_uiForm.yAxisAutoscale, SIGNAL(toggled(bool)), this, SLOT(runyAxisAutoscale(bool)));
connect(m_uiForm.yAxisAutoscale, SIGNAL(toggled(bool)), this, SLOT(yAxisAutoscaleChanged(bool)));
connect(m_uiForm.yAxisAutoscale, SIGNAL(clicked()), this, SIGNAL(settingsTabUpdatePlot()));

// Show error bars checkbox
Expand All @@ -80,15 +80,15 @@ void MuonAnalysisOptionTab::initLayout()
// == Data Binnning ==============================================================================

// Rebin data drop-down
connect(m_uiForm.rebinComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(runRebinComboBox(int)));
connect(m_uiForm.rebinComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(rebinComboBoxChanged(int)));
connect(m_uiForm.rebinComboBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(settingsTabUpdatePlot()));

// Input for step [fixed rebinning]
connect(m_uiForm.optionStepSizeText, SIGNAL(lostFocus()), this, SLOT(runOptionStepSizeText()));
connect(m_uiForm.optionStepSizeText, SIGNAL(lostFocus()), this, SLOT(optionStepSizeTextChanged()));
connect(m_uiForm.optionStepSizeText, SIGNAL(returnPressed ()), this, SIGNAL(settingsTabUpdatePlot()));

// Input for bin boundaries [variable rebinning]
connect(m_uiForm.binBoundaries, SIGNAL(lostFocus()), this, SLOT(runBinBoundaries()));
connect(m_uiForm.binBoundaries, SIGNAL(lostFocus()), this, SLOT(binBoundariesChanged()));
connect(m_uiForm.binBoundaries, SIGNAL(returnPressed ()), this, SIGNAL(settingsTabUpdatePlot()));

// Help button [variable rebinning]
Expand Down Expand Up @@ -140,7 +140,7 @@ void MuonAnalysisOptionTab::rebinHelpClicked()
/**
* When clicking Rebin combobox (slot)
*/
void MuonAnalysisOptionTab::runRebinComboBox(int index)
void MuonAnalysisOptionTab::rebinComboBoxChanged(int index)
{
// Set which rebin entry to display.
m_uiForm.rebinEntryState->setCurrentIndex(index);
Expand All @@ -154,7 +154,7 @@ void MuonAnalysisOptionTab::runRebinComboBox(int index)
/**
* When clicking Rebin step size text box (slot)
*/
void MuonAnalysisOptionTab::runOptionStepSizeText()
void MuonAnalysisOptionTab::optionStepSizeTextChanged()
{
try
{
Expand All @@ -175,7 +175,7 @@ void MuonAnalysisOptionTab::runOptionStepSizeText()
/**
*
*/
void MuonAnalysisOptionTab::runBinBoundaries()
void MuonAnalysisOptionTab::binBoundariesChanged()
{
QSettings group;
group.beginGroup(m_settingsGroup + "BinningOptions");
Expand All @@ -188,7 +188,7 @@ void MuonAnalysisOptionTab::runBinBoundaries()
/**
* When clicking autoscale (slot)
*/
void MuonAnalysisOptionTab::runyAxisAutoscale(bool state)
void MuonAnalysisOptionTab::yAxisAutoscaleChanged(bool state)
{
m_uiForm.yAxisMinimumInput->setEnabled(!state);
m_uiForm.yAxisMaximumInput->setEnabled(!state);
Expand All @@ -215,7 +215,7 @@ void MuonAnalysisOptionTab::runyAxisAutoscale(bool state)
/**
* Plot option time combo box (slot)
*/
void MuonAnalysisOptionTab::runTimeComboBox(int index)
void MuonAnalysisOptionTab::timeComboBoxChanged(int index)
{
switch(index)
{
Expand Down Expand Up @@ -244,7 +244,7 @@ void MuonAnalysisOptionTab::runTimeComboBox(int index)
/**
* Check input is valid in input box (slot)
*/
void MuonAnalysisOptionTab::runTimeAxisStartAtInput()
void MuonAnalysisOptionTab::timeAxisStartAtInputChanged()
{
try
{
Expand All @@ -265,7 +265,7 @@ void MuonAnalysisOptionTab::runTimeAxisStartAtInput()
/**
* Check input is valid in input box (slot)
*/
void MuonAnalysisOptionTab::runTimeAxisFinishAtInput()
void MuonAnalysisOptionTab::timeAxisFinishAtInputChanged()
{
if (m_uiForm.timeAxisFinishAtInput->text().isEmpty())
return;
Expand All @@ -289,7 +289,7 @@ void MuonAnalysisOptionTab::runTimeAxisFinishAtInput()
/**
* Check input is valid in input box (slot)
*/
void MuonAnalysisOptionTab::runyAxisMinimumInput()
void MuonAnalysisOptionTab::yAxisMinimumInputChanged()
{
if (m_uiForm.yAxisMinimumInput->text().isEmpty())
return;
Expand All @@ -313,7 +313,7 @@ void MuonAnalysisOptionTab::runyAxisMinimumInput()
/**
* Check input is valid in input box (slot)
*/
void MuonAnalysisOptionTab::runyAxisMaximumInput()
void MuonAnalysisOptionTab::yAxisMaximumInputChanged()
{
if (m_uiForm.yAxisMaximumInput->text().isEmpty())
return;
Expand Down Expand Up @@ -410,7 +410,7 @@ void MuonAnalysisOptionTab::hideGraphsChanged(bool state)
void MuonAnalysisOptionTab::validateYMin()
{
QString tempValue = m_uiForm.yAxisMinimumInput->text();
runyAxisMinimumInput();
yAxisMinimumInputChanged();
if(tempValue == m_uiForm.yAxisMinimumInput->text())
{
emit settingsTabUpdatePlot();
Expand All @@ -424,7 +424,7 @@ void MuonAnalysisOptionTab::validateYMin()
void MuonAnalysisOptionTab::validateYMax()
{
QString tempValue = m_uiForm.yAxisMaximumInput->text();
runyAxisMaximumInput();
yAxisMaximumInputChanged();
if(tempValue == m_uiForm.yAxisMaximumInput->text())
{
emit settingsTabUpdatePlot();
Expand Down

0 comments on commit f4e2dc3

Please sign in to comment.