Disabled roi scatter scan for now.

AdvancedPhotonSource · Mar 17, 2023 · 7ef95d5 · 7ef95d5
1 parent 2bd4061
commit 7ef95d5
Showing 1 changed file with 50 additions and 15 deletions.
diff --git a/src/mvc/ScanCorrCoefDialog.cpp b/src/mvc/ScanCorrCoefDialog.cpp
@@ -63,7 +63,7 @@ void ScanCorrCoefDialog::_createLayout()
     v_proc_layout->addItem(hbox);
     v_proc_layout->addWidget(_ck_use_elements);
     v_proc_layout->addWidget(_ck_use_scalers);
-    v_proc_layout->addWidget(_ck_use_rois);
+    //v_proc_layout->addWidget(_ck_use_rois);
 
     _processing_grp->setLayout(v_proc_layout);
     _processing_grp->setTitle("Scan Correlation Coefficient");
@@ -219,32 +219,67 @@ void ScanCorrCoefDialog::onRun()
             total_names.pop_back();
         }
         int total = el_pair_names.size();
+        /*
+        auto map_rois = _model->get_map_rois();
+        if (_ck_use_rois->isChecked());
+        {
+            total *= map_rois.size();
+        }
+        */
         status_callback(0, total);
 
         ScatterPlotView* view = new ScatterPlotView(_blog10, _bdark, nullptr);
         view->setGridLinesVisible(_bgrid);
         view->setModel(_model);
         view->setAnalysisType(QString(_analysis_type.c_str()));
         int cur = 0;
-        for (int i = 0; i < el_pair_names.size(); i++)
+        /*
+        if (use_rois)
         {
-            double val = proc_corr_coef(_model, _analysis_type, restrict_coef, el_pair_names[i]);
-            if (val > restrict_coef || val < -restrict_coef)
+            for (auto* roi_itr : map_rois)
             {
-                //logI << key << " : " << val << "\n";
-                view->setXYAxis("", QString(el_pair_names[i].first.c_str()), QString(el_pair_names[i].second.c_str()));
-                view->resize(1920, 1080);
-                view->exportPngCsv();
+                for (int i = 0; i < el_pair_names.size(); i++)
+                {
+                    double val = proc_corr_coef(_model, _analysis_type, restrict_coef, el_pair_names[i]);
+                    if (val > restrict_coef || val < -restrict_coef)
+                    {
+                        //logI << key << " : " << val << "\n";
+                        view->setXYAxis(QString(roi_itr.first.c_str()), QString(el_pair_names[i].first.c_str()), QString(el_pair_names[i].second.c_str()));
+                        view->resize(1920, 1080);
+                        view->exportPngCsv();
+                    }
+                    cur++;
+                    status_callback(cur, total);
+                    QCoreApplication::processEvents();
+                    if (false == _running)
+                    {
+                        break;
+                    }
+                }
             }
-            cur++;
-            status_callback(cur, total);
-            QCoreApplication::processEvents();
-            if (false == _running)
+        }
+        else
+        {
+        */
+            for (int i = 0; i < el_pair_names.size(); i++)
             {
-                break;
+                double val = proc_corr_coef(_model, _analysis_type, restrict_coef, el_pair_names[i]);
+                if (val > restrict_coef || val < -restrict_coef)
+                {
+                    //logI << key << " : " << val << "\n";
+                    view->setXYAxis("", QString(el_pair_names[i].first.c_str()), QString(el_pair_names[i].second.c_str()));
+                    view->resize(1920, 1080);
+                    view->exportPngCsv();
+                }
+                cur++;
+                status_callback(cur, total);
+                QCoreApplication::processEvents();
+                if (false == _running)
+                {
+                    break;
+                }
             }
-        }
-
+        //}
         delete view;
     }
     _running = false;