progress bar, code cleaning, popup menu for closing tabs

include/AnglesCustomPlot.h

@@ -3,7 +3,7 @@
 
 #include <QWidget>
 
-#include <qcustomplot.h>.h>
+#include <qcustomplot.h>
 
 namespace Ui {
 class AnglesCustomPlot;
@@ -11,7 +11,7 @@ class AnglesCustomPlot;
 
 class AnglesCustomPlot : public QCustomPlot
 {
-
+	Q_OBJECT
 public:
 	explicit AnglesCustomPlot(const QVector<double>& data, const QString& xLabel, int nbBins,
 							  QWidget *parent = nullptr);
@@ -23,10 +23,17 @@ public:
 
 	void rescale();
 
-	void mouseDoubleClickEvent(QMouseEvent *event) override;
-
 	QSharedPointer<QCPBarsDataContainer> dataContainer(){return m_bars->data();}
 
+	void emitCloseTab(){emit closeTab();}
+
+	void mouseDoubleClickEvent(QMouseEvent* event) override;
+
+	void mousePressEvent(QMouseEvent* event) override;
+
+signals:
+	void closeTab();
+
 private:
 	Ui::AnglesCustomPlot *ui;
 

include/G3PointAction.h

@@ -113,8 +113,12 @@ private:
 
 	static std::shared_ptr<G3PointAction> s_g3PointAction;
 
-	static std::shared_ptr<G3PointPlots> s_g3PointPlots;
+	static QPointer<G3PointPlots> s_g3PointPlots;
 
 	GrainsAsEllipsoids* m_grainsAsEllipsoids;
+
+	std::unique_ptr<QProgressBar> m_progress;
+
+	int m_currentNumberOfSteps;
 };
 }

include/G3PointPlots.h

@@ -21,6 +21,8 @@ public:
 
 	void addToTabWidget(QWidget* widget);
 
+	void closeCurrentWidget();
+
 	template<typename SharedDataContainer>
 	bool exportToCSV(QString filename, SharedDataContainer container) const;
 

include/WolmanCustomPlot.h

@@ -64,8 +64,9 @@ protected:
 
 };
 
-class WolmanCustomPlot : public QWidget
+class WolmanCustomPlot : public QCustomPlot
 {
+	Q_OBJECT
 public:
 	WolmanCustomPlot(const Eigen::ArrayXf& d_sample);
 
@@ -73,6 +74,13 @@ public:
 
 	QCPGraph* m_graph;
 
+	void emitCloseTab(){emit closeTab();}
+
+	void mousePressEvent(QMouseEvent* event) override;
+
+signals:
+	void closeTab();
+
 private:
 	Ui::WolmanCustomPlot *ui;
 };