detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +02:00
Code Issues Actions Packages Releases Activity

gui: removing unique ptr in qt stuff

Browse Source
This commit is contained in:
maliakal_d 2020-09-29 15:22:59 +02:00
parent 3a3c5b0a6e
commit e4d1daea02
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorGui/include/qDetectorMain.h
View File

@ -71,7 +71,7 @@ class qDetectorMain : public QMainWindow, private Ui::DetectorMainObject {
std::unique_ptr<sls::Detector> det; std::unique_ptr<sls::Detector> det;
qDrawPlot *plot; qDrawPlot *plot;
MyTabWidget *tabs; MyTabWidget *tabs;
std::unique_ptr<QScrollArea> scroll[NumberOfTabs]; QScrollArea *scroll[NumberOfTabs];
qTabMeasurement *tabMeasurement; qTabMeasurement *tabMeasurement;
qTabDataOutput *tabDataOutput; qTabDataOutput *tabDataOutput;
qTabPlot *tabPlot; qTabPlot *tabPlot;

19
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -116,6 +116,9 @@ qDetectorMain::qDetectorMain(int multiId, const std::string &fname,
qDetectorMain::~qDetectorMain() { qDetectorMain::~qDetectorMain() {
disconnect(tabs, SIGNAL(currentChanged(int)), this, SLOT(Refresh(int))); disconnect(tabs, SIGNAL(currentChanged(int)), this, SLOT(Refresh(int)));
for (int i = 0; i < NumberOfTabs; ++i) {
delete scroll[i];
}
} }
void qDetectorMain::SetUpWidgetWindow() { void qDetectorMain::SetUpWidgetWindow() {
@ -141,7 +144,7 @@ void qDetectorMain::SetUpWidgetWindow() {
// creating the scroll area widgets for the tabs // creating the scroll area widgets for the tabs
for (int i = 0; i < NumberOfTabs; ++i) { for (int i = 0; i < NumberOfTabs; ++i) {
scroll[i] = sls::make_unique<QScrollArea>(); scroll[i] = new QScrollArea();
scroll[i]->setFrameShape(QFrame::NoFrame); scroll[i]->setFrameShape(QFrame::NoFrame);
} }
// setting the tab widgets to the scrollareas // setting the tab widgets to the scrollareas
@ -153,13 +156,13 @@ void qDetectorMain::SetUpWidgetWindow() {
scroll[DEBUGGING]->setWidget(tabDebugging); scroll[DEBUGGING]->setWidget(tabDebugging);
scroll[DEVELOPER]->setWidget(tabDeveloper); scroll[DEVELOPER]->setWidget(tabDeveloper);
// inserting all the tabs // inserting all the tabs
tabs->insertTab(MEASUREMENT, scroll[MEASUREMENT].get(), "Measurement"); tabs->insertTab(MEASUREMENT, scroll[MEASUREMENT], "Measurement");
tabs->insertTab(DATAOUTPUT, scroll[DATAOUTPUT].get(), "Data Output"); tabs->insertTab(DATAOUTPUT, scroll[DATAOUTPUT], "Data Output");
tabs->insertTab(PLOT, scroll[PLOT].get(), "Plot"); tabs->insertTab(PLOT, scroll[PLOT], "Plot");
tabs->insertTab(SETTINGS, scroll[SETTINGS].get(), "Settings"); tabs->insertTab(SETTINGS, scroll[SETTINGS], "Settings");
tabs->insertTab(ADVANCED, scroll[ADVANCED].get(), "Advanced"); tabs->insertTab(ADVANCED, scroll[ADVANCED], "Advanced");
tabs->insertTab(DEBUGGING, scroll[DEBUGGING].get(), "Debugging"); tabs->insertTab(DEBUGGING, scroll[DEBUGGING], "Debugging");
tabs->insertTab(DEVELOPER, scroll[DEVELOPER].get(), "Developer"); tabs->insertTab(DEVELOPER, scroll[DEVELOPER], "Developer");
// no scroll buttons this way // no scroll buttons this way
tabs->insertTab(MESSAGES, tabMessages, "Terminal"); tabs->insertTab(MESSAGES, tabMessages, "Terminal");