Skip to content

Commit

Permalink
Moved Position and Width units to labels
Browse files Browse the repository at this point in the history
As per comment:2
Refs #8198
  • Loading branch information
DanNixon committed Jul 21, 2014
1 parent f28d09e commit 5869408
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions Code/Mantid/MantidPlot/src/ScaleDetails.cpp
Expand Up @@ -110,7 +110,7 @@ ScaleDetails::ScaleDetails(ApplicationWindow* app, Graph* graph, int mappedaxis,

QGridLayout * breaksLayout = new QGridLayout(m_grpAxesBreaks);
m_chkBreakDecoration = new QCheckBox(tr("Draw Break &Decoration"));
breaksLayout->addWidget(m_chkBreakDecoration, 0, 1);
breaksLayout->addWidget(m_chkBreakDecoration, 0, 1, 1, 2);

breaksLayout->addWidget(new QLabel(tr("From")), 1, 0);
m_dspnBreakStart = new DoubleSpinBox();
Expand All @@ -126,18 +126,20 @@ ScaleDetails::ScaleDetails(ApplicationWindow* app, Graph* graph, int mappedaxis,

breaksLayout->addWidget(new QLabel(tr("Position")), 3, 0);
m_spnBreakPosition = new QSpinBox();
m_spnBreakPosition->setSuffix(" (" + tr("% of Axis Length") + ")");
/* m_spnBreakPosition->setSuffix(" (" + tr("% of Axis Length") + ")"); */
breaksLayout->addWidget(m_spnBreakPosition, 3, 1);
breaksLayout->addWidget(new QLabel(tr("(% of Axis Length)")), 3, 2);

breaksLayout->addWidget(new QLabel(tr("Width")), 4, 0);
m_spnBreakWidth = new QSpinBox();
m_spnBreakWidth->setSuffix(" (" + tr("pixels") + ")");
/* m_spnBreakWidth->setSuffix(" (" + tr("pixels") + ")"); */
breaksLayout->addWidget(m_spnBreakWidth, 4, 1);
breaksLayout->addWidget(new QLabel(tr("(pixels)")), 4, 2);

m_chkLog10AfterBreak = new QCheckBox(tr("&Log10 Scale After Break"));
breaksLayout->addWidget(m_chkLog10AfterBreak, 0, 3);

breaksLayout->addWidget(new QLabel(tr("Step Before Break")), 1, 2);
breaksLayout->addWidget(new QLabel(tr("Step Before Break")), 1, 3);
m_dspnStepBeforeBreak = new DoubleSpinBox();
m_dspnStepBeforeBreak->addSpecialTextMapping("Guess", 0.0);
m_dspnStepBeforeBreak->addSpecialTextMapping("guess", 0.0);
Expand All @@ -146,9 +148,9 @@ ScaleDetails::ScaleDetails(ApplicationWindow* app, Graph* graph, int mappedaxis,
m_dspnStepBeforeBreak->setSpecialValueText(tr("Guess"));
m_dspnStepBeforeBreak->setLocale(m_app->locale());
m_dspnStepBeforeBreak->setDecimals(m_app->d_decimal_digits);
breaksLayout->addWidget(m_dspnStepBeforeBreak, 1, 3);
breaksLayout->addWidget(m_dspnStepBeforeBreak, 1, 4);

breaksLayout->addWidget(new QLabel(tr("Step After Break")), 2, 2);
breaksLayout->addWidget(new QLabel(tr("Step After Break")), 2, 3);
m_dspnStepAfterBreak = new DoubleSpinBox();
m_dspnStepAfterBreak->addSpecialTextMapping("Guess", 0.0);
m_dspnStepAfterBreak->addSpecialTextMapping("guess", 0.0);
Expand All @@ -157,21 +159,21 @@ ScaleDetails::ScaleDetails(ApplicationWindow* app, Graph* graph, int mappedaxis,
m_dspnStepAfterBreak->setSpecialValueText(tr("Guess"));
m_dspnStepAfterBreak->setLocale(m_app->locale());
m_dspnStepAfterBreak->setDecimals(m_app->d_decimal_digits);
breaksLayout->addWidget(m_dspnStepAfterBreak, 2, 3);
breaksLayout->addWidget(m_dspnStepAfterBreak, 2, 4);

breaksLayout->addWidget(new QLabel(tr("Minor Ticks Before")), 3, 2);
breaksLayout->addWidget(new QLabel(tr("Minor Ticks Before")), 3, 3);
m_cmbMinorTicksBeforeBreak = new QComboBox();
m_cmbMinorTicksBeforeBreak->setEditable(true);
m_cmbMinorTicksBeforeBreak->addItems(
QStringList() << "0" << "1" << "4" << "9" << "14" << "19");
breaksLayout->addWidget(m_cmbMinorTicksBeforeBreak, 3, 3);
breaksLayout->addWidget(m_cmbMinorTicksBeforeBreak, 3, 4);

breaksLayout->addWidget(new QLabel(tr("Minor Ticks After")), 4, 2);
breaksLayout->addWidget(new QLabel(tr("Minor Ticks After")), 4, 3);
m_cmbMinorTicksAfterBreak = new QComboBox();
m_cmbMinorTicksAfterBreak->setEditable(true);
m_cmbMinorTicksAfterBreak->addItems(
QStringList() << "0" << "1" << "4" << "9" << "14" << "19");
breaksLayout->addWidget(m_cmbMinorTicksAfterBreak, 4, 3);
breaksLayout->addWidget(m_cmbMinorTicksAfterBreak, 4, 4);

QGroupBox *rightBox = new QGroupBox(QString());
QGridLayout *rightLayout = new QGridLayout(rightBox);
Expand Down

0 comments on commit 5869408

Please sign in to comment.