# HG changeset patch # User Hasan Yavuz ÖZDERYA # Date 2016-06-12 16:14:48 # Node ID a8e30825928f92a4ab8a42cdf3fb505e47a60da7 # Parent bfa48fec6da4120ebd01b063e2da5004301c01a1 changed the visual style of framed reader settings this also altered the binary stream reader settings because they make use of same widgets diff --git a/src/binarystreamreadersettings.ui b/src/binarystreamreadersettings.ui --- a/src/binarystreamreadersettings.ui +++ b/src/binarystreamreadersettings.ui @@ -6,87 +6,173 @@ 0 0 - 432 - 203 + 588 + 212 Form - - - - 17 - 10 - 127 - 27 - - - - Number Of Channels: + + + 0 - - - - - 150 - 10 - 60 - 27 - + + 0 - - - 60 - 0 - + + 0 - - false - - - 1 - - - 32 + + 0 - - - - - 20 - 50 - 161 - 141 - - - - - - - 190 - 50 - 120 - 80 - - - - - - - 220 - 10 - 85 - 27 - - - - Skip reading 1 byte to correct the alignment - - - Skip Byte - - + + + + + + Number Of Channels: + + + + + + + + 60 + 0 + + + + false + + + 1 + + + 32 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Skip reading 1 byte to correct the alignment + + + Skip Byte + + + + + + + + + + + + 0 + 0 + + + + Number Type: + + + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 1 + 20 + + + + + + + + + + + + + 0 + 0 + + + + Endianness: + + + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 1 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + diff --git a/src/endiannessbox.cpp b/src/endiannessbox.cpp --- a/src/endiannessbox.cpp +++ b/src/endiannessbox.cpp @@ -21,7 +21,7 @@ #include "ui_endiannessbox.h" EndiannessBox::EndiannessBox(QWidget *parent) : - QGroupBox(parent), + QWidget(parent), ui(new Ui::EndiannessBox) { ui->setupUi(this); diff --git a/src/endiannessbox.h b/src/endiannessbox.h --- a/src/endiannessbox.h +++ b/src/endiannessbox.h @@ -20,7 +20,7 @@ #ifndef ENDIANNESSBOX_H #define ENDIANNESSBOX_H -#include +#include namespace Ui { class EndiannessBox; @@ -32,7 +32,7 @@ enum Endianness BigEndian }; -class EndiannessBox : public QGroupBox +class EndiannessBox : public QWidget { Q_OBJECT diff --git a/src/endiannessbox.ui b/src/endiannessbox.ui --- a/src/endiannessbox.ui +++ b/src/endiannessbox.ui @@ -1,22 +1,44 @@ EndiannessBox - + 0 0 - 131 - 86 + 202 + 22 - GroupBox + EndiannessBox - - Byte Order: - - + + + 3 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + most significant byte first + + + Big Endian + + + @@ -30,16 +52,6 @@ - - - - most significant byte first - - - Big Endian - - - diff --git a/src/framedreadersettings.ui b/src/framedreadersettings.ui --- a/src/framedreadersettings.ui +++ b/src/framedreadersettings.ui @@ -6,167 +6,186 @@ 0 0 - 542 + 852 222 Form - - - - 210 - 40 - 141 - 141 - + + + 3 - - - - - 360 - 40 - 120 - 80 - - - - - - - 210 - 0 - 211 - 29 - + + 0 - - - - - Number Of Channels: - - - - - - - 1 - - - 32 - - - - - - - - - 0 - 180 - 471 - 17 - + + 0 - - All is well. + + 0 - - - - - 360 - 160 - 111 - 22 - - - - Enable printing of extra log messages that can be useful for debugging - - - Debug Mode + + 0 - - - - - 1 - 39 - 204 - 93 - - - - Frame Size: - - - - - - - - Fixed Size: - - - - - - - false - - - 1 - - - 255 - - - - - - - - - First byte of frame is size - - - true - - - - - - - - - - - Sync Word: - - - - - - - - - - - - 1 - 138 - 123 - 22 - - - - Checksum Byte - - + + + + QFormLayout::FieldsStayAtSizeHint + + + + + + + + # Channels: + + + + + + + 1 + + + 32 + + + + + + + Frame Size: + + + + + + + + + Fixed Size: + + + + + + + false + + + 1 + + + 255 + + + + + + + First byte of frame is size + + + true + + + + + + + + + Num. Type: + + + + + + + + 0 + 0 + + + + + + + + Endianness: + + + + + + + + + + Checksum: + + + + + + + Enabled + + + + + + + Frame Start: + + + + + + + + + Qt::Vertical + + + + 20 + 1 + + + + + + + + + + + 0 + 0 + + + + All is well. + + + + + + + Enable printing of extra log messages that can be useful for debugging + + + Debug Mode + + + + + + diff --git a/src/numberformatbox.cpp b/src/numberformatbox.cpp --- a/src/numberformatbox.cpp +++ b/src/numberformatbox.cpp @@ -21,7 +21,7 @@ #include "ui_numberformatbox.h" NumberFormatBox::NumberFormatBox(QWidget *parent) : - QGroupBox(parent), + QWidget(parent), ui(new Ui::NumberFormatBox) { ui->setupUi(this); diff --git a/src/numberformatbox.h b/src/numberformatbox.h --- a/src/numberformatbox.h +++ b/src/numberformatbox.h @@ -20,7 +20,7 @@ #ifndef NUMBERFORMATBOX_H #define NUMBERFORMATBOX_H -#include +#include #include namespace Ui { @@ -38,7 +38,7 @@ enum NumberFormat NumberFormat_float, }; -class NumberFormatBox : public QGroupBox +class NumberFormatBox : public QWidget { Q_OBJECT diff --git a/src/numberformatbox.ui b/src/numberformatbox.ui --- a/src/numberformatbox.ui +++ b/src/numberformatbox.ui @@ -1,23 +1,65 @@ NumberFormatBox - + 0 0 - 158 - 142 + 440 + 22 - GroupBox + NumberFormat - - Number Format: - - - + + + 3 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 4 bytes floating point number + + + float + + + + + + + unsigned 4 bytes integer + + + uint32 + + + + + + + unsigned 2 bytes integer + + + uint16 + + + + unsigned 1 byte integer @@ -30,27 +72,17 @@ - - + + - signed 1 byte integer + signed 4 bytes integer - int8 + int32 - - - - unsigned 2 bytes integer - - - uint16 - - - - + signed 2 bytes integer @@ -60,33 +92,13 @@ - - + + - unsigned 4 bytes integer + signed 1 byte integer - uint32 - - - - - - - signed 4 bytes integer - - - int32 - - - - - - - 4 bytes floating point number - - - float + int8