ticket:4070

Fixed Options dialog pages order.
Removed the unused AnimationPage class.

OMEdit/OMEditGUI/Options/OptionsDialog.cpp

@@ -62,7 +62,6 @@ OptionsDialog::OptionsDialog(MainWindow *pMainWindow)
   mpLineStylePage = new LineStylePage(this);
   mpFillStylePage = new FillStylePage(this);
   mpPlottingPage = new PlottingPage(this);
-  mpAnimationPage = new AnimationPage(this);
   mpFigaroPage = new FigaroPage(this);
   mpDebuggerPage = new DebuggerPage(this);
   mpFMIPage = new FMIPage(this);
@@ -589,16 +588,6 @@ void OptionsDialog::readPlottingSettings()
   }
 }
 
-//! Reads the Animation section settings from omedit.ini
-void OptionsDialog::readAnimationSettings()
-{
-  // read the auto scale
-  if (mpSettings->contains("animation/autoScale")) {
-    mpPlottingPage->getAutoScaleCheckBox()->setChecked(mpSettings->value("animation/autoScale").toBool());
-  }
-}
-
-
 //! Reads the Fiagro section settings from omedit.ini
 void OptionsDialog::readFigaroSettings()
 {
@@ -1232,7 +1221,6 @@ void OptionsDialog::createPages()
   mpPagesWidget->addWidget(mpLineStylePage);
   mpPagesWidget->addWidget(mpFillStylePage);
   mpPagesWidget->addWidget(mpPlottingPage);
-  mpPagesWidget->addWidget(mpAnimationPage);
   mpPagesWidget->addWidget(mpFigaroPage);
   mpPagesWidget->addWidget(mpDebuggerPage);
   mpPagesWidget->addWidget(mpFMIPage);
@@ -3698,104 +3686,6 @@ qreal PlottingPage::getCurveThickness()
   return mpCurveThicknessSpinBox->value();
 }
 
-//! @class AnimationPage
-//! @brief Creates an interface for animation settings
-
-//! Constructor
-//! @param pOptionsDialog is the pointer to OptionsDialog
-AnimationPage::AnimationPage(OptionsDialog *pOptionsDialog)
-  : QWidget(pOptionsDialog)
-{
-  mpOptionsDialog = pOptionsDialog;
-  // general groupbox
-  mpGeneralGroupBox = new QGroupBox(Helper::general);
-  // auto scale
-  mpAutoScaleCheckBox = new QCheckBox(tr("Auto Scale"));
-  mpAutoScaleCheckBox->setToolTip(tr("Auto scale the plot to fit in view when variable is plotted."));
-  // set general groupbox layout
-  QGridLayout *pGeneralGroupBoxLayout = new QGridLayout;
-  pGeneralGroupBoxLayout->addWidget(mpAutoScaleCheckBox, 0, 0);
-  mpGeneralGroupBox->setLayout(pGeneralGroupBoxLayout);
-  // Plotting View Mode
-  mpPlottingViewModeGroupBox = new QGroupBox(tr("Plotting View Mode"));
-  mpPlottingTabbedViewRadioButton = new QRadioButton(tr("Tabbed View"));
-  mpPlottingTabbedViewRadioButton->setChecked(true);
-  mpPlottingSubWindowViewRadioButton = new QRadioButton(tr("SubWindow View"));
-  QButtonGroup *pPlottingViewModeButtonGroup = new QButtonGroup;
-  pPlottingViewModeButtonGroup->addButton(mpPlottingTabbedViewRadioButton);
-  pPlottingViewModeButtonGroup->addButton(mpPlottingSubWindowViewRadioButton);
-  // plotting view radio buttons layout
-  QHBoxLayout *pPlottingRadioButtonsLayout = new QHBoxLayout;
-  pPlottingRadioButtonsLayout->addWidget(mpPlottingTabbedViewRadioButton);
-  pPlottingRadioButtonsLayout->addWidget(mpPlottingSubWindowViewRadioButton);
-  // set the layout of plotting view mode group
-  QGridLayout *pPlottingViewModeLayout = new QGridLayout;
-  pPlottingViewModeLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-  pPlottingViewModeLayout->addLayout(pPlottingRadioButtonsLayout, 0, 0);
-  mpPlottingViewModeGroupBox->setLayout(pPlottingViewModeLayout);
-  mpCurveStyleGroupBox = new QGroupBox(Helper::curveStyle);
-  // Curve Pattern
-  mpCurvePatternLabel = new Label(Helper::pattern);
-  mpCurvePatternComboBox = new QComboBox;
-  mpCurvePatternComboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-  mpCurvePatternComboBox->addItem("SolidLine", 1);
-  mpCurvePatternComboBox->addItem("DashLine", 2);
-  mpCurvePatternComboBox->addItem("DotLine", 3);
-  mpCurvePatternComboBox->addItem("DashDotLine", 4);
-  mpCurvePatternComboBox->addItem("DashDotDotLine", 5);
-  mpCurvePatternComboBox->addItem("Sticks", 6);
-  mpCurvePatternComboBox->addItem("Steps", 7);
-  // Curve Thickness
-  mpCurveThicknessLabel = new Label(Helper::thickness);
-  mpCurveThicknessSpinBox = new DoubleSpinBox;
-  mpCurveThicknessSpinBox->setRange(0, std::numeric_limits<double>::max());
-  mpCurveThicknessSpinBox->setValue(1);
-  mpCurveThicknessSpinBox->setSingleStep(1);
-  // set the layout
-  QGridLayout *pCurveStyleLayout = new QGridLayout;
-  pCurveStyleLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-  pCurveStyleLayout->addWidget(mpCurvePatternLabel, 0, 0);
-  pCurveStyleLayout->addWidget(mpCurvePatternComboBox, 0, 1);
-  pCurveStyleLayout->addWidget(mpCurveThicknessLabel, 1, 0);
-  pCurveStyleLayout->addWidget(mpCurveThicknessSpinBox, 1, 1);
-  mpCurveStyleGroupBox->setLayout(pCurveStyleLayout);
-  QVBoxLayout *pMainLayout = new QVBoxLayout;
-  pMainLayout->setAlignment(Qt::AlignTop);
-  pMainLayout->setContentsMargins(0, 0, 0, 0);
-  pMainLayout->addWidget(mpGeneralGroupBox);
-  pMainLayout->addWidget(mpPlottingViewModeGroupBox);
-  pMainLayout->addWidget(mpCurveStyleGroupBox);
-  setLayout(pMainLayout);
-}
-
-/*!
- * \brief AnimationPage::setAnimationViewMode
- * Sets the animation view mode.
- * \param value
- */
-void AnimationPage::setAnimationViewMode(QString value)
-{
-  if (value.compare(Helper::subWindow) == 0) {
-    mpPlottingSubWindowViewRadioButton->setChecked(true);
-  } else {
-    mpPlottingTabbedViewRadioButton->setChecked(true);
-  }
-}
-
-/*!
- * \brief AnimationPage::getAnimationViewMode
- * Gets the plotting view mode.
- * \return
- */
-QString AnimationPage::getAnimationViewMode()
-{
-  if (mpPlottingSubWindowViewRadioButton->isChecked()) {
-    return Helper::subWindow;
-  } else {
-    return Helper::tabbed;
-  }
-}
-
 
 //! @class FigaroPage
 //! @brief Creates an interface for Figaro settings.

OMEdit/OMEditGUI/Options/OptionsDialog.h

@@ -54,7 +54,6 @@ class NotificationsPage;
 class LineStylePage;
 class FillStylePage;
 class PlottingPage;
-class AnimationPage;
 class FigaroPage;
 class DebuggerPage;
 class FMIPage;
@@ -82,7 +81,6 @@ class OptionsDialog : public QDialog
   void readLineStyleSettings();
   void readFillStyleSettings();
   void readPlottingSettings();
-  void readAnimationSettings();
   void readFigaroSettings();
   void readDebuggerSettings();
   void readFMISettings();
@@ -123,7 +121,6 @@ class OptionsDialog : public QDialog
   LineStylePage* getLineStylePage() {return mpLineStylePage;}
   FillStylePage* getFillStylePage() {return mpFillStylePage;}
   PlottingPage* getPlottingPage() {return mpPlottingPage;}
-  AnimationPage* getAnimationPage() {return mpAnimationPage;}
   FigaroPage* getFigaroPage() {return mpFigaroPage;}
   DebuggerPage* getDebuggerPage() {return mpDebuggerPage;}
   FMIPage* getFMIPage() {return mpFMIPage;}
@@ -157,7 +154,6 @@ public slots:
   LineStylePage *mpLineStylePage;
   FillStylePage *mpFillStylePage;
   PlottingPage *mpPlottingPage;
-  AnimationPage *mpAnimationPage;
   FigaroPage *mpFigaroPage;
   DebuggerPage *mpDebuggerPage;
   FMIPage *mpFMIPage;
@@ -707,32 +703,6 @@ class PlottingPage : public QWidget
   DoubleSpinBox *mpCurveThicknessSpinBox;
 };
 
-class AnimationPage : public QWidget
-{
-  Q_OBJECT
-public:
-  AnimationPage(OptionsDialog *pOptionsDialog);
-  void setAnimationViewMode(QString value);
-  QString getAnimationViewMode();
-  QCheckBox* getAutoScaleCheckBox() {return mpAutoScaleCheckBox;}
-  void setCurvePattern(int pattern);
-  int getCurvePattern();
-  void setCurveThickness(qreal thickness);
-  qreal getCurveThickness();
-private:
-  OptionsDialog *mpOptionsDialog;
-  QGroupBox *mpGeneralGroupBox;
-  QCheckBox *mpAutoScaleCheckBox;
-  QGroupBox *mpPlottingViewModeGroupBox;
-  QRadioButton *mpPlottingTabbedViewRadioButton;
-  QRadioButton *mpPlottingSubWindowViewRadioButton;
-  QGroupBox *mpCurveStyleGroupBox;
-  Label *mpCurvePatternLabel;
-  QComboBox *mpCurvePatternComboBox;
-  Label *mpCurveThicknessLabel;
-  DoubleSpinBox *mpCurveThicknessSpinBox;
-};
-
 class FigaroPage : public QWidget
 {
   Q_OBJECT