Raw -> Smart Pointers for mupp_plotter, qt5/qt6.

This commit is contained in:
2023-10-24 16:07:56 +02:00
parent 9911d88889
commit e676d3c045
6 changed files with 48 additions and 160 deletions

View File

@@ -31,6 +31,7 @@
#define _PMUPPCANVAS_H_
#include <vector>
#include <memory>
#include <TObject.h>
#include <TQObject.h>
@@ -76,7 +77,6 @@ public:
const PIntVector markerSytleList, const PDoubleVector markerSizeList,
const PIntVector colorList,
const int mupp_instance);
virtual ~PMuppCanvas();
virtual Bool_t IsValid() { return fValid; }
@@ -93,11 +93,11 @@ private:
Int_t fMuppInstance;
TString fFtokName;
TTimer *fCheckMsgQueue; ///< timer needed to check if a message in the IPC message queue is pending
std::unique_ptr<TTimer> fCheckMsgQueue; ///< timer needed to check if a message in the IPC message queue is pending
std::vector<PDataCollection> fPlotData;
TStyle *fStyle; ///< A collection of all graphics attributes
std::unique_ptr<TStyle> fStyle; ///< A collection of all graphics attributes
// canvas menu related variables
TRootCanvas *fImp; ///< ROOT native GUI version of main window with menubar and drawing area
@@ -105,8 +105,8 @@ private:
TGPopupMenu *fPopupMain; ///< popup menu mupp in the main menu bar
// canvas related variables
TCanvas *fMainCanvas; ///< main canvas
TMultiGraph *fMultiGraph; ///< main multi graph
std::unique_ptr<TCanvas> fMainCanvas; ///< main canvas
std::unique_ptr<TMultiGraph> fMultiGraph; ///< main multi graph
std::vector<TGraphAsymmErrors*> fGraphE; ///< all error graphs
// perdefined markers, colors