Skip to content

Commit c0c0b02

Browse files
VorteX254jackrickettsEliasJRH
authored
Pid diagram #9 (#30)
* Add parts in ui for actuator states * Add partial functionality for actuator states Added functionality for the fire valve and the quick disconnect. Not sure how to actually test if they work. XV valves might need some extra functionality, as the names should change based on which valves are currently being used. That's my interpretation, at least. If that is not the case, code them in as is. * Added more valves Increased number of XV valves from 4 to 12 * Made log output bigger * Commented out stylesheets for later use * Changed if statement for actuator state header * More comments * Rebase completed * Add parts in ui for actuator states Rebase done! * Added more valves Increased number of XV valves from 4 to 12 * Made log output bigger * Commented out stylesheets for later use * Changed if statement for actuator state header * Rebase completed * Added PID diagram and labels * Make P&I diagram a resource file * Update form.ui * Deleted duplicate UDP connection button at the bottom of ui * Remove comments --------- Co-authored-by: jackricketts <[email protected]> Co-authored-by: Elias Hawa <[email protected]>
1 parent 6ec3cd3 commit c0c0b02

File tree

6 files changed

+3454
-3
lines changed

6 files changed

+3454
-3
lines changed

Diff for: ‎form.ui

+211-1
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,9 @@
251251
<bold>true</bold>
252252
</font>
253253
</property>
254+
<property name="styleSheet">
255+
<string notr="true">background-color: rgb(255, 80, 80);</string>
256+
</property>
254257
<property name="text">
255258
<string>CLOSED</string>
256259
</property>
@@ -286,6 +289,9 @@
286289
<bold>true</bold>
287290
</font>
288291
</property>
292+
<property name="styleSheet">
293+
<string notr="true">background-color: rgb(255, 80, 80);</string>
294+
</property>
289295
<property name="text">
290296
<string>CLOSED</string>
291297
</property>
@@ -329,6 +335,9 @@
329335
<bold>true</bold>
330336
</font>
331337
</property>
338+
<property name="styleSheet">
339+
<string notr="true">background-color: rgb(255, 80, 80);</string>
340+
</property>
332341
<property name="text">
333342
<string>CLOSED</string>
334343
</property>
@@ -345,6 +354,9 @@
345354
<bold>true</bold>
346355
</font>
347356
</property>
357+
<property name="styleSheet">
358+
<string notr="true">background-color: rgb(255, 80, 80);</string>
359+
</property>
348360
<property name="text">
349361
<string>CLOSED</string>
350362
</property>
@@ -383,6 +395,9 @@
383395
<bold>true</bold>
384396
</font>
385397
</property>
398+
<property name="styleSheet">
399+
<string notr="true">background-color: rgb(255, 80, 80);</string>
400+
</property>
386401
<property name="text">
387402
<string>CLOSED</string>
388403
</property>
@@ -399,6 +414,9 @@
399414
<bold>true</bold>
400415
</font>
401416
</property>
417+
<property name="styleSheet">
418+
<string notr="true">background-color: rgb(255, 80, 80);</string>
419+
</property>
402420
<property name="text">
403421
<string>CLOSED</string>
404422
</property>
@@ -424,6 +442,9 @@
424442
<bold>true</bold>
425443
</font>
426444
</property>
445+
<property name="styleSheet">
446+
<string notr="true">background-color: rgb(255, 80, 80);</string>
447+
</property>
427448
<property name="text">
428449
<string>CLOSED</string>
429450
</property>
@@ -437,6 +458,9 @@
437458
<bold>true</bold>
438459
</font>
439460
</property>
461+
<property name="styleSheet">
462+
<string notr="true">background-color: rgb(255, 80, 80);</string>
463+
</property>
440464
<property name="text">
441465
<string>CLOSED</string>
442466
</property>
@@ -480,6 +504,12 @@
480504
<bold>true</bold>
481505
</font>
482506
</property>
507+
<property name="autoFillBackground">
508+
<bool>false</bool>
509+
</property>
510+
<property name="styleSheet">
511+
<string notr="true">background-color: rgb(255, 80, 80);</string>
512+
</property>
483513
<property name="text">
484514
<string>CLOSED</string>
485515
</property>
@@ -506,7 +536,7 @@
506536
<string>Fire Valve</string>
507537
</property>
508538
<property name="indent">
509-
<number>10</number>
539+
<number>-1</number>
510540
</property>
511541
</widget>
512542
</item>
@@ -530,6 +560,9 @@
530560
<bold>true</bold>
531561
</font>
532562
</property>
563+
<property name="styleSheet">
564+
<string notr="true">background-color: rgb(255, 80, 80);</string>
565+
</property>
533566
<property name="text">
534567
<string>CLOSED</string>
535568
</property>
@@ -543,6 +576,9 @@
543576
<bold>true</bold>
544577
</font>
545578
</property>
579+
<property name="styleSheet">
580+
<string notr="true">background-color: rgb(255, 80, 80);</string>
581+
</property>
546582
<property name="text">
547583
<string>CLOSED</string>
548584
</property>
@@ -556,6 +592,9 @@
556592
<bold>true</bold>
557593
</font>
558594
</property>
595+
<property name="styleSheet">
596+
<string notr="true">background-color: rgb(255, 80, 80);</string>
597+
</property>
559598
<property name="text">
560599
<string>CLOSED</string>
561600
</property>
@@ -587,6 +626,9 @@
587626
<bold>true</bold>
588627
</font>
589628
</property>
629+
<property name="styleSheet">
630+
<string notr="true">background-color: rgb(255, 80, 80);</string>
631+
</property>
590632
<property name="text">
591633
<string>CLOSED</string>
592634
</property>
@@ -609,6 +651,9 @@
609651
<bold>true</bold>
610652
</font>
611653
</property>
654+
<property name="styleSheet">
655+
<string notr="true">background-color: rgb(255, 80, 80);</string>
656+
</property>
612657
<property name="text">
613658
<string>CLOSED</string>
614659
</property>
@@ -669,6 +714,9 @@
669714
<bold>true</bold>
670715
</font>
671716
</property>
717+
<property name="styleSheet">
718+
<string notr="true">background-color: rgb(255, 80, 80);</string>
719+
</property>
672720
<property name="text">
673721
<string>CLOSED</string>
674722
</property>
@@ -800,6 +848,168 @@
800848
<attribute name="title">
801849
<string>P&amp;&amp;ID</string>
802850
</attribute>
851+
<widget class="QLabel" name="pid_image">
852+
<property name="geometry">
853+
<rect>
854+
<x>0</x>
855+
<y>10</y>
856+
<width>1261</width>
857+
<height>691</height>
858+
</rect>
859+
</property>
860+
<property name="text">
861+
<string/>
862+
</property>
863+
<property name="pixmap">
864+
<pixmap resource="resources.qrc">:/images/P&amp;I diagram</pixmap>
865+
</property>
866+
<property name="scaledContents">
867+
<bool>true</bool>
868+
</property>
869+
</widget>
870+
<widget class="QLabel" name="cv1State_tabpid">
871+
<property name="geometry">
872+
<rect>
873+
<x>940</x>
874+
<y>390</y>
875+
<width>74</width>
876+
<height>37</height>
877+
</rect>
878+
</property>
879+
<property name="minimumSize">
880+
<size>
881+
<width>50</width>
882+
<height>0</height>
883+
</size>
884+
</property>
885+
<property name="font">
886+
<font>
887+
<pointsize>12</pointsize>
888+
<bold>true</bold>
889+
</font>
890+
</property>
891+
<property name="styleSheet">
892+
<string notr="true">background-color: rgb(255, 80, 80);</string>
893+
</property>
894+
<property name="text">
895+
<string>CLOSED</string>
896+
</property>
897+
<property name="alignment">
898+
<set>Qt::AlignmentFlag::AlignCenter</set>
899+
</property>
900+
</widget>
901+
<widget class="QLabel" name="xv1State_tabpid">
902+
<property name="geometry">
903+
<rect>
904+
<x>280</x>
905+
<y>420</y>
906+
<width>74</width>
907+
<height>37</height>
908+
</rect>
909+
</property>
910+
<property name="font">
911+
<font>
912+
<pointsize>12</pointsize>
913+
<bold>true</bold>
914+
</font>
915+
</property>
916+
<property name="styleSheet">
917+
<string notr="true">background-color: rgb(255, 80, 80);</string>
918+
</property>
919+
<property name="text">
920+
<string>CLOSED</string>
921+
</property>
922+
<property name="indent">
923+
<number>8</number>
924+
</property>
925+
</widget>
926+
<widget class="QLabel" name="xv2State_tabpid">
927+
<property name="geometry">
928+
<rect>
929+
<x>400</x>
930+
<y>290</y>
931+
<width>74</width>
932+
<height>37</height>
933+
</rect>
934+
</property>
935+
<property name="minimumSize">
936+
<size>
937+
<width>50</width>
938+
<height>0</height>
939+
</size>
940+
</property>
941+
<property name="font">
942+
<font>
943+
<pointsize>12</pointsize>
944+
<bold>true</bold>
945+
</font>
946+
</property>
947+
<property name="styleSheet">
948+
<string notr="true">background-color: rgb(255, 80, 80);</string>
949+
</property>
950+
<property name="text">
951+
<string>CLOSED</string>
952+
</property>
953+
<property name="alignment">
954+
<set>Qt::AlignmentFlag::AlignCenter</set>
955+
</property>
956+
</widget>
957+
<widget class="QLabel" name="xv3State_tabpid">
958+
<property name="geometry">
959+
<rect>
960+
<x>500</x>
961+
<y>510</y>
962+
<width>74</width>
963+
<height>37</height>
964+
</rect>
965+
</property>
966+
<property name="font">
967+
<font>
968+
<pointsize>12</pointsize>
969+
<bold>true</bold>
970+
</font>
971+
</property>
972+
<property name="styleSheet">
973+
<string notr="true">background-color: rgb(255, 80, 80);</string>
974+
</property>
975+
<property name="text">
976+
<string>CLOSED</string>
977+
</property>
978+
<property name="indent">
979+
<number>8</number>
980+
</property>
981+
</widget>
982+
<widget class="QLabel" name="xv4State_tabpid">
983+
<property name="geometry">
984+
<rect>
985+
<x>730</x>
986+
<y>130</y>
987+
<width>74</width>
988+
<height>36</height>
989+
</rect>
990+
</property>
991+
<property name="minimumSize">
992+
<size>
993+
<width>50</width>
994+
<height>0</height>
995+
</size>
996+
</property>
997+
<property name="font">
998+
<font>
999+
<pointsize>12</pointsize>
1000+
<bold>true</bold>
1001+
</font>
1002+
</property>
1003+
<property name="styleSheet">
1004+
<string notr="true">background-color: rgb(255, 80, 80);</string>
1005+
</property>
1006+
<property name="text">
1007+
<string>CLOSED</string>
1008+
</property>
1009+
<property name="alignment">
1010+
<set>Qt::AlignmentFlag::AlignCenter</set>
1011+
</property>
1012+
</widget>
8031013
</widget>
8041014
</widget>
8051015
</item>

Diff for: ‎logos/PID hybrid.jpg

48.7 KB
Loading

0 commit comments

Comments
 (0)