From 779c4a87c9494ea3d6ac5eb70479ab5e54c09117 Mon Sep 17 00:00:00 2001 From: "Calem@RAISOR" Date: Fri, 26 Jul 2024 14:21:16 -0500 Subject: [PATCH] resize window when screen too small --- .gitignore | 1 + DigiSettingsPanel.cpp | 8 ++++++++ Scope.cpp | 6 ++++++ SingleSpectra.cpp | 6 ++++++ analyzers/CoincidentAnalyzer.h | 6 +++--- analyzers/EncoreAnalyzer.h | 7 +++++++ 6 files changed, 31 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9facd53..bd65ea5 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ AggSeparator FSU2CAEN data +Data *.d *.pcm diff --git a/DigiSettingsPanel.cpp b/DigiSettingsPanel.cpp index f0f63b0..bd94a7e 100644 --- a/DigiSettingsPanel.cpp +++ b/DigiSettingsPanel.cpp @@ -7,6 +7,8 @@ #include #include #include +#include +#include #define ComBoxMixed "Mixed" // bit = 0, bit = 1 @@ -40,6 +42,12 @@ DigiSettingsPanel::DigiSettingsPanel(Digitizer ** digi, unsigned int nDigi, QStr setWindowTitle("Digitizer Settings"); setGeometry(0, 0, 1700, 850); + //====== resize window if screen too small + QScreen * screen = QGuiApplication::primaryScreen(); + QRect screenGeo = screen->geometry(); + if( screenGeo.width() < 1700 || screenGeo.height() < 850) this->showMaximized(); + + tabWidget = new QTabWidget(this); setCentralWidget(tabWidget); diff --git a/Scope.cpp b/Scope.cpp index 49e4fe0..0530d43 100644 --- a/Scope.cpp +++ b/Scope.cpp @@ -6,6 +6,7 @@ #include #include #include +#include QVector Scope::TrapezoidFilter(QVector data, int baseLineEndS, int riseTimeS, int flatTopS, float decayTime_ns){ DebugPrint("%s", "Scope"); @@ -56,6 +57,11 @@ Scope::Scope(Digitizer ** digi, unsigned int nDigi, ReadDataThread ** readDataTh setGeometry(0, 0, 1000, 800); setWindowFlags( this->windowFlags() & ~Qt::WindowCloseButtonHint ); + //====== resize window if screen too small + QScreen * screen = QGuiApplication::primaryScreen(); + QRect screenGeo = screen->geometry(); + if( screenGeo.width() < 1000 || screenGeo.height() < 800) this->showMaximized(); + enableSignalSlot = false; isACQStarted = false; diff --git a/SingleSpectra.cpp b/SingleSpectra.cpp index 85fdad7..8ae9a92 100644 --- a/SingleSpectra.cpp +++ b/SingleSpectra.cpp @@ -4,6 +4,7 @@ #include #include #include +#include SingleSpectra::SingleSpectra(Digitizer ** digi, unsigned int nDigi, QString rawDataPath, QMainWindow * parent) : QMainWindow(parent){ DebugPrint("%s", "SingleSpectra"); @@ -20,6 +21,11 @@ SingleSpectra::SingleSpectra(Digitizer ** digi, unsigned int nDigi, QString rawD setGeometry(0, 0, 1000, 800); //setWindowFlags( this->windowFlags() & ~Qt::WindowCloseButtonHint ); + //====== resize window if screen too small + QScreen * screen = QGuiApplication::primaryScreen(); + QRect screenGeo = screen->geometry(); + if( screenGeo.width() < 1000 || screenGeo.height() < 800) this->showMaximized(); + QWidget * layoutWidget = new QWidget(this); setCentralWidget(layoutWidget); QVBoxLayout * layout = new QVBoxLayout(layoutWidget); diff --git a/analyzers/CoincidentAnalyzer.h b/analyzers/CoincidentAnalyzer.h index 777076b..b498d90 100644 --- a/analyzers/CoincidentAnalyzer.h +++ b/analyzers/CoincidentAnalyzer.h @@ -526,9 +526,9 @@ inline void CoincidentAnalyzer::LoadHistRange(){ int y_sn, y_ch, y_bin; float y_min, y_max; - float updateTime; - int bkCount; - bool isBkEvtBuild; + float updateTime = 1.0; + int bkCount = 100; + bool isBkEvtBuild = false; if (!filePath.isEmpty()) { diff --git a/analyzers/EncoreAnalyzer.h b/analyzers/EncoreAnalyzer.h index b5a6b64..bdaed55 100644 --- a/analyzers/EncoreAnalyzer.h +++ b/analyzers/EncoreAnalyzer.h @@ -5,6 +5,8 @@ #include "Isotope.h" #include +#include +#include namespace EncoreChMap{ @@ -84,6 +86,11 @@ inline void Encore::SetUpCanvas(){ setGeometry(0, 0, 1600, 1600); + //====== resize window if screen too small + QScreen * screen = QGuiApplication::primaryScreen(); + QRect screenGeo = screen->geometry(); + if( screenGeo.width() < 1600 || screenGeo.height() < 1600) this->showMaximized(); + chkRunAnalyzer = new QCheckBox("Run Analyzer", this); layout->addWidget(chkRunAnalyzer, 0, 0);