Merge pull request #87 from aglowacki/master

Adding bluesky qserver api calls throught zmq
AdvancedPhotonSource · Aug 12, 2024 · 083f795 · 083f795
2 parents 87e087a + 7100d76
commit 083f795
Show file tree

Hide file tree

Showing 24 changed files with 1,358 additions and 128 deletions.
diff --git a/images/chip_off.png b/images/chip_off.png
diff --git a/images/chip_on.png b/images/chip_on.png
diff --git a/images/refresh.png b/images/refresh.png
diff --git a/src/gstar/Annotation/ScanRegionGraphicsItem.cpp b/src/gstar/Annotation/ScanRegionGraphicsItem.cpp
@@ -15,10 +15,11 @@ using namespace gstar;
 
 //---------------------------------------------------------------------------
 
-ScanRegionGraphicsItem::ScanRegionGraphicsItem(AbstractGraphicsItem* parent)
+ScanRegionGraphicsItem::ScanRegionGraphicsItem(std::map<QString, BlueskyPlan> * avail_scans, AbstractGraphicsItem* parent)
    : UProbeRegionGraphicsItem(parent)
 {
-
+   _avail_scans = avail_scans;
+   _scan_dialog.setAvailScans(avail_scans);
    connect(&_scan_dialog, &ScanRegionDialog::ScanUpdated, this, &ScanRegionGraphicsItem::onScanUpdated);
 
    prependProperty(new AnnotationProperty("Edit", QIcon(":/images/editing.png")));
@@ -124,7 +125,7 @@ const QString ScanRegionGraphicsItem::displayName() const
 
 ScanRegionGraphicsItem* ScanRegionGraphicsItem::cloneRegion()
 {
-   ScanRegionGraphicsItem* newRegion = new ScanRegionGraphicsItem();
+   ScanRegionGraphicsItem* newRegion = new ScanRegionGraphicsItem(_avail_scans);
 
    //newRegion->m_outlineColor = m_outlineColor;
    newRegion->m_rect = m_rect;
@@ -142,10 +143,18 @@ QDialog* ScanRegionGraphicsItem::get_custom_dialog()
 
 //---------------------------------------------------------------------------
 
-void ScanRegionGraphicsItem::onScanUpdated()
+void ScanRegionGraphicsItem::onScanUpdated(const BlueskyPlan& plan)
 {
 
    setPropertyValue(DEF_STR_DISPLAY_NAME, _scan_dialog.getScanName());
+   BlueskyPlan nplan = plan;
+   nplan.name = _scan_dialog.getScanName();
+   BlueskyParam meta_data;
+   meta_data.name = "md";
+   meta_data.default_val = nplan.name;
+   meta_data.description = "Link to scan name";
+   nplan.parameters["md"] = meta_data;
+   emit scanUpdated(nplan);
 
 }
 /*

diff --git a/src/gstar/Annotation/ScanRegionGraphicsItem.h b/src/gstar/Annotation/ScanRegionGraphicsItem.h
@@ -24,6 +24,7 @@
 #include "gstar/CoordinateModel.h"
 #include "gstar/Annotation/UProbeRegionGraphicsItem.h"
 #include "mvc/ScanRegionDialog.h"
+#include "mvc/BlueSkyPlan.h"
 
 //---------------------------------------------------------------------------
 
@@ -46,7 +47,7 @@ Q_OBJECT
     * @param h - height
     * @param parent - parent Qt widget
     */
-   ScanRegionGraphicsItem(AbstractGraphicsItem* parent = 0);
+   ScanRegionGraphicsItem(std::map<QString, BlueskyPlan> * avail_scans, AbstractGraphicsItem* parent = 0);
 
    /**
    * @brief MarkerGraphicsItem
@@ -148,13 +149,18 @@ Q_OBJECT
    void mouseReleaseEvent(QGraphicsSceneMouseEvent* event);
 */
 
+signals:
+
+   void scanUpdated(const BlueskyPlan &plan);
+
 public slots:
 
-   void onScanUpdated(); 
+   void onScanUpdated(const BlueskyPlan &plan); 
 
 private:
    ScanRegionDialog _scan_dialog;
 
+   std::map<QString, BlueskyPlan> *_avail_scans;
 /*
    void initialScale();
 

diff --git a/src/mvc/BatchRoiFitWidget.cpp b/src/mvc/BatchRoiFitWidget.cpp
@@ -54,8 +54,8 @@ void BatchRoiFitWidget::createLayout()
 
     _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_LM_FIT);
     connect(_cb_opt_method, &QComboBox::currentTextChanged, this, &BatchRoiFitWidget::optimizer_changed);
 
     _file_list_model = new QStandardItemModel();