From bc528d6759fa109b11c91df94c4d67838b42ab43 Mon Sep 17 00:00:00 2001 From: germano2239 Date: Wed, 27 Jul 2022 13:30:57 +0200 Subject: [PATCH] wip gg --- .../{1.ini => termorestringente_923578.ini} | 0 designer_win.sh | 2 + src/ui/leak_step_editor/leak_step_editor.ui | 134 ++++++++----- .../recipe_spec_and_step_editor.ui | 9 +- src/ui/test/test.ui | 67 ++++++- src/ui/test_leak/test_leak.ui | 183 +++++++++++++----- src/ui/test_vision/test_vision.py | 2 +- .../vision_step_editor/vision_step_editor.ui | 5 + 8 files changed, 291 insertions(+), 111 deletions(-) rename config/vision/recipes/{1.ini => termorestringente_923578.ini} (100%) create mode 100644 designer_win.sh diff --git a/config/vision/recipes/1.ini b/config/vision/recipes/termorestringente_923578.ini similarity index 100% rename from config/vision/recipes/1.ini rename to config/vision/recipes/termorestringente_923578.ini diff --git a/designer_win.sh b/designer_win.sh new file mode 100644 index 0000000..11fefa5 --- /dev/null +++ b/designer_win.sh @@ -0,0 +1,2 @@ +#!/bin/bash +venv/Lib/site-packages/qt5_applications/Qt/bin/designer diff --git a/src/ui/leak_step_editor/leak_step_editor.ui b/src/ui/leak_step_editor/leak_step_editor.ui index 4582c8b..c6bb528 100644 --- a/src/ui/leak_step_editor/leak_step_editor.ui +++ b/src/ui/leak_step_editor/leak_step_editor.ui @@ -6,8 +6,8 @@ 0 0 - 845 - 194 + 987 + 210 @@ -16,6 +16,13 @@ + + + 10 + 50 + false + + Pre-Riempimento @@ -37,7 +44,7 @@ - Tempo + T0: Pre-riempimento @@ -58,7 +65,7 @@ - Pressione + P0: Pre-riempimento @@ -67,33 +74,57 @@ + + + 10 + 50 + false + + Test - + mbar - + + + + s + + + + + + + Q+ Limite superiore + + + + + + + T3: misura + + + + - Delta min + Q- Limite perdita - - - 9999 + + + 0 - - - - 9999 @@ -106,55 +137,38 @@ - + + + + 9999 + + + + mbar - - + + - Delta max + Pr: Pressione prova - - - - mbar - - - - - - - Tempo - - - - - - - 0 - + + 9999 - - + + - Pressione - - - - - - - s + mbar @@ -163,6 +177,13 @@ + + + 10 + 50 + false + + Riempimento @@ -170,14 +191,14 @@ - Soglia min + PR+ Pressione Max - Tempo + T1: Riempimento @@ -205,7 +226,7 @@ - Soglia max + PR- Pressione Min @@ -233,7 +254,7 @@ - Assestamento + T2: Assestamento @@ -256,6 +277,13 @@ + + + 10 + 50 + false + + Scarico @@ -263,14 +291,14 @@ - Tempo + FST: Tempo scarico - Pressione + FSL: Scarico Limite diff --git a/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui b/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui index b19b54e..f8eb4e2 100644 --- a/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui +++ b/src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.ui @@ -6,10 +6,15 @@ 0 0 - 330 - 163 + 739 + 190 + + + 10 + + Recipe Spec And Step Editor diff --git a/src/ui/test/test.ui b/src/ui/test/test.ui index f337b23..18f8721 100755 --- a/src/ui/test/test.ui +++ b/src/ui/test/test.ui @@ -6,8 +6,8 @@ 0 0 - 763 - 85 + 1003 + 255 @@ -16,6 +16,13 @@ + + + 12 + 75 + true + + @@ -66,6 +73,13 @@ 0 + + + 12 + 75 + true + + N. DISEGNO: @@ -91,6 +105,13 @@ 16777215 + + + 12 + 75 + true + + - @@ -116,6 +137,13 @@ 40 + + + 12 + 75 + true + + CAMBIA DISEGNO @@ -123,6 +151,13 @@ + + + 12 + 75 + true + + - @@ -145,6 +180,13 @@ 40 + + + 12 + 75 + true + + ANNULLA TEST @@ -152,6 +194,13 @@ + + + 12 + 75 + true + + PEZZI FATTI @@ -162,6 +211,13 @@ + + + 12 + 75 + true + + OPERATORE: @@ -182,6 +238,13 @@ + + + 12 + 75 + true + + - diff --git a/src/ui/test_leak/test_leak.ui b/src/ui/test_leak/test_leak.ui index 2cad037..f1b7a3d 100644 --- a/src/ui/test_leak/test_leak.ui +++ b/src/ui/test_leak/test_leak.ui @@ -6,8 +6,8 @@ 0 0 - 322 - 456 + 881 + 614 @@ -44,8 +44,8 @@ 255 - 0 - 0 + 112 + 114 @@ -116,8 +116,8 @@ 255 - 255 - 255 + 112 + 114 @@ -125,8 +125,8 @@ 255 - 0 - 0 + 112 + 114 @@ -190,8 +190,8 @@ 255 - 0 - 0 + 112 + 114 @@ -262,8 +262,8 @@ 255 - 255 - 255 + 112 + 114 @@ -271,8 +271,8 @@ 255 - 0 - 0 + 112 + 114 @@ -336,8 +336,8 @@ 255 - 0 - 0 + 112 + 114 @@ -408,8 +408,8 @@ 255 - 0 - 0 + 112 + 114 @@ -417,8 +417,8 @@ 255 - 0 - 0 + 112 + 114 @@ -470,21 +470,18 @@ - - Stop + + + 20 + 75 + true + - - - - - - - 0 - 0 - + + background-color:rgb(255, 112, 114); - SALVA IMMAGINE + STOP @@ -496,6 +493,13 @@ 0 + + + 12 + 75 + true + + FORZA ACCETTAZIONE @@ -503,12 +507,26 @@ + + + 12 + 75 + true + + - Stato + PROVA TENUTA + + + 12 + 75 + true + + Stato strumento @@ -519,6 +537,13 @@ + + + 12 + 75 + true + + Pressione del circuito @@ -529,6 +554,13 @@ + + + 12 + 75 + true + + Perdita @@ -567,6 +599,13 @@ + + + 12 + 75 + true + + Tipo di test @@ -577,6 +616,13 @@ + + + 12 + 75 + true + + Pressione regolatore @@ -594,8 +640,15 @@ + + + 12 + 75 + true + + - Fase diel test + Fase del test Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -611,6 +664,13 @@ + + + 12 + 75 + true + + Indice di sequenza del test @@ -671,9 +731,9 @@ - 0 + 85 255 - 0 + 127 @@ -743,18 +803,18 @@ - 255 + 85 255 - 255 + 127 - 0 + 85 255 - 0 + 127 @@ -817,9 +877,9 @@ - 0 + 85 255 - 0 + 127 @@ -889,18 +949,18 @@ - 255 + 85 255 - 255 + 127 - 0 + 85 255 - 0 + 127 @@ -963,9 +1023,9 @@ - 0 + 85 255 - 0 + 127 @@ -1035,18 +1095,18 @@ - 0 + 85 255 - 0 + 127 - 0 + 85 255 - 0 + 127 @@ -1098,8 +1158,18 @@ + + + 20 + 75 + true + + + + background-color:rgb(85, 255, 127); + - Start + AVVIA PROVA TENUTA @@ -1111,6 +1181,13 @@ 0 + + + 12 + 75 + true + + Risultato diff --git a/src/ui/test_vision/test_vision.py b/src/ui/test_vision/test_vision.py index 9d7b9e7..81646ad 100644 --- a/src/ui/test_vision/test_vision.py +++ b/src/ui/test_vision/test_vision.py @@ -22,7 +22,7 @@ class Test_Vision(Test_Test): self.components["galaxy_camera"].add_sources({"test_vision": self.request_frame}) self.request_frame_connection = self.components["vision"].out.connect(self.request_frame) # request new frame as soon as vision finishes self.get_connection = self.components["vision"].out.connect(self.get) - self.components["vision"].set_recipe(self.step.spec.get("recipe", "1.ini")) + self.components["vision"].set_recipe(self.step.spec.get("recipe", "termorestringente_923578.ini")) self.components["vision"].resume() self.components["galaxy_camera"].resume() self.request_frame.emit() # request first frame diff --git a/src/ui/vision_step_editor/vision_step_editor.ui b/src/ui/vision_step_editor/vision_step_editor.ui index 3602b6c..5842a40 100644 --- a/src/ui/vision_step_editor/vision_step_editor.ui +++ b/src/ui/vision_step_editor/vision_step_editor.ui @@ -16,6 +16,11 @@ + + + 10 + + Visione