mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-27 08:40:02 +02:00
38cd10d4e6
- 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)
18 lines
442 B
C++
18 lines
442 B
C++
// SPDX-License-Identifier: LGPL-3.0-or-other
|
|
// Copyright (C) 2021 Contributors to the SLS Detector Package
|
|
#include "qVersionResolve.h"
|
|
#include <iostream>
|
|
|
|
namespace sls {
|
|
|
|
int qResolve_GetQFontWidth(const QFontMetrics fm, const QString &text,
|
|
int len) {
|
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
|
|
return fm.horizontalAdvance(text, len);
|
|
#else
|
|
return fm.width(text, len);
|
|
#endif
|
|
};
|
|
|
|
} // namespace sls
|