Merge pull request #763 from neutronimaging/issue758_linuxdeploy

Issue758 linuxdeploy
neutronimaging · Jan 13, 2025 · 130612f · 130612f
2 parents 6a97718 + 012491c
commit 130612f
Show file tree

Hide file tree

Showing 846 changed files with 594 additions and 112,911 deletions.
diff --git a/GUI/builder.sh b/GUI/builder.sh
diff --git a/GUI/qt/GUIbundle/GUIBundle.pro b/GUI/qt/GUIbundle/GUIBundle.pro
diff --git a/GUI/qt/QtAddons/QtAddons.pro b/GUI/qt/QtAddons/QtAddons.pro
diff --git a/GUI/qt/QtImaging/QtImaging.pro b/GUI/qt/QtImaging/QtImaging.pro
diff --git a/GUI/qt/QtImaging/pixelsizedlg.cpp b/GUI/qt/QtImaging/pixelsizedlg.cpp
@@ -307,14 +307,14 @@ void PixelSizeDlg::loadImage(QString fn)
 
 void PixelSizeDlg::plotEdge(std::vector<std::pair<float, float> > &ep, QColor c, int idx)
 {
-    QVector<QPointF> data;
+    QVector<QPointF> plot_data;
 
     for (auto &pos : ep)
     {
-        data.push_back(QPointF(static_cast<double>(pos.first),static_cast<double>(pos.second)));
+        plot_data.push_back(QPointF(static_cast<double>(pos.first),static_cast<double>(pos.second)));
     }
 
-    ui->viewer->set_plot(data,c,idx);
+    ui->viewer->set_plot(plot_data,c,idx);
 }
 
 void PixelSizeDlg::computeEdgeEquation(std::vector<std::pair<float,float>> edgePosition)

diff --git a/GUI/qt/QtModuleConfigure/QtModuleConfigure.pro b/GUI/qt/QtModuleConfigure/QtModuleConfigure.pro