fix bug in scatter plot not allowing larger than 1 marker size

AdvancedPhotonSource · Jun 6, 2024 · 5903a26 · 5903a26
1 parent d8c9973
commit 5903a26
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/mvc/ScatterPlotView.cpp b/src/mvc/ScatterPlotView.cpp
@@ -69,7 +69,12 @@ ScatterPlotView::ScatterPlotView(bool display_log10, bool black_background, QWid
 
     setBlackBackground(Preferences::inst()->getValue(STR_PFR_SCATTER_DARK_BACKGROUND).toBool());
     _scatter_series->setBorderColor(Qt::transparent);
-    _scatter_series->setMarkerSize(1.0);
+    int val = Preferences::inst()->getValue(STR_PRF_ScatterPlot_Size).toInt();
+    if (val < 1)
+    {
+        val = 1;
+    }
+    _scatter_series->setMarkerSize(val);
     //_scatter_series->setUseOpenGL(true); // causes exception when deconstructor called.
     _chart->addSeries(_scatter_series);
     _display_log10 = display_log10;

diff --git a/src/mvc/ScatterPlotWidget.cpp b/src/mvc/ScatterPlotWidget.cpp
@@ -85,7 +85,12 @@ void ScatterPlotWidget::_createLayout()
     _sp_maker_size->setPrefix("Marker Size:");
     _sp_maker_size->setRange(1, 100);
     _sp_maker_size->setSingleStep(1.0);
-    _sp_maker_size->setValue(1);
+    int val = Preferences::inst()->getValue(STR_PRF_ScatterPlot_Size).toInt();
+    if (val < 1)
+    {
+        val = 1;
+    }
+    _sp_maker_size->setValue(val);
     connect(_sp_maker_size, qOverload<int>(&QSpinBox::valueChanged), this, &ScatterPlotWidget::updateMarkerSize);
 
 
@@ -196,7 +201,7 @@ void ScatterPlotWidget::setBlackBackground(int val)
 
 void ScatterPlotWidget::updateMarkerSize(int val)
 {
-    val = std::min(val, 1);
+    val = std::max(val, 1);
     for (auto& itr : _plot_view_list)
     {
         itr->updateMarkerSize(val);