Merge pull request #93 from aglowacki/master

QServer and calc updates
AdvancedPhotonSource · Nov 7, 2024 · 490e620 · 490e620
2 parents 9e09550 + 01fb0cb
commit 490e620
Show file tree

Hide file tree

Showing 20 changed files with 800 additions and 128 deletions.
diff --git a/src/gstar/Annotation/ScanRegionGraphicsItem.cpp b/src/gstar/Annotation/ScanRegionGraphicsItem.cpp
@@ -117,7 +117,7 @@ ScanRegionGraphicsItem::ScanRegionGraphicsItem(QMap<QString, QString>& marker,
 const QString ScanRegionGraphicsItem::displayName() const
 {
 
-   return QString("Scan");
+   return QString("ScanRegion");
 
 }
 

diff --git a/src/gstar/Annotation/ScanRegionGraphicsItem.h b/src/gstar/Annotation/ScanRegionGraphicsItem.h
@@ -24,7 +24,7 @@
 #include "gstar/CoordinateModel.h"
 #include "gstar/Annotation/UProbeRegionGraphicsItem.h"
 #include "mvc/ScanRegionDialog.h"
-#include "mvc/BlueSkyPlan.h"
+#include "mvc/BlueskyPlan.h"
 
 //---------------------------------------------------------------------------