From 447e9cd1c51becd9ec4d174f51921e185e20014d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Tue, 12 Mar 2024 19:25:06 +0100
Subject: [PATCH] StackedFrames no need for EmptyFrame, use index -1
---
GUI/View/Frame/StackedFrames.cpp | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/GUI/View/Frame/StackedFrames.cpp b/GUI/View/Frame/StackedFrames.cpp
index d1776b23c7d..caf3801f55d 100644
--- a/GUI/View/Frame/StackedFrames.cpp
+++ b/GUI/View/Frame/StackedFrames.cpp
@@ -22,22 +22,11 @@
#include "GUI/View/Frame/Plot1DFrame.h"
#include "GUI/View/Frame/Plot2DFrame.h"
-namespace {
-
-class EmptyFrame : public QWidget {
-private:
- void showEvent(QShowEvent*) override {}
-};
-
-} // namespace
-
-
StackedDataFrames::StackedDataFrames()
{
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
setMinimumSize(500, 600);
- addWidget(new ::EmptyFrame);
addWidget(new Plot1DFrame);
addWidget(new Plot2DFrame);
setCurrentIndex(0);
@@ -50,9 +39,9 @@ StackedDataFrames::StackedDataFrames()
void StackedDataFrames::showCurrentFrame()
{
if (const DatafileItem* dfi = gDoc->datafiles()->currentItem())
- setCurrentIndex(dfi->rank());
+ setCurrentIndex(dfi->rank() - 1);
else
- setCurrentIndex(0);
+ setCurrentIndex(-1);
}
@@ -61,7 +50,6 @@ StackedJobFrames::StackedJobFrames()
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
setMinimumSize(500, 600);
- addWidget(new ::EmptyFrame);
addWidget(new Plot1DFrame);
addWidget(new Plot2DFrame);
addWidget(new Fit1DFrame);
@@ -77,7 +65,7 @@ void StackedJobFrames::showCurrentFrame()
{
if (const JobItem* ji = gDoc->jobs()->currentItem()) {
const int offset = ji->isValidForFitting() ? 2 : 0;
- setCurrentIndex(offset + ji->rank());
+ setCurrentIndex(offset + ji->rank() - 1);
} else
- setCurrentIndex(0);
+ setCurrentIndex(-1);
}
--
GitLab