mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2026-01-21 02:16:42 +01:00
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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user