Skip to content

Commit 663f191

Browse files
serhmarchserhmarch
committed
Fixed for Linux
1 parent 3e6deb1 commit 663f191

File tree

7 files changed

+50
-42
lines changed

7 files changed

+50
-42
lines changed

‎modbus‎

Submodule modbus updated 33 files

‎src/client/gui/sendmessage/client_sendmessageui.ui‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>482</width>
10-
<height>704</height>
9+
<width>527</width>
10+
<height>751</height>
1111
</rect>
1212
</property>
13+
<property name="minimumSize">
14+
<size>
15+
<width>520</width>
16+
<height>0</height>
17+
</size>
18+
</property>
1319
<property name="windowTitle">
1420
<string>Send Message</string>
1521
</property>
16-
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,1,0,0,0,0">
22+
<layout class="QVBoxLayout" name="verticalLayout">
1723
<item>
1824
<widget class="QGroupBox" name="grCommonParams">
1925
<property name="title">
@@ -61,18 +67,18 @@
6167
<property name="title">
6268
<string>Write Data (comma-separated)</string>
6369
</property>
64-
<layout class="QFormLayout" name="formLayout_4">
65-
<item row="1" column="0">
66-
<layout class="QFormLayout" name="formLayout_5">
70+
<layout class="QFormLayout" name="formLayout_8">
71+
<item row="0" column="0">
72+
<layout class="QFormLayout" name="formLayout_9">
6773
<item row="1" column="0">
68-
<widget class="QLabel" name="label_14">
74+
<widget class="QLabel" name="label_21">
6975
<property name="text">
7076
<string>Address:</string>
7177
</property>
7278
</widget>
7379
</item>
7480
<item row="1" column="1">
75-
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,1">
81+
<layout class="QHBoxLayout" name="horizontalLayout_9" stretch="0,1">
7682
<item>
7783
<widget class="QComboBox" name="cmbWriteAdrType">
7884
<property name="sizePolicy">
@@ -108,7 +114,7 @@
108114
</layout>
109115
</item>
110116
<item row="2" column="0">
111-
<widget class="QLabel" name="label_15">
117+
<widget class="QLabel" name="label_22">
112118
<property name="text">
113119
<string>Count:</string>
114120
</property>
@@ -131,7 +137,7 @@
131137
</widget>
132138
</item>
133139
<item row="0" column="0">
134-
<widget class="QLabel" name="label_13">
140+
<widget class="QLabel" name="label_23">
135141
<property name="text">
136142
<string>Format:</string>
137143
</property>
@@ -142,7 +148,7 @@
142148
</item>
143149
</layout>
144150
</item>
145-
<item row="1" column="1">
151+
<item row="0" column="1">
146152
<widget class="QStackedWidget" name="swWriteData">
147153
<property name="currentIndex">
148154
<number>1</number>

‎src/modbus‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit fb2c8a18a81b6e1785e1d9de9c08c4010dab5004

‎src/server/gui/dialogs/settings/server_modelsettingsscripteditorcolors.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ class mbServerModelSettingsScriptEditorColors : public QAbstractTableModel
1616
type(ftype),
1717
name(mbServerScriptHighlighter::toString(ftype))
1818
{}
19-
20-
const mbServerScriptHighlighter::ColorFormatType type;
21-
const QString name;
19+
mbServerScriptHighlighter::ColorFormatType type;
20+
QString name;
2221
QColor color;
2322
};
2423

‎src/server/gui/dialogs/settings/server_widgetsettingsscript.ui‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,35 @@
3838
<attribute name="title">
3939
<string>Runtime</string>
4040
</attribute>
41-
<widget class="QCheckBox" name="chbScriptEnable">
42-
<property name="geometry">
43-
<rect>
44-
<x>10</x>
45-
<y>10</y>
46-
<width>151</width>
47-
<height>22</height>
48-
</rect>
49-
</property>
50-
<property name="text">
51-
<string>Enable Python Script</string>
52-
</property>
53-
</widget>
54-
<widget class="QCheckBox" name="chbScriptUseOptimization">
55-
<property name="geometry">
56-
<rect>
57-
<x>10</x>
58-
<y>40</y>
59-
<width>151</width>
60-
<height>22</height>
61-
</rect>
62-
</property>
63-
<property name="text">
64-
<string>Use Optimization</string>
65-
</property>
66-
</widget>
41+
<layout class="QVBoxLayout" name="verticalLayout_5">
42+
<item>
43+
<widget class="QCheckBox" name="chbScriptEnable">
44+
<property name="text">
45+
<string>Enable Python Script</string>
46+
</property>
47+
</widget>
48+
</item>
49+
<item>
50+
<widget class="QCheckBox" name="chbScriptUseOptimization">
51+
<property name="text">
52+
<string>Use Optimization</string>
53+
</property>
54+
</widget>
55+
</item>
56+
<item>
57+
<spacer name="verticalSpacer_2">
58+
<property name="orientation">
59+
<enum>Qt::Vertical</enum>
60+
</property>
61+
<property name="sizeHint" stdset="0">
62+
<size>
63+
<width>20</width>
64+
<height>40</height>
65+
</size>
66+
</property>
67+
</spacer>
68+
</item>
69+
</layout>
6770
</widget>
6871
<widget class="QWidget" name="tabEditor">
6972
<attribute name="title">

src/server/python/mbServer.py renamed to src/server/python/mbserver.py

File renamed without changes.

‎src/server/runtime/server_runscriptthread.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ QString mbServerRunScriptThread::getImportPath()
326326
QString projectPath = project->absoluteDirPath();
327327
pathList.append(projectPath);
328328
pathList.append(QCoreApplication::applicationDirPath()+QStringLiteral("/script/server"));
329-
pathList.append(QStringLiteral("c:/Users/march/Dropbox/PRJ/ModbusTools/src/server/python")); // Note: tmp
330329
QString res = pathList.join(";");
331330
return res;
332331
}

0 commit comments

Comments
 (0)