diff --git a/.qtc_clangd/.cache/clangd/index/customcombobox.cpp.3185A95C0198B507.idx b/.qtc_clangd/.cache/clangd/index/customcombobox.cpp.3185A95C0198B507.idx
index df5b6f0..b888b59 100644
Binary files a/.qtc_clangd/.cache/clangd/index/customcombobox.cpp.3185A95C0198B507.idx and b/.qtc_clangd/.cache/clangd/index/customcombobox.cpp.3185A95C0198B507.idx differ
diff --git a/.qtc_clangd/.cache/clangd/index/customcombobox.h.50DD4838C925956F.idx b/.qtc_clangd/.cache/clangd/index/customcombobox.h.50DD4838C925956F.idx
index 57bb3e1..01a9190 100644
Binary files a/.qtc_clangd/.cache/clangd/index/customcombobox.h.50DD4838C925956F.idx and b/.qtc_clangd/.cache/clangd/index/customcombobox.h.50DD4838C925956F.idx differ
diff --git a/.qtc_clangd/.cache/clangd/index/customlabel.cpp.9EBF7C0B41917A96.idx b/.qtc_clangd/.cache/clangd/index/customlabel.cpp.9EBF7C0B41917A96.idx
index 30e79e6..ac990a0 100644
Binary files a/.qtc_clangd/.cache/clangd/index/customlabel.cpp.9EBF7C0B41917A96.idx and b/.qtc_clangd/.cache/clangd/index/customlabel.cpp.9EBF7C0B41917A96.idx differ
diff --git a/.qtc_clangd/.cache/clangd/index/customlabel.h.474A24D9A17E9A5D.idx b/.qtc_clangd/.cache/clangd/index/customlabel.h.474A24D9A17E9A5D.idx
index 60be4b6..c011fdd 100644
Binary files a/.qtc_clangd/.cache/clangd/index/customlabel.h.474A24D9A17E9A5D.idx and b/.qtc_clangd/.cache/clangd/index/customlabel.h.474A24D9A17E9A5D.idx differ
diff --git a/.qtc_clangd/.cache/clangd/index/modbushandler.cpp.8DD53B2856942F9F.idx b/.qtc_clangd/.cache/clangd/index/modbushandler.cpp.8DD53B2856942F9F.idx
index aab7f1d..1c7e30c 100644
Binary files a/.qtc_clangd/.cache/clangd/index/modbushandler.cpp.8DD53B2856942F9F.idx and b/.qtc_clangd/.cache/clangd/index/modbushandler.cpp.8DD53B2856942F9F.idx differ
diff --git a/.qtc_clangd/compile_commands.json b/.qtc_clangd/compile_commands.json
index 0083c85..0ff76a6 100644
--- a/.qtc_clangd/compile_commands.json
+++ b/.qtc_clangd/compile_commands.json
@@ -9,7 +9,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -89,7 +89,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -169,7 +169,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -249,7 +249,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -329,7 +329,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -409,7 +409,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -489,7 +489,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -569,7 +569,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -649,7 +649,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -729,7 +729,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -809,7 +809,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -889,7 +889,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -969,7 +969,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -1049,7 +1049,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -1129,7 +1129,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -1209,7 +1209,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -1289,7 +1289,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -1369,87 +1369,7 @@
"-I",
"C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
"-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
- "-nostdinc",
- "-nostdinc++",
- "-std=gnu++11",
- "-fexceptions",
- "-mthreads",
- "-fsyntax-only",
- "-m32",
- "--target=i686-w64-mingw32",
- "-DQ_CREATOR_RUN",
- "-DUNICODE",
- "-D_UNICODE",
- "-DWIN32",
- "-DMINGW_HAS_SECURE_API",
- "-DQT_DEPRECATED_WARNINGS",
- "-DQT_NO_DEBUG",
- "-DQT_WIDGETS_LIB",
- "-DQT_GUI_LIB",
- "-DQT_SERIALPORT_LIB",
- "-DQT_SERIALBUS_LIB",
- "-DQT_CORE_LIB",
- "-DQT_NEEDS_QMAIN",
- "-I",
- "C:\\Works\\A1210_Desktop",
- "-I",
- "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include",
- "-I",
- "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtWidgets",
- "-I",
- "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtGui",
- "-I",
- "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtANGLE",
- "-I",
- "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtSerialPort",
- "-I",
- "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtSerialBus",
- "-I",
- "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtCore",
- "-I",
- "C:\\Works\\A1210_Desktop\\release",
- "-I",
- "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\mkspecs\\win32-g++",
- "-isystem",
- "C:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\lib\\gcc\\i686-w64-mingw32\\7.3.0\\include\\c++",
- "-isystem",
- "C:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\lib\\gcc\\i686-w64-mingw32\\7.3.0\\include\\c++\\i686-w64-mingw32",
- "-isystem",
- "C:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\lib\\gcc\\i686-w64-mingw32\\7.3.0\\include\\c++\\backward",
- "-isystem",
- "C:\\Qt\\Tools\\QtCreator-7.0.0\\bin\\clang\\lib\\clang\\14.0.0\\include",
- "-isystem",
- "C:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\i686-w64-mingw32\\include",
- "-fmessage-length=0",
- "-fdiagnostics-show-note-include-stack",
- "-fretain-comments-from-system-headers",
- "-fmacro-backtrace-limit=0",
- "-ferror-limit=1000",
- "-x",
- "c++-header",
- "-Wno-unknown-pragmas",
- "-Wno-unknown-warning-option",
- "-Wno-documentation-unknown-command",
- "-Wall",
- "-Wextra",
- "-fno-delayed-template-parsing",
- "C:\\Works\\A1210_Desktop\\ui_setpribor.h"
- ],
- "directory": "C:/Works/A1210_Desktop/.qtc_clangd",
- "file": "C:/Works/A1210_Desktop/ui_setpribor.h"
-},
-{
- "arguments": [
- "clang",
- "-I",
- "C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedMingwHeaders",
- "-I",
- "C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders",
- "-I",
- "C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
- "-I",
- "C:\\Temp\\QtCreator-spJXFs\\clang-uiheader-gNNmON",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
"-nostdinc",
"-nostdinc++",
"-std=gnu++11",
@@ -1518,5 +1438,85 @@
],
"directory": "C:/Works/A1210_Desktop/.qtc_clangd",
"file": "C:/Works/A1210_Desktop/ui_mainwindow.h"
+},
+{
+ "arguments": [
+ "clang",
+ "-I",
+ "C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedMingwHeaders",
+ "-I",
+ "C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders",
+ "-I",
+ "C:\\Qt\\Tools\\QtCreator-7.0.0\\share\\qtcreator\\cplusplus\\wrappedQtHeaders\\QtCore",
+ "-I",
+ "C:\\Temp\\QtCreator-hEMSRf\\clang-uiheader-YZxajZ",
+ "-nostdinc",
+ "-nostdinc++",
+ "-std=gnu++11",
+ "-fexceptions",
+ "-mthreads",
+ "-fsyntax-only",
+ "-m32",
+ "--target=i686-w64-mingw32",
+ "-DQ_CREATOR_RUN",
+ "-DUNICODE",
+ "-D_UNICODE",
+ "-DWIN32",
+ "-DMINGW_HAS_SECURE_API",
+ "-DQT_DEPRECATED_WARNINGS",
+ "-DQT_NO_DEBUG",
+ "-DQT_WIDGETS_LIB",
+ "-DQT_GUI_LIB",
+ "-DQT_SERIALPORT_LIB",
+ "-DQT_SERIALBUS_LIB",
+ "-DQT_CORE_LIB",
+ "-DQT_NEEDS_QMAIN",
+ "-I",
+ "C:\\Works\\A1210_Desktop",
+ "-I",
+ "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include",
+ "-I",
+ "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtWidgets",
+ "-I",
+ "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtGui",
+ "-I",
+ "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtANGLE",
+ "-I",
+ "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtSerialPort",
+ "-I",
+ "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtSerialBus",
+ "-I",
+ "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\include\\QtCore",
+ "-I",
+ "C:\\Works\\A1210_Desktop\\release",
+ "-I",
+ "C:\\Qt\\Qt5.14.2\\5.14.2\\mingw73_32\\mkspecs\\win32-g++",
+ "-isystem",
+ "C:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\lib\\gcc\\i686-w64-mingw32\\7.3.0\\include\\c++",
+ "-isystem",
+ "C:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\lib\\gcc\\i686-w64-mingw32\\7.3.0\\include\\c++\\i686-w64-mingw32",
+ "-isystem",
+ "C:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\lib\\gcc\\i686-w64-mingw32\\7.3.0\\include\\c++\\backward",
+ "-isystem",
+ "C:\\Qt\\Tools\\QtCreator-7.0.0\\bin\\clang\\lib\\clang\\14.0.0\\include",
+ "-isystem",
+ "C:\\Qt\\Qt5.14.2\\Tools\\mingw730_32\\i686-w64-mingw32\\include",
+ "-fmessage-length=0",
+ "-fdiagnostics-show-note-include-stack",
+ "-fretain-comments-from-system-headers",
+ "-fmacro-backtrace-limit=0",
+ "-ferror-limit=1000",
+ "-x",
+ "c++-header",
+ "-Wno-unknown-pragmas",
+ "-Wno-unknown-warning-option",
+ "-Wno-documentation-unknown-command",
+ "-Wall",
+ "-Wextra",
+ "-fno-delayed-template-parsing",
+ "C:\\Works\\A1210_Desktop\\ui_setpribor.h"
+ ],
+ "directory": "C:/Works/A1210_Desktop/.qtc_clangd",
+ "file": "C:/Works/A1210_Desktop/ui_setpribor.h"
}
]
\ No newline at end of file
diff --git a/enums.h b/enums.h
index f792cf6..9871bea 100644
--- a/enums.h
+++ b/enums.h
@@ -10,7 +10,21 @@ typedef enum { CHARGE = 0} typeIIN;
typedef enum { Ku0_1 = 0, Ku0_2, Ku0_5, Ku1, Ku2, Ku5, Ku10, Ku20, Ku50, Ku100, Ku200, Ku500, Ku1000 } typeIKU;
typedef enum { Hp0_2 = 0, Hp1, Hp2, Hp10 } typeIFV;
typedef enum { Lp100 = 0, Lp300, Lp1000, Lp3000, Lp10000, Lp30000, Lp100000 } typeIFN;
-typedef enum{MS2=0, PA, H } typeUnit;
+
+typedef enum{Accel = 0,
+ Velocity,
+ Pascal,
+ k_Pascal,
+ M_Pascal,
+ Nython,
+ k_Nuthon,
+ mV,
+ } typeUnit;
+
+
+//typedef enum{MS2=0, PA, H } typeUnit;
+
+
typedef enum{Oz=0, Pz } typePlavGround;
typedef enum{Norm=0, Overload } typeOverload;
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ad35d88..21cd5cd 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -46,8 +46,7 @@ const char *STRINGS_OUTUNITS[] = {"0.0001мВ/",
"1000В/", //30
};
-const char *STRINGS_UNITS[]={"мс2","Па","Н"}; // массив с единицами измерений
-
+const char *STRINGS_UNITS[]={"м/с2","мм/с","Па","кПа","МПа", "Н","кН","мВ"}; // массив с единицами измерений
@@ -138,10 +137,16 @@ MainWindow::MainWindow(QWidget *parent): QMainWindow(parent), ui(new Ui::MainWin
ui->comboBoxVch->addItem("10");
- ui->comboBoxUnitSens->addItem("пКл/Н");
+ ui->comboBoxUnitSens->addItem("пКл/м/с2");
+ ui->comboBoxUnitSens->addItem("пКл/мм/с");
ui->comboBoxUnitSens->addItem("пКл/Па");
- ui->comboBoxUnitSens->addItem("пКл/мс2");
+ ui->comboBoxUnitSens->addItem("пКл/кПа");
+ ui->comboBoxUnitSens->addItem("пКл/МПа");
+ ui->comboBoxUnitSens->addItem("пКл/Н");
+ ui->comboBoxUnitSens->addItem("пКл/кН");
+ ui->comboBoxUnitSens->addItem("пКл/мВ");
+ //"м/с2","мм/с","Па","кПа","МПа", "Н","кН","кВ"
hideInteface();
@@ -243,7 +248,7 @@ void MainWindow::on_pushButtonConnect_clicked()
ui->comboBoxBit->setDisabled(true);
ui->comboBoxSpeed->setDisabled(true);
- showInteface();
+
isConnected=true;
}
@@ -432,20 +437,35 @@ void MainWindow::refreshDisplay(){
switch (state.unit) { //todo тут нужно нормирование
- case H :
+ case Accel:
ui->comboBoxUnitSens->setCurrentIndex(0);
// ui->labelUnitKu->setText("xВ/Н"); // Заменил на нормирование с прибора
break;
- case PA:
+ case Velocity:
ui->comboBoxUnitSens->setCurrentIndex(1);
// ui->labelUnitKu->setText("xВ/Па");
break;
- case MS2:
+ case Pascal:
ui->comboBoxUnitSens->setCurrentIndex(2);
+ break;
// ui->labelUnitKu->setText("xВ/мс2");
+ case k_Pascal:
+ ui->comboBoxUnitSens->setCurrentIndex(3);
+ break;
+ case M_Pascal:
+ ui->comboBoxUnitSens->setCurrentIndex(4);
+ break;
+ case Nython:
+ ui->comboBoxUnitSens->setCurrentIndex(5);
+ break;
+ case k_Nuthon:
+ ui->comboBoxUnitSens->setCurrentIndex(6);
+ break;
+ case mV:
+ ui->comboBoxUnitSens->setCurrentIndex(7);
break;
default:
@@ -465,6 +485,8 @@ void MainWindow::refreshDisplay(){
ui->labelOverload->setText("#####");
break;
}
+
+ showInteface();
};
@@ -506,9 +528,14 @@ void MainWindow::on_lineEditAddr_textEdited(const QString &)
void MainWindow::on_comboBoxUnitSens_activated(int index)
{
- if(index==0)state.unit=H;
- if(index==1)state.unit=PA; //тут были непонятки, скорее всего сработает без этого
- if(index==2)state.unit=MS2;
+ if(index==0)state.unit=Accel;
+ if(index==1)state.unit=Velocity; //тут были непонятки, скорее всего сработает без этого
+ if(index==2)state.unit=Pascal;
+ if(index==3)state.unit=k_Pascal;
+ if(index==4)state.unit=M_Pascal; //тут были непонятки, скорее всего сработает без этого
+ if(index==5)state.unit=Nython;
+ if(index==6)state.unit=k_Nuthon;
+ if(index==7)state.unit=mV;
modebus->writeDataToPribor(state, STATE_REQ_TYPE);
}
diff --git a/mainwindow.ui b/mainwindow.ui
index 0e66d36..4b18f43 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -65,8 +65,8 @@
10
40
- 47
- 13
+ 61
+ 16
@@ -100,498 +100,9 @@
-
-
-
-
- 0
- 170
- 255
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 170
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
- 0
- 170
- 255
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 170
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 240
- 240
- 240
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 170
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
+
+
+
@@ -663,15 +174,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -681,15 +183,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -771,15 +264,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -827,15 +311,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -845,15 +320,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -935,15 +401,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -991,15 +448,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1009,15 +457,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1099,15 +538,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1178,15 +608,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1196,15 +617,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1286,15 +698,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1342,15 +745,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1360,15 +754,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1450,15 +835,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1506,15 +882,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1524,15 +891,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1614,15 +972,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1693,15 +1042,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1711,15 +1051,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1801,15 +1132,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1857,15 +1179,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1875,15 +1188,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1965,15 +1269,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2021,15 +1316,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2039,15 +1325,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2129,15 +1406,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2208,15 +1476,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2226,15 +1485,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2316,15 +1566,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2372,15 +1613,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2390,15 +1622,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2480,15 +1703,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2536,15 +1750,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2554,15 +1759,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2644,15 +1840,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2723,15 +1910,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2741,15 +1919,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2831,15 +2000,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2887,15 +2047,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2905,15 +2056,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2995,15 +2137,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3051,15 +2184,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3069,15 +2193,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3159,15 +2274,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3238,15 +2344,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3256,15 +2353,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3346,15 +2434,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3402,15 +2481,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3420,15 +2490,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3510,15 +2571,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3566,15 +2618,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3584,15 +2627,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3674,15 +2708,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3763,9 +2788,9 @@
- 163
+ 143
22
- 96
+ 121
22
@@ -3779,9 +2804,9 @@
- 99
+ 79
21
- 59
+ 63
25
@@ -3833,15 +2858,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3851,15 +2867,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3941,15 +2948,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3997,15 +2995,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4015,15 +3004,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4105,15 +3085,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4161,15 +3132,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4179,15 +3141,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4269,15 +3222,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4348,15 +3292,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4366,15 +3301,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4456,15 +3382,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4512,15 +3429,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4530,15 +3438,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4620,15 +3519,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4676,15 +3566,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4694,15 +3575,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4784,15 +3656,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4803,7 +3666,7 @@
- Датчик
+ Вход
labelSens
@@ -4959,9 +3822,9 @@
- 190
+ 180
40
- 111
+ 121
23
@@ -4972,9 +3835,9 @@
- 190
+ 180
70
- 111
+ 121
23
@@ -4985,9 +3848,9 @@
- 190
+ 180
10
- 111
+ 121
23
@@ -5015,7 +3878,7 @@
0
0
314
- 21
+ 22
diff --git a/modbushandler.cpp b/modbushandler.cpp
index eb25010..c276056 100644
--- a/modbushandler.cpp
+++ b/modbushandler.cpp
@@ -75,13 +75,12 @@ void ModBusHandler::removeFromReqList(uint adress)
void ModBusHandler::getDataFromPribor(PrborConnectonAtr atr) //слот для истекшего таймера
{
{
- // modbusDevice->disconnectDevice();
-
+ modbusDevice->disconnectDevice();
modbusDevice->setConnectionParameter(QModbusDevice::SerialPortNameParameter, QVariant(atr.port));
modbusDevice->setConnectionParameter(QModbusDevice::SerialStopBitsParameter, QSerialPort::OneStop);
modbusDevice->setConnectionParameter(QModbusDevice::SerialDataBitsParameter, QSerialPort::Data8);
//modbusDevice->setTimeout(TIMEOUT); //1 таймаута
- // modbusDevice->setNumberOfRetries(0);// попытки достучатся
+ //modbusDevice->setNumberOfRetries(0);// попытки достучатся
modbusDevice->setConnectionParameter(QModbusDevice::SerialBaudRateParameter, atr.speed);
switch (atr.parity) {//выставляем парити
case UART_PARITY_NONE:
@@ -252,7 +251,6 @@ void ModBusHandler::prepareWrite(uint16_t adress, int startAddress, int count, Q
}
emit writeResult(lastRequest->error()); // сигналим о завершении операции
lastRequest->deleteLater();
- qDebug() << "первый deleteLater";
});
} else {
lastRequest->deleteLater();
diff --git a/release/moc_predefs.h b/release/moc_predefs.h
deleted file mode 100644
index d4948e6..0000000
--- a/release/moc_predefs.h
+++ /dev/null
@@ -1,376 +0,0 @@
-#define __DBL_MIN_EXP__ (-1021)
-#define __FLT32X_MAX_EXP__ 1024
-#define __cpp_attributes 200809
-#define __pentiumpro__ 1
-#define __UINT_LEAST16_MAX__ 0xffff
-#define __ATOMIC_ACQUIRE 2
-#define __FLT128_MAX_10_EXP__ 4932
-#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F
-#define __GCC_IEC_559_COMPLEX 2
-#define __UINT_LEAST8_TYPE__ unsigned char
-#define __SIZEOF_FLOAT80__ 12
-#define _WIN32 1
-#define __INTMAX_C(c) c ## LL
-#define __CHAR_BIT__ 8
-#define __UINT8_MAX__ 0xff
-#define __WINT_MAX__ 0xffff
-#define __FLT32_MIN_EXP__ (-125)
-#define __cpp_static_assert 200410
-#define __ORDER_LITTLE_ENDIAN__ 1234
-#define __SIZE_MAX__ 0xffffffffU
-#define __WCHAR_MAX__ 0xffff
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
-#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L)
-#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
-#define __GCC_ATOMIC_CHAR_LOCK_FREE 2
-#define __GCC_IEC_559 2
-#define __FLT32X_DECIMAL_DIG__ 17
-#define __FLT_EVAL_METHOD__ 2
-#define __cpp_binary_literals 201304
-#define __FLT64_DECIMAL_DIG__ 17
-#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2
-#define __cpp_variadic_templates 200704
-#define __UINT_FAST64_MAX__ 0xffffffffffffffffULL
-#define __SIG_ATOMIC_TYPE__ int
-#define __DBL_MIN_10_EXP__ (-307)
-#define __FINITE_MATH_ONLY__ 0
-#define __GNUC_PATCHLEVEL__ 0
-#define __FLT32_HAS_DENORM__ 1
-#define __UINT_FAST8_MAX__ 0xff
-#define __has_include(STR) __has_include__(STR)
-#define _stdcall __attribute__((__stdcall__))
-#define __DEC64_MAX_EXP__ 385
-#define __INT8_C(c) c
-#define __INT_LEAST8_WIDTH__ 8
-#define __UINT_LEAST64_MAX__ 0xffffffffffffffffULL
-#define __SHRT_MAX__ 0x7fff
-#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L
-#define __FLT64X_MAX_10_EXP__ 4932
-#define __UINT_LEAST8_MAX__ 0xff
-#define __GCC_ATOMIC_BOOL_LOCK_FREE 2
-#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128
-#define __UINTMAX_TYPE__ long long unsigned int
-#define __DEC32_EPSILON__ 1E-6DF
-#define __FLT_EVAL_METHOD_TS_18661_3__ 2
-#define __OPTIMIZE__ 1
-#define __UINT32_MAX__ 0xffffffffU
-#define __GXX_EXPERIMENTAL_CXX0X__ 1
-#define __LDBL_MAX_EXP__ 16384
-#define __FLT128_MIN_EXP__ (-16381)
-#define __WINT_MIN__ 0
-#define __FLT128_MIN_10_EXP__ (-4931)
-#define __INT_LEAST16_WIDTH__ 16
-#define __SCHAR_MAX__ 0x7f
-#define __FLT128_MANT_DIG__ 113
-#define __WCHAR_MIN__ 0
-#define __INT64_C(c) c ## LL
-#define __DBL_DIG__ 15
-#define __GCC_ATOMIC_POINTER_LOCK_FREE 2
-#define __FLT64X_MANT_DIG__ 64
-#define __SIZEOF_INT__ 4
-#define __SIZEOF_POINTER__ 4
-#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2
-#define __USER_LABEL_PREFIX__ _
-#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x
-#define __STDC_HOSTED__ 1
-#define __WIN32 1
-#define __LDBL_HAS_INFINITY__ 1
-#define __FLT32_DIG__ 6
-#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F
-#define __GXX_WEAK__ 1
-#define __SHRT_WIDTH__ 16
-#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L
-#define __DEC32_MAX__ 9.999999E96DF
-#define __cpp_threadsafe_static_init 200806
-#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x
-#define __MINGW32__ 1
-#define __FLT32X_HAS_INFINITY__ 1
-#define __INT32_MAX__ 0x7fffffff
-#define __INT_WIDTH__ 32
-#define __SIZEOF_LONG__ 4
-#define __UINT16_C(c) c
-#define __PTRDIFF_WIDTH__ 32
-#define __DECIMAL_DIG__ 21
-#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64
-#define __INTMAX_WIDTH__ 64
-#define __FLT64_MIN_EXP__ (-1021)
-#define __has_include_next(STR) __has_include_next__(STR)
-#define __FLT64X_MIN_10_EXP__ (-4931)
-#define __LDBL_HAS_QUIET_NAN__ 1
-#define __FLT64_MANT_DIG__ 53
-#define _REENTRANT 1
-#define __GNUC__ 7
-#define _cdecl __attribute__((__cdecl__))
-#define __GXX_RTTI 1
-#define __cpp_delegating_constructors 200604
-#define __FLT_HAS_DENORM__ 1
-#define __SIZEOF_LONG_DOUBLE__ 12
-#define __BIGGEST_ALIGNMENT__ 16
-#define __STDC_UTF_16__ 1
-#define __FLT64_MAX_10_EXP__ 308
-#define __i686 1
-#define __FLT32_HAS_INFINITY__ 1
-#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L)
-#define _thiscall __attribute__((__thiscall__))
-#define __cpp_raw_strings 200710
-#define __INT_FAST32_MAX__ 0x7fffffff
-#define __WINNT 1
-#define __DBL_HAS_INFINITY__ 1
-#define __INT64_MAX__ 0x7fffffffffffffffLL
-#define __WINNT__ 1
-#define __DEC32_MIN_EXP__ (-94)
-#define __INTPTR_WIDTH__ 32
-#define __FLT32X_HAS_DENORM__ 1
-#define __INT_FAST16_TYPE__ short int
-#define _fastcall __attribute__((__fastcall__))
-#define __LDBL_HAS_DENORM__ 1
-#define __cplusplus 201103L
-#define __cpp_ref_qualifiers 200710
-#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
-#define __INT_LEAST32_MAX__ 0x7fffffff
-#define __DEC32_MIN__ 1E-95DF
-#define __DEPRECATED 1
-#define __cpp_rvalue_references 200610
-#define __DBL_MAX_EXP__ 1024
-#define __WCHAR_WIDTH__ 16
-#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32
-#define __DEC128_EPSILON__ 1E-33DL
-#define __ATOMIC_HLE_RELEASE 131072
-#define __WIN32__ 1
-#define __PTRDIFF_MAX__ 0x7fffffff
-#define __ATOMIC_HLE_ACQUIRE 65536
-#define __FLT32_HAS_QUIET_NAN__ 1
-#define __GNUG__ 7
-#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL
-#define __SIZEOF_SIZE_T__ 4
-#define __cpp_rvalue_reference 200610
-#define __cpp_nsdmi 200809
-#define __FLT64X_MIN_EXP__ (-16381)
-#define __SIZEOF_WINT_T__ 2
-#define __LONG_LONG_WIDTH__ 64
-#define __cpp_initializer_lists 200806
-#define __FLT32_MAX_EXP__ 128
-#define __cpp_hex_float 201603
-#define __GCC_HAVE_DWARF2_CFI_ASM 1
-#define __GXX_ABI_VERSION 1011
-#define __FLT128_HAS_INFINITY__ 1
-#define __FLT_MIN_EXP__ (-125)
-#define __i686__ 1
-#define __cpp_lambdas 200907
-#define __FLT64X_HAS_QUIET_NAN__ 1
-#define __INT_FAST64_TYPE__ long long int
-#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64
-#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L)
-#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x
-#define __DECIMAL_BID_FORMAT__ 1
-#define __GXX_TYPEINFO_EQUALITY_INLINE 0
-#define __FLT64_MIN_10_EXP__ (-307)
-#define __FLT64X_DECIMAL_DIG__ 21
-#define __DEC128_MIN__ 1E-6143DL
-#define __REGISTER_PREFIX__
-#define __UINT16_MAX__ 0xffff
-#define __DBL_HAS_DENORM__ 1
-#define __cdecl __attribute__((__cdecl__))
-#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32
-#define __UINT8_TYPE__ unsigned char
-#define __i386 1
-#define __FLT_MANT_DIG__ 24
-#define __LDBL_DECIMAL_DIG__ 21
-#define __VERSION__ "7.3.0"
-#define __UINT64_C(c) c ## ULL
-#define __cpp_unicode_characters 200704
-#define __GCC_ATOMIC_INT_LOCK_FREE 2
-#define __FLT128_MAX_EXP__ 16384
-#define __FLT32_MANT_DIG__ 24
-#define _X86_ 1
-#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__
-#define __FLT128_HAS_DENORM__ 1
-#define __FLT128_DIG__ 33
-#define __SCHAR_WIDTH__ 8
-#define __INT32_C(c) c
-#define __DEC64_EPSILON__ 1E-15DD
-#define __ORDER_PDP_ENDIAN__ 3412
-#define __DEC128_MIN_EXP__ (-6142)
-#define __code_model_32__ 1
-#define __FLT32_MAX_10_EXP__ 38
-#define __INT_FAST32_TYPE__ int
-#define __UINT_LEAST16_TYPE__ short unsigned int
-#define __FLT64X_HAS_INFINITY__ 1
-#define __INT16_MAX__ 0x7fff
-#define __i386__ 1
-#define __cpp_rtti 199711
-#define __SIZE_TYPE__ unsigned int
-#define __UINT64_MAX__ 0xffffffffffffffffULL
-#define __FLT64X_DIG__ 18
-#define __INT8_TYPE__ signed char
-#define __GCC_ASM_FLAG_OUTPUTS__ 1
-#define __FLT_RADIX__ 2
-#define __INT_LEAST16_TYPE__ short int
-#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L
-#define __UINTMAX_C(c) c ## ULL
-#define __SIG_ATOMIC_MAX__ 0x7fffffff
-#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2
-#define __SIZEOF_PTRDIFF_T__ 4
-#define __FLT32X_MANT_DIG__ 53
-#define __FLT32X_MIN_EXP__ (-1021)
-#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF
-#define __pentiumpro 1
-#define __MSVCRT__ 1
-#define __INT_FAST16_MAX__ 0x7fff
-#define __FLT64_DIG__ 15
-#define __UINT_FAST32_MAX__ 0xffffffffU
-#define __UINT_LEAST64_TYPE__ long long unsigned int
-#define __FLT_HAS_QUIET_NAN__ 1
-#define __FLT_MAX_10_EXP__ 38
-#define __LONG_MAX__ 0x7fffffffL
-#define __FLT64X_HAS_DENORM__ 1
-#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL
-#define __FLT_HAS_INFINITY__ 1
-#define __cpp_unicode_literals 200710
-#define __UINT_FAST16_TYPE__ short unsigned int
-#define __DEC64_MAX__ 9.999999999999999E384DD
-#define __INT_FAST32_WIDTH__ 32
-#define __CHAR16_TYPE__ short unsigned int
-#define __PRAGMA_REDEFINE_EXTNAME 1
-#define __SIZE_WIDTH__ 32
-#define __SEG_FS 1
-#define __INT_LEAST16_MAX__ 0x7fff
-#define __DEC64_MANT_DIG__ 16
-#define __UINT_LEAST32_MAX__ 0xffffffffU
-#define __SEG_GS 1
-#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32
-#define __GCC_ATOMIC_LONG_LOCK_FREE 2
-#define __SIG_ATOMIC_WIDTH__ 32
-#define __INT_LEAST64_TYPE__ long long int
-#define __INT16_TYPE__ short int
-#define __INT_LEAST8_TYPE__ signed char
-#define __DEC32_MAX_EXP__ 97
-#define __INT_FAST8_MAX__ 0x7f
-#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128
-#define __INTPTR_MAX__ 0x7fffffff
-#define __GXX_MERGED_TYPEINFO_NAMES 0
-#define __cpp_range_based_for 200907
-#define __FLT64_HAS_QUIET_NAN__ 1
-#define __stdcall __attribute__((__stdcall__))
-#define __FLT32_MIN_10_EXP__ (-37)
-#define __EXCEPTIONS 1
-#define __LDBL_MANT_DIG__ 64
-#define __DBL_HAS_QUIET_NAN__ 1
-#define __FLT64_HAS_INFINITY__ 1
-#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x
-#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1)
-#define __INTPTR_TYPE__ int
-#define __UINT16_TYPE__ short unsigned int
-#define __WCHAR_TYPE__ short unsigned int
-#define __SIZEOF_FLOAT__ 4
-#define __UINTPTR_MAX__ 0xffffffffU
-#define __INT_FAST64_WIDTH__ 64
-#define __DEC64_MIN_EXP__ (-382)
-#define __cpp_decltype 200707
-#define __FLT32_DECIMAL_DIG__ 9
-#define __INT_FAST64_MAX__ 0x7fffffffffffffffLL
-#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1
-#define __FLT_DIG__ 6
-#define __FLT64X_MAX_EXP__ 16384
-#define __UINT_FAST64_TYPE__ long long unsigned int
-#define __INT_MAX__ 0x7fffffff
-#define WIN32 1
-#define __INT64_TYPE__ long long int
-#define __FLT_MAX_EXP__ 128
-#define __DBL_MANT_DIG__ 53
-#define __cpp_inheriting_constructors 201511
-#define __SIZEOF_FLOAT128__ 16
-#define __INT_LEAST64_MAX__ 0x7fffffffffffffffLL
-#define __DEC64_MIN__ 1E-383DD
-#define __WINT_TYPE__ short unsigned int
-#define __UINT_LEAST32_TYPE__ unsigned int
-#define __SIZEOF_SHORT__ 2
-#define __LDBL_MIN_EXP__ (-16381)
-#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64
-#define __WINT_WIDTH__ 16
-#define __INT_LEAST8_MAX__ 0x7f
-#define __FLT32X_MAX_10_EXP__ 308
-#define __WCHAR_UNSIGNED__ 1
-#define __LDBL_MAX_10_EXP__ 4932
-#define __ATOMIC_RELAXED 0
-#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L)
-#define __thiscall __attribute__((__thiscall__))
-#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128
-#define __UINT8_C(c) c
-#define __FLT64_MAX_EXP__ 1024
-#define __INT_LEAST32_TYPE__ int
-#define __SIZEOF_WCHAR_T__ 2
-#define __FLT128_HAS_QUIET_NAN__ 1
-#define __INT_FAST8_TYPE__ signed char
-#define __fastcall __attribute__((__fastcall__))
-#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x
-#define __GNUC_STDC_INLINE__ 1
-#define __FLT64_HAS_DENORM__ 1
-#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32
-#define __DBL_DECIMAL_DIG__ 17
-#define __STDC_UTF_32__ 1
-#define __INT_FAST8_WIDTH__ 8
-#define __DEC_EVAL_METHOD__ 2
-#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x
-#define __ORDER_BIG_ENDIAN__ 4321
-#define __cpp_runtime_arrays 198712
-#define __UINT64_TYPE__ long long unsigned int
-#define __UINT32_C(c) c ## U
-#define __INTMAX_MAX__ 0x7fffffffffffffffLL
-#define __cpp_alias_templates 200704
-#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
-#define WINNT 1
-#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F
-#define __INT8_MAX__ 0x7f
-#define __LONG_WIDTH__ 32
-#define __UINT_FAST32_TYPE__ unsigned int
-#define __CHAR32_TYPE__ unsigned int
-#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F
-#define __cpp_constexpr 200704
-#define __INT32_TYPE__ int
-#define __SIZEOF_DOUBLE__ 8
-#define __cpp_exceptions 199711
-#define __FLT_MIN_10_EXP__ (-37)
-#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64
-#define __INT_LEAST32_WIDTH__ 32
-#define __INTMAX_TYPE__ long long int
-#define i386 1
-#define _INTEGRAL_MAX_BITS 64
-#define __DEC128_MAX_EXP__ 6145
-#define __FLT32X_HAS_QUIET_NAN__ 1
-#define __ATOMIC_CONSUME 1
-#define __GNUC_MINOR__ 3
-#define __INT_FAST16_WIDTH__ 16
-#define __UINTMAX_MAX__ 0xffffffffffffffffULL
-#define __DEC32_MANT_DIG__ 7
-#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x
-#define __DBL_MAX_10_EXP__ 308
-#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L
-#define __INT16_C(c) c
-#define __STDC__ 1
-#define __FLT32X_DIG__ 15
-#define __PTRDIFF_TYPE__ int
-#define __ATOMIC_SEQ_CST 5
-#define __UINT32_TYPE__ unsigned int
-#define __FLT32X_MIN_10_EXP__ (-307)
-#define __UINTPTR_TYPE__ unsigned int
-#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD
-#define __DEC128_MANT_DIG__ 34
-#define __LDBL_MIN_10_EXP__ (-4931)
-#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128
-#define __SIZEOF_LONG_LONG__ 8
-#define __cpp_user_defined_literals 200809
-#define __FLT128_DECIMAL_DIG__ 36
-#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
-#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x
-#define __LDBL_DIG__ 18
-#define __FLT_DECIMAL_DIG__ 9
-#define __UINT_FAST16_MAX__ 0xffff
-#define __GCC_ATOMIC_SHORT_LOCK_FREE 2
-#define __INT_LEAST64_WIDTH__ 64
-#define __UINT_FAST8_TYPE__ unsigned char
-#define __ATOMIC_ACQ_REL 4
-#define __ATOMIC_RELEASE 3
-#define __declspec(x) __attribute__((x))
diff --git a/secondwindows.cpp b/secondwindows.cpp
index 2bfdf25..9071954 100644
--- a/secondwindows.cpp
+++ b/secondwindows.cpp
@@ -74,9 +74,14 @@ SecondWindows::SecondWindows(MainWindow *parent) ://конструктор
ui->comboBoxVch->addItem("10");
- ui->comboBoxUnitSens->addItem("пКл/Н");
+ ui->comboBoxUnitSens->addItem("пКл/м/с2");
+ ui->comboBoxUnitSens->addItem("пКл/мм/с");
ui->comboBoxUnitSens->addItem("пКл/Па");
- ui->comboBoxUnitSens->addItem("пКл/мс2");
+ ui->comboBoxUnitSens->addItem("пКл/кПа");
+ ui->comboBoxUnitSens->addItem("пКл/МПа");
+ ui->comboBoxUnitSens->addItem("пКл/Н");
+ ui->comboBoxUnitSens->addItem("пКл/кН");
+ ui->comboBoxUnitSens->addItem("пКл/мВ");
hideInteface();
@@ -319,16 +324,38 @@ void SecondWindows::refreshDisplay(){
switch (state.unit) { //todo тут нужно нормирование
- case H :
+ case Accel:
+
ui->comboBoxUnitSens->setCurrentIndex(0);
+ // ui->labelUnitKu->setText("xВ/Н"); // Заменил на нормирование с прибора
break;
- case PA:
+ case Velocity:
+
ui->comboBoxUnitSens->setCurrentIndex(1);
+ // ui->labelUnitKu->setText("xВ/Па");
break;
- case MS2:
+ case Pascal:
+
ui->comboBoxUnitSens->setCurrentIndex(2);
break;
+ // ui->labelUnitKu->setText("xВ/мс2");
+ case k_Pascal:
+ ui->comboBoxUnitSens->setCurrentIndex(3);
+ break;
+ case M_Pascal:
+ ui->comboBoxUnitSens->setCurrentIndex(4);
+ break;
+ case Nython:
+ ui->comboBoxUnitSens->setCurrentIndex(5);
+ break;
+ case k_Nuthon:
+ ui->comboBoxUnitSens->setCurrentIndex(6);
+ break;
+ case mV:
+ ui->comboBoxUnitSens->setCurrentIndex(7);
+ break;
default:
+
break;
}
@@ -363,9 +390,14 @@ void SecondWindows::on_labelSens_clicked()
void SecondWindows::on_comboBoxUnitSens_activated(int index)
{
- if(index==0)state.unit=H;
- if(index==1)state.unit=PA; //тут были непонятки, скорее всего сработает без этого
- if(index==2)state.unit=MS2;
+ if(index==0)state.unit=Accel;
+ if(index==1)state.unit=Velocity; //тут были непонятки, скорее всего сработает без этого
+ if(index==2)state.unit=Pascal;
+ if(index==3)state.unit=k_Pascal;
+ if(index==4)state.unit=M_Pascal; //тут были непонятки, скорее всего сработает без этого
+ if(index==5)state.unit=Nython;
+ if(index==6)state.unit=k_Nuthon;
+ if(index==7)state.unit=mV; //тут были непонятки, скорее всего сработает без этого
modebus->writeDataToPribor(state, STATE_REQ_TYPE);
}
diff --git a/secondwindows.ui b/secondwindows.ui
index 169420e..61460a6 100644
--- a/secondwindows.ui
+++ b/secondwindows.ui
@@ -223,498 +223,9 @@
-
-
-
-
- 0
- 170
- 255
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 170
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
- 0
- 170
- 255
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 170
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 240
- 240
- 240
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 170
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
+
+
+
@@ -786,15 +297,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -804,15 +306,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -894,15 +387,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -950,15 +434,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -968,15 +443,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1058,15 +524,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1114,15 +571,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1132,15 +580,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1222,15 +661,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1301,15 +731,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1319,15 +740,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1409,15 +821,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1465,15 +868,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1483,15 +877,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1573,15 +958,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1629,15 +1005,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1647,15 +1014,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1737,15 +1095,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1816,15 +1165,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1834,15 +1174,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1924,15 +1255,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1980,15 +1302,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -1998,15 +1311,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2088,15 +1392,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2144,15 +1439,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2162,15 +1448,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2252,15 +1529,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2278,7 +1546,7 @@
140
- 75
+ 76
36
21
@@ -2331,15 +1599,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2349,15 +1608,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2439,15 +1689,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2495,15 +1736,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2513,15 +1745,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2603,15 +1826,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2659,15 +1873,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2677,15 +1882,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2767,15 +1963,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2846,15 +2033,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2864,15 +2042,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -2954,15 +2123,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3010,15 +2170,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3028,15 +2179,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3118,15 +2260,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3174,15 +2307,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3192,15 +2316,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3282,15 +2397,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3308,7 +2414,7 @@
229
- 75
+ 76
40
21
@@ -3361,15 +2467,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3379,15 +2476,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3469,15 +2557,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3525,15 +2604,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3543,15 +2613,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3633,15 +2694,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3689,15 +2741,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3707,15 +2750,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3797,15 +2831,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3876,15 +2901,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3894,15 +2910,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -3984,15 +2991,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4040,15 +3038,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4058,15 +3047,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4148,15 +3128,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4204,15 +3175,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4222,15 +3184,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4312,15 +3265,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4338,7 +3282,7 @@
92
- 50
+ 46
121
22
@@ -4370,7 +3314,7 @@
171
- 75
+ 74
56
22
@@ -4386,7 +3330,7 @@
56
- 75
+ 73
47
22
@@ -4471,15 +3415,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4489,15 +3424,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4579,15 +3505,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4635,15 +3552,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4653,15 +3561,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4743,15 +3642,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4799,15 +3689,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4817,15 +3698,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4907,15 +3779,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -4986,15 +3849,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -5004,15 +3858,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -5094,15 +3939,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -5150,15 +3986,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -5168,15 +3995,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -5258,15 +4076,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -5314,15 +4123,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -5332,15 +4132,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -5422,15 +4213,6 @@
-
-
-
- 0
- 0
- 0
-
-
-
@@ -5444,7 +4226,8 @@
XXX.XX
- layoutWidget
+ label_4
+ labelSens
labelUnitKu
labelOverload
label_8
@@ -5488,7 +4271,7 @@
0
0
316
- 21
+ 22
diff --git a/setpribor.cpp b/setpribor.cpp
index 56789f6..538ebf8 100644
--- a/setpribor.cpp
+++ b/setpribor.cpp
@@ -120,7 +120,7 @@ void SetPribor::priborIsSetConnAtr(QModbusDevice::Error modbusMessage)
} else if (modbusMessage != QModbusDevice::NoError) {
ui->labelResult->setText("Ошибочка"); //
} else if(modbusMessage == QModbusDevice::NoError) {
- ui->labelResult->setText("Успшно настроен /n Подключитесь к прибору с новыми атрибутами"); //
+ ui->labelResult->setText("Успешно настроен /n Подключитесь к прибору с новыми атрибутами"); //
}
QApplication::beep();
diff --git a/setpribor.ui b/setpribor.ui
index 6009e71..2d4b33f 100644
--- a/setpribor.ui
+++ b/setpribor.ui
@@ -130,8 +130,8 @@
15
185
- 47
- 13
+ 61
+ 16
@@ -141,9 +141,9 @@
- 6
+ 3
220
- 71
+ 81
20
@@ -196,7 +196,7 @@
230
120
- 111
+ 121
231
@@ -208,7 +208,7 @@
10
170
- 91
+ 101
51
diff --git a/~$210 ГТБВ.431134.029РЭ.doc b/~$210 ГТБВ.431134.029РЭ.doc
new file mode 100644
index 0000000..1ee331e
Binary files /dev/null and b/~$210 ГТБВ.431134.029РЭ.doc differ
diff --git a/А1210 ГТБВ.431134.029РЭ.doc b/А1210 ГТБВ.431134.029РЭ.doc
new file mode 100644
index 0000000..bf4ce76
Binary files /dev/null and b/А1210 ГТБВ.431134.029РЭ.doc differ