Skip to content

Commit 50c06dd

Browse files
c-morleyc-morley
committed
qtvcp -basic probe: add probe LED, adjust motion type label
Can't seem to get the label perfect...
1 parent cbdb967 commit 50c06dd

1 file changed

Lines changed: 155 additions & 13 deletions

File tree

‎share/qtvcp/widgets_ui/basic_probe.ui‎

Lines changed: 155 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</property>
100100
<layout class="QVBoxLayout" name="verticalLayout_38">
101101
<property name="spacing">
102-
<number>4</number>
102+
<number>2</number>
103103
</property>
104104
<property name="leftMargin">
105105
<number>4</number>
@@ -231,7 +231,7 @@ HELP</string>
231231
<item>
232232
<layout class="QHBoxLayout" name="horizontalLayout_33">
233233
<property name="spacing">
234-
<number>4</number>
234+
<number>0</number>
235235
</property>
236236
<property name="topMargin">
237237
<number>0</number>
@@ -981,7 +981,7 @@ HELP</string>
981981
</layout>
982982
</item>
983983
<item>
984-
<layout class="QHBoxLayout" name="horizontalLayout_2">
984+
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,0,0">
985985
<property name="spacing">
986986
<number>4</number>
987987
</property>
@@ -991,7 +991,7 @@ HELP</string>
991991
<item>
992992
<widget class="QLabel" name="label_63">
993993
<property name="sizePolicy">
994-
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
994+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
995995
<horstretch>0</horstretch>
996996
<verstretch>0</verstretch>
997997
</sizepolicy>
@@ -1005,7 +1005,7 @@ HELP</string>
10051005
<property name="maximumSize">
10061006
<size>
10071007
<width>100</width>
1008-
<height>15</height>
1008+
<height>35</height>
10091009
</size>
10101010
</property>
10111011
<property name="text">
@@ -1019,7 +1019,7 @@ HELP</string>
10191019
<item>
10201020
<widget class="QLineEdit" name="lineEdit_extra_depth">
10211021
<property name="sizePolicy">
1022-
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
1022+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
10231023
<horstretch>0</horstretch>
10241024
<verstretch>0</verstretch>
10251025
</sizepolicy>
@@ -1091,7 +1091,7 @@ HELP</string>
10911091
<item>
10921092
<widget class="QLineEdit" name="lineEdit_side_edge_length">
10931093
<property name="sizePolicy">
1094-
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
1094+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
10951095
<horstretch>0</horstretch>
10961096
<verstretch>0</verstretch>
10971097
</sizepolicy>
@@ -1123,18 +1123,57 @@ HELP</string>
11231123
</item>
11241124
<item>
11251125
<layout class="QHBoxLayout" name="horizontalLayout_4">
1126+
<property name="spacing">
1127+
<number>4</number>
1128+
</property>
11261129
<item>
11271130
<widget class="QLabel" name="label_10">
1131+
<property name="sizePolicy">
1132+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
1133+
<horstretch>0</horstretch>
1134+
<verstretch>0</verstretch>
1135+
</sizepolicy>
1136+
</property>
1137+
<property name="minimumSize">
1138+
<size>
1139+
<width>100</width>
1140+
<height>28</height>
1141+
</size>
1142+
</property>
1143+
<property name="maximumSize">
1144+
<size>
1145+
<width>100</width>
1146+
<height>35</height>
1147+
</size>
1148+
</property>
11281149
<property name="text">
11291150
<string>MOTION TYPE</string>
11301151
</property>
11311152
<property name="alignment">
1132-
<set>Qt::AlignCenter</set>
1153+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
11331154
</property>
11341155
</widget>
11351156
</item>
11361157
<item>
11371158
<widget class="StatusLabel" name="statuslabel_motiontype">
1159+
<property name="sizePolicy">
1160+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
1161+
<horstretch>0</horstretch>
1162+
<verstretch>0</verstretch>
1163+
</sizepolicy>
1164+
</property>
1165+
<property name="minimumSize">
1166+
<size>
1167+
<width>60</width>
1168+
<height>28</height>
1169+
</size>
1170+
</property>
1171+
<property name="maximumSize">
1172+
<size>
1173+
<width>80</width>
1174+
<height>35</height>
1175+
</size>
1176+
</property>
11381177
<property name="text">
11391178
<string>100.0</string>
11401179
</property>
@@ -1156,6 +1195,96 @@ HELP</string>
11561195
<property name="motion_type_status" stdset="0">
11571196
<bool>true</bool>
11581197
</property>
1198+
<property name="motion_type_list" stdset="0">
1199+
<stringlist>
1200+
<string> </string>
1201+
<string>Rapid</string>
1202+
<string>Feed</string>
1203+
<string>Arc</string>
1204+
<string>Tool Change</string>
1205+
<string>Probe</string>
1206+
<string>Rotaty Index</string>
1207+
</stringlist>
1208+
</property>
1209+
</widget>
1210+
</item>
1211+
<item>
1212+
<spacer name="horizontalSpacer_21">
1213+
<property name="orientation">
1214+
<enum>Qt::Horizontal</enum>
1215+
</property>
1216+
<property name="sizeType">
1217+
<enum>QSizePolicy::Preferred</enum>
1218+
</property>
1219+
<property name="sizeHint" stdset="0">
1220+
<size>
1221+
<width>40</width>
1222+
<height>20</height>
1223+
</size>
1224+
</property>
1225+
</spacer>
1226+
</item>
1227+
<item>
1228+
<widget class="QLabel" name="label_9">
1229+
<property name="sizePolicy">
1230+
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
1231+
<horstretch>0</horstretch>
1232+
<verstretch>0</verstretch>
1233+
</sizepolicy>
1234+
</property>
1235+
<property name="minimumSize">
1236+
<size>
1237+
<width>100</width>
1238+
<height>0</height>
1239+
</size>
1240+
</property>
1241+
<property name="maximumSize">
1242+
<size>
1243+
<width>100</width>
1244+
<height>16777215</height>
1245+
</size>
1246+
</property>
1247+
<property name="text">
1248+
<string>PROBE </string>
1249+
</property>
1250+
<property name="alignment">
1251+
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
1252+
</property>
1253+
</widget>
1254+
</item>
1255+
<item>
1256+
<widget class="StateLED" name="led_probe">
1257+
<property name="sizePolicy">
1258+
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
1259+
<horstretch>0</horstretch>
1260+
<verstretch>0</verstretch>
1261+
</sizepolicy>
1262+
</property>
1263+
<property name="minimumSize">
1264+
<size>
1265+
<width>60</width>
1266+
<height>0</height>
1267+
</size>
1268+
</property>
1269+
<property name="maximumSize">
1270+
<size>
1271+
<width>80</width>
1272+
<height>16777215</height>
1273+
</size>
1274+
</property>
1275+
<property name="color">
1276+
<color>
1277+
<red>0</red>
1278+
<green>255</green>
1279+
<blue>0</blue>
1280+
</color>
1281+
</property>
1282+
<property name="follow_halpin_state" stdset="0">
1283+
<bool>true</bool>
1284+
</property>
1285+
<property name="halpin_name" stdset="0">
1286+
<string>motion.probe-input</string>
1287+
</property>
11591288
</widget>
11601289
</item>
11611290
</layout>
@@ -1181,9 +1310,12 @@ HELP</string>
11811310
<property name="orientation">
11821311
<enum>Qt::Horizontal</enum>
11831312
</property>
1313+
<property name="sizeType">
1314+
<enum>QSizePolicy::MinimumExpanding</enum>
1315+
</property>
11841316
<property name="sizeHint" stdset="0">
11851317
<size>
1186-
<width>10</width>
1318+
<width>5</width>
11871319
<height>20</height>
11881320
</size>
11891321
</property>
@@ -1216,7 +1348,7 @@ HELP</string>
12161348
<enum>QFrame::Plain</enum>
12171349
</property>
12181350
<property name="currentIndex">
1219-
<number>4</number>
1351+
<number>5</number>
12201352
</property>
12211353
<widget class="QWidget" name="outside_corners">
12221354
<property name="sizePolicy">
@@ -6135,6 +6267,16 @@ Y ERROR</string>
61356267
<extends>IndicatedPushButton</extends>
61366268
<header>qtvcp.widgets.simple_widgets</header>
61376269
</customwidget>
6270+
<customwidget>
6271+
<class>LED</class>
6272+
<extends>QWidget</extends>
6273+
<header>qtvcp.widgets.led_widget</header>
6274+
</customwidget>
6275+
<customwidget>
6276+
<class>StateLED</class>
6277+
<extends>LED</extends>
6278+
<header>qtvcp.widgets.state_led</header>
6279+
</customwidget>
61386280
<customwidget>
61396281
<class>StatusLabel</class>
61406282
<extends>QLabel</extends>
@@ -6149,12 +6291,12 @@ Y ERROR</string>
61496291
<resources/>
61506292
<connections/>
61516293
<buttongroups>
6152-
<buttongroup name="clear_buttonGroup"/>
6294+
<buttongroup name="inside_buttonGroup"/>
6295+
<buttongroup name="skew_buttonGroup"/>
61536296
<buttongroup name="cal_buttonGroup"/>
61546297
<buttongroup name="ridge_valley_buttonGroup"/>
61556298
<buttongroup name="boss_pocket_buttonGroup"/>
6299+
<buttongroup name="clear_buttonGroup"/>
61566300
<buttongroup name="outside_buttonGroup"/>
6157-
<buttongroup name="inside_buttonGroup"/>
6158-
<buttongroup name="skew_buttonGroup"/>
61596301
</buttongroups>
61606302
</ui>

0 commit comments

Comments
 (0)