Added output pipe for Windows cmd. Fixed some colors
This commit is contained in:
@@ -46,6 +46,7 @@ Controls.GroupBox {
|
||||
visible: control.subTitle.length > 0
|
||||
font.pixelSize: 23
|
||||
font.weight: Font.Normal
|
||||
backgroundColor: Palette.readyBackgroundColor
|
||||
backgroundRadius: 16
|
||||
readOnly: true
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ QtObject {
|
||||
property color backgroundColor: "#EEE"
|
||||
property color controlBackgroundColor: "#FCFCFC"
|
||||
property color indicatorBackgroundColor: "#F0F4FF"
|
||||
property color readyBackgroundColor: "#C4FFCA"
|
||||
|
||||
property color switchBackgroundColor: "#F0F4FF"
|
||||
property color switchActiveBackgroundColor: "#3069FE"
|
||||
|
||||
@@ -55,7 +55,7 @@ ApplicationWindow {
|
||||
CustomControls.IndicatorTextField {
|
||||
visible: DataController.firstStatus === "0x07" && DataController.secondStatus === "0x07"
|
||||
text: "Готов к работе"
|
||||
backgroundColor: "#C4FFCA"
|
||||
backgroundColor: Palette.readyBackgroundColor
|
||||
backgroundRadius: 16
|
||||
font.pixelSize: 24
|
||||
font.weight: Font.Normal
|
||||
@@ -141,8 +141,8 @@ ApplicationWindow {
|
||||
CustomControls.TristateSwitch {
|
||||
id: modeSwitch
|
||||
// enabled: false // uncomment for non clickable
|
||||
firstStateDescription: "АИН 1,2,3"
|
||||
secondStateDescription: "АИН 4,5,6"
|
||||
firstStateDescription: "АИН1 - АИН3"
|
||||
secondStateDescription: "АИН4 - АИН6"
|
||||
checkState: DataController.ainMode === 2 ? Qt.Unchecked : DataController.ainMode === 1 ? Qt.Checked : Qt.PartiallyChecked
|
||||
Layout.fillHeight: false
|
||||
Layout.fillWidth: true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[General]
|
||||
name=/dev/ttyS0
|
||||
;baudRate=9600
|
||||
;baudRate=115200
|
||||
;dataBits=8
|
||||
;parity=0
|
||||
;stopBits=1
|
||||
|
||||
@@ -5,15 +5,29 @@
|
||||
#include <QLocale>
|
||||
#include <QTranslator>
|
||||
#include <QFontDatabase>
|
||||
#include <QScreen>
|
||||
|
||||
#include "DataController.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "Windows.h"
|
||||
#endif
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
//#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||
// QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
//#endif
|
||||
|
||||
// qputenv("QT_SCALE_FACTOR", "0.5");
|
||||
|
||||
#ifdef _WIN32
|
||||
if (AttachConsole(ATTACH_PARENT_PROCESS)) {
|
||||
freopen("CONOUT$", "w", stdout);
|
||||
freopen("CONOUT$", "w", stderr);
|
||||
}
|
||||
#endif
|
||||
|
||||
QGuiApplication app(argc, argv);
|
||||
|
||||
QCoreApplication::setOrganizationName("Tksi");
|
||||
|
||||
Reference in New Issue
Block a user