Merge pull request #83 from aglowacki/master

Aded roi statistics
AdvancedPhotonSource · Jun 4, 2024 · e1bb2ca · e1bb2ca
2 parents 62e6af5 + 4cf7deb
commit e1bb2ca
Show file tree

Hide file tree

Showing 37 changed files with 1,384 additions and 398 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -233,6 +233,9 @@ IF (MSVC)
                         ${CMAKE_THREAD_LIBS_INIT}
                         ws2_32.lib )
 ELSEIF (UNIX)
+  #IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  #  set_target_properties(uProbeX PROPERTIES MACOSX_BUNDLE TRUE)
+  #ENDIF()
   set_target_properties(uProbeX PROPERTIES COMPILE_FLAGS "-O3")
 
     target_link_libraries (uProbeX PRIVATE

diff --git a/cmake/FindNetCDF.cmake b/cmake/FindNetCDF.cmake
diff --git a/cmake/linux/FindZeroMQ.cmake b/cmake/linux/FindZeroMQ.cmake
diff --git a/src/core/uProbeX.cpp b/src/core/uProbeX.cpp
@@ -230,6 +230,15 @@ void uProbeX::createMenuBar()
 
     connect(m_menuFile, SIGNAL(aboutToShow()), this, SLOT(menuBarEnable()));
 
+    // Batch menu
+    //m_menuBatch = new QMenu(tr("Batch Processing"));
+    //action = m_menuBatch->addAction("Per Pixel Processing");
+    //connect(action, SIGNAL(triggered()), this, SLOT(perPixel()));
+    //action = "Export Images"
+    //action = "Roi Stats"
+    //m_menu->addMenu(m_menuBatch);
+
+
     // Stream menu
     m_menuStream = new QMenu(tr("Live Stream"));
     action = m_menuStream->addAction("Open Live Stream Viewer");

diff --git a/src/core/uProbeX.h b/src/core/uProbeX.h
@@ -280,6 +280,8 @@ private slots:
     */
    QMenu* m_menuStream;
 
+   QMenu* m_menuBatch;
+
    /**
     * @brief Help menu
     */

diff --git a/src/gstar/Annotation/RoiMaskGraphicsItem.cpp b/src/gstar/Annotation/RoiMaskGraphicsItem.cpp
@@ -104,6 +104,19 @@ RoiMaskGraphicsItem::RoiMaskGraphicsItem(QString name, QColor color, int alpha,
     {
         _mask->setPixelColor(itr.first, itr.second, color);
     }
+    bool found_name = false;
+    for (const auto& itr : m_data)
+    {
+        if (itr->getName() == DEF_STR_DISPLAY_NAME)
+        {
+            itr->setValue(name);
+            found_name = true;
+        }
+    }
+    if(false == found_name)
+    {
+        appendProperty(new AnnotationProperty(DEF_STR_DISPLAY_NAME, name));
+    }
 
 }
 

diff --git a/src/gstar/CountsStatsTransformer.cpp b/src/gstar/CountsStatsTransformer.cpp
@@ -73,7 +73,7 @@ void CountsStatsTransformer::setCounts(const data_struct::ArrayXXr<float>& count
             _stdev += pow((counts(y,x) - _avg), 2);
         }
     }
-    _stdev = sqrtf(_stdev / cnts.size());
+    _stdev = sqrtf(_stdev / (float)cnts.size());
 
     std::sort(cnts.begin(), cnts.end(), [](float const& t1, float const& t2) { return t1 < t2; });
     int idx = cnts.size() / 2;

diff --git a/src/mvc/BatchRoiFitWidget.cpp b/src/mvc/BatchRoiFitWidget.cpp
@@ -53,9 +53,9 @@ void BatchRoiFitWidget::createLayout()
     _le_detectors = new QLineEdit("0,1,2,3,4,5,6");
 
     _cb_opt_method = new QComboBox();
+    _cb_opt_method->addItem(STR_HYBRID_MP_FIT);
     _cb_opt_method->addItem(STR_LM_FIT);
     _cb_opt_method->addItem(STR_MP_FIT);
-    _cb_opt_method->addItem(STR_HYBRID_MP_FIT);
     connect(_cb_opt_method, &QComboBox::currentTextChanged, this, &BatchRoiFitWidget::optimizer_changed);
 
     _file_list_model = new QStandardItemModel();