From 00f297c4a2add037dc6904716c10d91dba4bb8d5 Mon Sep 17 00:00:00 2001 From: shrest_s Date: Mon, 29 Aug 2022 14:13:18 +0200 Subject: [PATCH 1/4] Screen size with scroll bar --- python/app/g2panel.ui | 2162 +++++++++++++++++++++-------------------- 1 file changed, 1096 insertions(+), 1066 deletions(-) diff --git a/python/app/g2panel.ui b/python/app/g2panel.ui index cac5329..5aa96a2 100644 --- a/python/app/g2panel.ui +++ b/python/app/g2panel.ui @@ -6,1059 +6,1093 @@ 0 0 - 1436 - 1018 + 1455 + 1043 - Gotthard2 GUI + MainWindow - - - - 420 - 40 - 1001 - 611 - - - - - - - 10 - 10 - 401 - 741 - - - - 0 - - - - Detector Settings - - - - - 10 - 88 - 121 - 31 - - - - - 50 - false - - - - Exposure Time : - - - - - - 160 - 90 - 101 - 31 - - - - Set Exposure Time + + + + + QFrame::NoFrame - - 4 - - - 0.000000000000000 - - - 9999999.000000000000000 - - - - - - 300 - 90 - 78 - 29 - - - - Select unit of Time - - - 0 - - - - ms - - - - - μs - - - - - ns - - - - - - - 0 - 570 - 391 - 121 - + + true - - - - 10 - 10 - 61 - 19 - - - - - 50 - false - - - - File Path - - - + - 90 + 0 0 - 291 - 36 - - - - - - - Enter File Path - - - - - - 10 - 38 - 71 - 31 - - - - - 50 - false - - - - File Name - - - - - - 90 - 40 - 201 - 36 - - - - - - - Enter File Name - - - - - - 10 - 90 - 41 - 19 - - - - - 50 - false - - - - Index - - - - - - 90 - 80 - 61 - 31 - - - - - - - 999 - - - - - - - 10 - 138 - 121 - 31 - - - - - 50 - false - - - - Period : - - - - - - 160 - 140 - 101 - 31 - - - - Set Period - - - 4 - - - 0.000000000000000 - - - 9999999.000000000000000 - - - 0.000000000000000 - - - - - - 160 - 290 - 101 - 31 - - - - Set The delay after trigger - - - 4 - - - 0.000000000000000 - - - 9999999.000000000000000 - - - 0.000000000000000 - - - - - - 10 - 188 - 121 - 31 - - - - - 50 - false - - - - # Frames : - - - - - - 10 - 238 - 121 - 31 - - - - - 50 - false - - - - # Triggers : - - - - - - 10 - 440 - 121 - 31 - - - - - 50 - false - - - - High Voltage : - - - - - - 270 - 448 - 51 - 21 - - - - - 75 - true - - - - V - - - - - - 300 - 140 - 78 - 29 - - - - Select unit of Time - - - - ms - - - - - μs - - - - - ns - - - - - - - 300 - 290 - 78 - 29 - - - - Select unit of Time - - - - ms - - - - - μs - - - - - ns - - - - - - - 0 - 529 - 391 - 41 - - - - - - 10 - 10 - 81 - 19 - - - - - 50 - false - - - - Save File? - - - - - - 170 - 10 - 111 - 24 - - - - Yes - - - true - - - - - - 310 - 10 - 81 - 24 - - - - No - - - - - - - 0 - 330 - 391 - 101 - - - - - - 160 - 70 - 111 - 24 - - - - fixed G2 - - - - - - 10 - 10 - 81 - 21 - - - - - 50 - false - - - - Gain : - - - - - - 160 - 10 - 111 - 24 - - - - Dynamic - - - true - - - - - - 160 - 40 - 111 - 24 - - - - fixed G1 - - - - - - - 0 - 10 - 391 - 80 - - - - - - 290 - 40 - 81 - 24 - - - - Trigger - - - - - - 10 - 40 - 101 - 19 - - - - - 50 - false - - - - Timing Modes : - - - - - - 160 - 40 - 71 - 24 + 1438 + 968 - - Auto - - - true - - - - - - - 10 - 290 - 141 - 31 - - - - - 50 - false - - - - Delay after Trigger : - - - - - - 160 - 190 - 101 - 31 - - - - 100000000 - - - - - - 160 - 240 - 101 - 31 - - - - 100000000 - - - - - - 160 - 440 - 101 - 31 - - - - 100000000 - - - - - - Plot Settings - - - - - 20 - 30 - 121 - 19 - - - - - 50 - false - - - - X min : - - - - - - 20 - 80 - 121 - 19 - - - - - 50 - false - - - - X max : - - - - - - 20 - 130 - 121 - 19 - - - - - 50 - false - - - - Y min : - - - - - - 20 - 180 - 121 - 19 - - - - - 50 - false - - - - Y max : - - - - - - 20 - 230 - 121 - 19 - - - - - 50 - false - - - - Refresh Rate : - - - - - - 160 - 20 - 113 - 31 - - - - - - - 0 - - - 5 - - - - - - - - - 160 - 70 - 113 - 31 - - - - 1280 - - - 5 - - - - - - 160 - 120 - 113 - 31 - - - - - - - 0 - - - 5 - - - - - - 160 - 170 - 113 - 31 - - - - 4095 - - - 5 - - - - - - 160 - 220 - 113 - 31 - - - - 1000 - - - 5 - - - - - - 20 - 270 - 161 - 31 - - - - Pedestal Correction - - - - - - 40 - 290 - 261 - 31 - - - - (first 100 frames as pedestal from zmq) - - - - - - 20 - 320 - 161 - 24 - - - - Mask bad Channels - - - - - - - - 10 - 900 - 1411 - 61 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - 130 - 10 - 1271 - 41 - - - - - - - 24 - - - - - - 20 - 10 - 103 - 41 - - - - - 75 - true - - - - Stop the Acquisition Process - - - background-color: rgb(202, 0, 0); - - - Stop - - - - - - 20 - 10 - 103 - 41 - - - - - 75 - true - - - - Start the Acquisition Process - - - background-color: rgb(0, 206, 99); - - - Start - - - - - - - 420 - 680 - 1001 - 191 - - - - - - - 30 - 780 - 361 - 51 - - - - - 75 - true - - - - Safely Power Off the Detectors after Experiments - - - false - - - background-color: rgb(202, 0, 0); + + + + + + 1420 + 950 + + + + QFrame::NoFrame + + + QFrame::Raised + + + + + 0 + 0 + 401 + 741 + + + + 0 + + + + Detector Settings + + + + + 10 + 88 + 121 + 31 + + + + + 50 + false + + + + Exposure Time : + + + + + + 160 + 90 + 101 + 31 + + + + Set Exposure Time + + + 4 + + + 0.000000000000000 + + + 9999999.000000000000000 + + + + + + 300 + 90 + 78 + 29 + + + + Select unit of Time + + + 0 + + + + ms + + + + + μs + + + + + ns + + + + + + + 0 + 570 + 391 + 121 + + + + + + 10 + 10 + 61 + 19 + + + + + 50 + false + + + + File Path + + + + + + 90 + 0 + 291 + 36 + + + + + + + Enter File Path + + + + + + 10 + 38 + 71 + 31 + + + + + 50 + false + + + + File Name + + + + + + 90 + 40 + 201 + 36 + + + + + + + Enter File Name + + + + + + 10 + 90 + 41 + 19 + + + + + 50 + false + + + + Index + + + + + + 90 + 80 + 61 + 31 + + + + + + + 999 + + + + + + + 10 + 138 + 121 + 31 + + + + + 50 + false + + + + Period : + + + + + + 160 + 140 + 101 + 31 + + + + Set Period + + + 4 + + + 0.000000000000000 + + + 9999999.000000000000000 + + + 0.000000000000000 + + + + + + 160 + 290 + 101 + 31 + + + + Set The delay after trigger + + + 4 + + + 0.000000000000000 + + + 9999999.000000000000000 + + + 0.000000000000000 + + + + + + 10 + 188 + 121 + 31 + + + + + 50 + false + + + + # Frames : + + + + + + 10 + 238 + 121 + 31 + + + + + 50 + false + + + + # Triggers : + + + + + + 10 + 440 + 121 + 31 + + + + + 50 + false + + + + High Voltage : + + + + + + 270 + 448 + 51 + 21 + + + + + 75 + true + + + + V + + + + + + 300 + 140 + 78 + 29 + + + + Select unit of Time + + + + ms + + + + + μs + + + + + ns + + + + + + + 300 + 290 + 78 + 29 + + + + Select unit of Time + + + + ms + + + + + μs + + + + + ns + + + + + + + 0 + 529 + 391 + 41 + + + + + + 10 + 10 + 81 + 19 + + + + + 50 + false + + + + Save File? + + + + + + 170 + 10 + 111 + 24 + + + + Yes + + + true + + + + + + 310 + 10 + 81 + 24 + + + + No + + + + + + + 0 + 330 + 391 + 101 + + + + + + 160 + 70 + 111 + 24 + + + + fixed G2 + + + + + + 10 + 10 + 81 + 21 + + + + + 50 + false + + + + Gain : + + + + + + 160 + 10 + 111 + 24 + + + + Dynamic + + + true + + + + + + 160 + 40 + 111 + 24 + + + + fixed G1 + + + + + + + 0 + 10 + 391 + 80 + + + + + + 290 + 40 + 81 + 24 + + + + Trigger + + + + + + 10 + 40 + 101 + 19 + + + + + 50 + false + + + + Timing Modes : + + + + + + 160 + 40 + 71 + 24 + + + + Auto + + + true + + + + + + + 10 + 290 + 141 + 31 + + + + + 50 + false + + + + Delay after Trigger : + + + + + + 160 + 190 + 101 + 31 + + + + 100000000 + + + + + + 160 + 240 + 101 + 31 + + + + 100000000 + + + + + + 160 + 440 + 101 + 31 + + + + 100000000 + + + + + + Plot Settings + + + + + 20 + 30 + 121 + 19 + + + + + 50 + false + + + + X min : + + + + + + 20 + 80 + 121 + 19 + + + + + 50 + false + + + + X max : + + + + + + 20 + 130 + 121 + 19 + + + + + 50 + false + + + + Y min : + + + + + + 20 + 180 + 121 + 19 + + + + + 50 + false + + + + Y max : + + + + + + 20 + 230 + 121 + 19 + + + + + 50 + false + + + + Refresh Rate : + + + + + + 160 + 20 + 113 + 31 + + + + + + + 0 + + + 5 + + + + + + + + + 160 + 70 + 113 + 31 + + + + 1280 + + + 5 + + + + + + 160 + 120 + 113 + 31 + + + + + + + 0 + + + 5 + + + + + + 160 + 170 + 113 + 31 + + + + 4095 + + + 5 + + + + + + 160 + 220 + 113 + 31 + + + + 1000 + + + 5 + + + + + + 20 + 270 + 161 + 31 + + + + Pedestal Correction + + + + + + 40 + 290 + 261 + 31 + + + + (first 100 frames as pedestal from zmq) + + + + + + 20 + 320 + 161 + 24 + + + + Mask bad Channels + + + + + + + + 410 + 30 + 1001 + 611 + + + + + + + 0 + 880 + 1411 + 61 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + 130 + 10 + 1271 + 41 + + + + + + + 24 + + + + + + 20 + 10 + 103 + 41 + + + + + 75 + true + + + + Stop the Acquisition Process + + + background-color: rgb(202, 0, 0); + + + Stop + + + + + + 20 + 10 + 103 + 41 + + + + + 75 + true + + + + Start the Acquisition Process + + + background-color: rgb(0, 206, 99); + + + Start + + + + + + + 410 + 670 + 1001 + 191 + + + + + + + 20 + 770 + 361 + 51 + + + + + 75 + true + + + + Safely Power Off the Detectors after Experiments + + + false + + + background-color: rgb(202, 0, 0); border-color: rgb(0, 0, 0); color: rgb(255, 255, 0); - - - Safely Power Off Detector and Exit - - - - - - 40 - 850 - 101 - 41 - - - - - 14 - - - - TextLabel - - + + + Safely Power Off Detector and Exit + + + + + + 30 + 840 + 101 + 41 + + + + + 14 + + + + TextLabel + + + + + + + + + 0 0 - 1436 + 1455 27 - - - Help - - - File @@ -1066,18 +1100,24 @@ color: rgb(255, 255, 0); + + + Help + + + - + - Save + Load Channel Mask - + - Open + About @@ -1085,16 +1125,6 @@ color: rgb(255, 255, 0); Exit - - - Load channel mask - - - - - About - - @@ -1113,12 +1143,12 @@ color: rgb(255, 255, 0); show() - 187 - 680 + 245 + 628 - 207 - 760 + 215 + 708 @@ -1133,8 +1163,8 @@ color: rgb(255, 255, 0); -1 - 715 - 514 + 727 + 521 @@ -1145,12 +1175,12 @@ color: rgb(255, 255, 0); hide() - 327 - 680 + 370 + 628 - 207 - 760 + 215 + 708 @@ -1161,12 +1191,12 @@ color: rgb(255, 255, 0); hide() - 81 - 957 + 89 + 955 - 81 - 957 + 89 + 955 @@ -1177,12 +1207,12 @@ color: rgb(255, 255, 0); show() - 81 - 957 + 89 + 955 - 81 - 957 + 89 + 955 @@ -1193,12 +1223,12 @@ color: rgb(255, 255, 0); show() - 81 - 957 + 89 + 955 - 81 - 957 + 89 + 955 From 4b0509959a57664dfe61ac7ad03030adeec6d3f9 Mon Sep 17 00:00:00 2001 From: shrest_s Date: Mon, 29 Aug 2022 14:17:27 +0200 Subject: [PATCH 2/4] Windows title --- python/app/g2panel.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app/g2panel.ui b/python/app/g2panel.ui index 5aa96a2..482a6e1 100644 --- a/python/app/g2panel.ui +++ b/python/app/g2panel.ui @@ -11,7 +11,7 @@ - MainWindow + Gotthard2 GUI From 2697a04764f802d1feea026fb0237b640d582197 Mon Sep 17 00:00:00 2001 From: shrest_s Date: Mon, 29 Aug 2022 14:19:53 +0200 Subject: [PATCH 3/4] Windows size --- python/app/g2panel.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app/g2panel.ui b/python/app/g2panel.ui index 482a6e1..e3e727b 100644 --- a/python/app/g2panel.ui +++ b/python/app/g2panel.ui @@ -7,7 +7,7 @@ 0 0 1455 - 1043 + 1040 From 74421aaa14be6012c0fbfb6004adc796b3f215ef Mon Sep 17 00:00:00 2001 From: shrest_s Date: Mon, 29 Aug 2022 16:34:50 +0200 Subject: [PATCH 4/4] Changing button state in case of packetloss --- python/app/g2panel | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python/app/g2panel b/python/app/g2panel index a09b96c..bdd4b72 100755 --- a/python/app/g2panel +++ b/python/app/g2panel @@ -304,6 +304,9 @@ class MainWindow(QtWidgets.QMainWindow): self.progress_timer.stop() self.plot_timer.stop() self.rcv.stop() + #Incase of packet loss + self.stopButton.hide() + self.startButton.show() if p_int == 100: self.progress_timer.stop()