Qt5 built in qwt (#570)

- qt4->qt5
- in built qt5 6.1.5 because rhel7 is not upto date with qt5, removed findqwt.cmake
- made a fix in qwt lib (qwt_plot_layout.h) to work with 5.15 and lower versions for qrect constr.
- qt5 forms fixed, qt4 many hard coding forms switched to forms including qtabwidget, scrolls etc, fonts moved to forms
 - docking option enabled by default, removed option to disable docking feature from "Mode"
- added qVersionResolve utility functions to handle compatibility before and after qt5.12
- qtplots (ian's code) takes in gain mode enable to set some settings within the class, with proper gain plot ticks
- ensure gain plots have no zooming of z axis in 2d and y axis in 1d
- removed placeholder text in qpalette in main window form as its not supportd until 5.12 (so using qt5.9 designer insted of qt5.15 to cope)
- tab order
Servers:
- fixed some error messages that were empty for fail in funcs (mostly minor as if this error, major issues)
This commit is contained in:
Dhanya Thattil
2022-11-11 15:15:10 +01:00
committed by GitHub
parent 05f657c106
commit 38cd10d4e6
1697 changed files with 255572 additions and 4708 deletions

View File

@ -41,7 +41,10 @@ class qDefs : public QWidget {
*/
qDefs(){};
static const int Q_FONT_SIZE = 9;
static QFont GetDefaultFont() {
return QFont("Cantarell", 10, QFont::Normal);
}
static const int DATA_GAIN_PLOT_RATIO = 5;
static const int MIN_HEIGHT_GAIN_PLOT_1D = 75;
static const int GUI_ZMQ_RCV_HWM = 2;

View File

@ -4,9 +4,6 @@
#include "qDefs.h"
#include "sls/Detector.h"
#include "ui_form_detectormain.h"
#include <QTabWidget>
class QScrollArea;
class QResizeEvent;
namespace sls {
@ -21,15 +18,6 @@ class qTabDebugging;
class qTabDeveloper;
class qTabMessages;
/** To Over-ride the QTabWidget class to get the tabBar protected
* methodTabWidget */
class MyTabWidget : public QTabWidget {
public:
MyTabWidget(QWidget *parent = 0) { setParent(parent); }
/** Overridden protected method from QTabWidget */
QTabBar *tabBar() { return QTabWidget::tabBar(); }
};
class qDetectorMain : public QMainWindow, private Ui::DetectorMainObject {
Q_OBJECT
@ -75,8 +63,6 @@ class qDetectorMain : public QMainWindow, private Ui::DetectorMainObject {
slsDetectorDefs::detectorType detType;
std::unique_ptr<Detector> det;
qDrawPlot *plot;
MyTabWidget *tabs;
QScrollArea *scroll[NumberOfTabs];
qTabMeasurement *tabMeasurement;
qTabDataOutput *tabDataOutput;
qTabPlot *tabPlot;
@ -85,9 +71,7 @@ class qDetectorMain : public QMainWindow, private Ui::DetectorMainObject {
qTabDebugging *tabDebugging;
qTabDeveloper *tabDeveloper;
qTabMessages *tabMessages;
int isDeveloper;
int heightPlotWindow;
int heightCentralWidget;
int isDeveloper{false};
QString zoomToolTip;
QColor defaultTabColor;
};

View File

@ -4,9 +4,6 @@
#include "sls/Detector.h"
#include "ui_form_tab_debugging.h"
class QTreeWidget;
class QTreeWidgetItem;
namespace sls {
class qTabDebugging : public QWidget, private Ui::TabDebuggingObject {
@ -18,22 +15,20 @@ class qTabDebugging : public QWidget, private Ui::TabDebuggingObject {
void Refresh();
private slots:
void GetDetectorStatus();
void GetInfo();
void SetParameters(QTreeWidgetItem *item);
void EnableTest();
void TestDetector();
private:
void SetupWidgetWindow();
void Initialization();
void PopulateDetectors();
void GetFirmwareVersion();
void GetServerSoftwareVersion();
void GetReceiverVersion();
void GetDetectorStatus();
Detector *det;
/** Tree Widget displaying the detectors, modules */
QTreeWidget *treeDet;
QLabel *lblDetectorHostname;
QLabel *lblDetectorFirmware;
QLabel *lblDetectorSoftware;
};
} // namespace sls

View File

@ -38,8 +38,8 @@ class qTabPlot : public QWidget, private Ui::TabPlotObject {
void CheckAspectRatio();
void SetZRange();
void SetStreamingFrequency();
void SetStreamingHwm(int value);
void SetReceivingHwm(int value);
void SelectHwm(int value);
void SetHwm(int value);
signals:
void DisableZoomSignal(bool);
@ -50,8 +50,11 @@ class qTabPlot : public QWidget, private Ui::TabPlotObject {
void Select1DPlot(bool enable);
void GetGapPixels();
void GetStreamingFrequency();
void GetHwm();
void GetStreamingHwm();
void SetStreamingHwm(int value);
void GetReceivingHwm();
void SetReceivingHwm(int value);
void SetXYRange();
void MaintainAspectRatio(int dimension);
@ -66,6 +69,8 @@ class qTabPlot : public QWidget, private Ui::TabPlotObject {
static QString defaultImageXAxisTitle;
static QString defaultImageYAxisTitle;
static QString defaultImageZAxisTitle;
enum { SND_HWM, RX_HWM };
};
} // namespace sls

View File

@ -0,0 +1,13 @@
// SPDX-License-Identifier: LGPL-3.0-or-other
// Copyright (C) 2021 Contributors to the SLS Detector Package
#pragma once
#include <QFontMetrics>
#include <QString>
namespace sls {
int qResolve_GetQFontWidth(const QFontMetrics fm, const QString &text,
int len = -1);
} // namespace sls