Merge pull request #209 from ess-dmsc/issue_205

"done; updates #205"
ess-dmsc · May 4, 2019 · c286b7e · c286b7e
2 parents ebab463 + 0581f17
commit c286b7e
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/source/gui/daq/Consumer1D.cpp b/source/gui/daq/Consumer1D.cpp
@@ -20,7 +20,11 @@ Consumer1D::Consumer1D(QWidget *parent)
 
   plot_->setSizePolicy(QSizePolicy::MinimumExpanding,
                        QSizePolicy::MinimumExpanding);
-  plot_->setLineThickness(2);
+
+  QSettings settings;
+  settings.beginGroup("DAQ_behavior");
+  plot_->setLineThickness(settings.value("default_1d_thickness", 1).toInt());
+
   connect(plot_, SIGNAL(mouseWheel(QWheelEvent*)), this, SLOT(mouseWheel(QWheelEvent*)));
   connect(plot_, SIGNAL(zoomedOut()), this, SLOT(zoomedOut()));
 

diff --git a/source/gui/daq/ConsumerMulti1D.cpp b/source/gui/daq/ConsumerMulti1D.cpp
@@ -21,7 +21,11 @@ ConsumerMulti1D::ConsumerMulti1D(QWidget* parent)
 
   plot_->setSizePolicy(QSizePolicy::MinimumExpanding,
                        QSizePolicy::MinimumExpanding);
-  plot_->setLineThickness(2);
+
+  QSettings settings;
+  settings.beginGroup("DAQ_behavior");
+  plot_->setLineThickness(settings.value("default_1d_thickness", 1).toInt());
+
   connect(plot_, SIGNAL(mouseWheel(QWheelEvent * )), this, SLOT(mouseWheel(QWheelEvent * )));
   connect(plot_, SIGNAL(zoomedOut()), this, SLOT(zoomedOut()));
 

diff --git a/source/gui/daq/ConsumerTemplatesForm.cpp b/source/gui/daq/ConsumerTemplatesForm.cpp
@@ -164,6 +164,7 @@ void ConsumerTemplatesForm::loadSettings()
   ui->checkAskSaveProject->setChecked(settings.value("ask_save_project", true).toBool());
   auto idx = ui->comboRestart->findData(settings.value("on_restart", "ask"));
   ui->comboRestart->setCurrentIndex(idx);
+  ui->spinDefaultLineThickness->setValue(settings.value("default_1d_thickness", 1).toInt());
   settings.endGroup();
 }
 
@@ -174,6 +175,7 @@ void ConsumerTemplatesForm::saveSettings()
   settings.setValue("autosave_daq", ui->checkAutosaveDAQ->isChecked());
   settings.setValue("ask_save_project", ui->checkAskSaveProject->isChecked());
   settings.setValue("on_restart", ui->comboRestart->currentData());
+  settings.setValue("default_1d_thickness", ui->spinDefaultLineThickness->value());
   settings.endGroup();
 }
 

diff --git a/source/gui/daq/ConsumerTemplatesForm.ui b/source/gui/daq/ConsumerTemplatesForm.ui
@@ -274,11 +274,34 @@
      </item>
      <item>
       <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Default 1d line thickness:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="spinDefaultLineThickness">
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>3</number>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QPushButton" name="pushClear">
        <property name="sizePolicy">