diff --git a/slsDetectorGui/forms/form_detectormain.ui b/slsDetectorGui/forms/form_detectormain.ui index 756135ad4..1c61ef42f 100755 --- a/slsDetectorGui/forms/form_detectormain.ui +++ b/slsDetectorGui/forms/form_detectormain.ui @@ -10,7 +10,7 @@ 0 0 800 - 851 + 906 @@ -176,6 +176,7 @@ 395 + diff --git a/slsDetectorGui/forms/form_tab_advanced.ui b/slsDetectorGui/forms/form_tab_advanced.ui index 10b33d8ff..ad7cb9bd5 100755 --- a/slsDetectorGui/forms/form_tab_advanced.ui +++ b/slsDetectorGui/forms/form_tab_advanced.ui @@ -7,7 +7,7 @@ 0 0 775 - 351 + 345 @@ -35,1336 +35,1340 @@ :/icons/images/refresh.png:/icons/images/refresh.png - - - true - - - - 5 - 3 - 761 - 344 - - - - - - - QTabWidget::North - - - 3 - - - Qt::ElideLeft - - - - false - - - Logs - - - - - false - - - Trimming - - - - - 20 - 10 - 309 - 39 - - - - - - - Set All trimbits: - - - - - - - -1 - - - 63 - - - - - - - - - false - - - Region of Interest - - - - - 10 - 50 - 736 - 246 - - - - QFrame::NoFrame - - + + + + true - - - - 0 - 0 - 736 - 246 - + + + + + QTabWidget::North + + + 0 + + + Qt::ElideLeft + + + + false - - - 1 - - - 15 - + + Logs + + + + + + false + + + Trimming + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 450 + 20 + + + + + + + + Set All trimbits: + + + + + + + -1 + + + 63 + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 190 + + + + - - - - - 10 - 5 - 736 - 41 - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Add ROI Slot - - - - :/icons/images/add.png:/icons/images/add.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Set ROI - - - - :/icons/images/upload.png:/icons/images/upload.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Get ROI - - - - :/icons/images/download.png:/icons/images/download.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Clear ROI - - - - :/icons/images/erase.png:/icons/images/erase.png - - - - - - - - - Network - - - - - 19 - 10 - 724 - 300 - - - - - 6 + + + false - - - - - 0 - 0 - - - - Receiver TCP Port: - - - - - - - - 0 - 0 - - - - Detector UDP IP: - - - - - - - - 0 - 0 - - - - - 127 - 0 - - - - Sets Receiver TCP Port -#rx_tcpport# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - 0 - - - 2000000000 - - - 0 - - - - - - - - 0 - 0 - - - - Receiver UDP IP: - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Sets the detector IP to send packets to receiver -#detectorip# - - - - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Sets the detector MAC to send packets to receiver -#detectormac# - - - - - - - - - - - 0 - 0 - - - - Client ZMQ IP: - - - - - - - - 0 - 0 - - - - Receiver UDP MAC: - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Sets the Receiver Hostname, connects to it and gets the receiver mac address and eth. Sets some receiver parameters like file name, file dir, file index in receiver. + + Region of Interest + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Add ROI Slot + + + + :/icons/images/add.png:/icons/images/add.png + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Get ROI + + + + :/icons/images/download.png:/icons/images/download.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Set ROI + + + + :/icons/images/upload.png:/icons/images/upload.png + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Clear ROI + + + + :/icons/images/erase.png:/icons/images/erase.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + QFrame::NoFrame + + + true + + + + + 0 + 0 + 735 + 235 + + + + + 1 + + + 15 + + + + + + + + + + Network + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Sets the Receiver Hostname, connects to it and gets the receiver mac address and eth. Sets some receiver parameters like file name, file dir, file index in receiver. #rx_hostname# - - - none - - - - - - - - 0 - 0 - - - - Detector UDP MAC: - - - - - - - - 0 - 0 - - - - - 127 - 0 - - - - Sets Receiver UDP Port -#rx_udpport# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - 0 - - - 2000000000 - - - 0 - - - - - - - - 0 - 0 - - - - Receiver: - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Sets the Receiver UDP IP -#rx_udpip# - - - none - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - Detector Stop Port: - - - - - - - - 0 - 0 - - - - Detector Control Port: - - - - - - - - 0 - 0 - - - - - 108 - 0 - - - - Detector: - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - - 16777215 - 16777215 - - - - Sets Control Port + + + none + + + + + + + + 0 + 0 + + + + Receiver UDP IP: + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + + 16777215 + 16777215 + + + + Sets Control Port #port# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - 0 - - - 2000000000 - - - 0 - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Sets Stop Port -#stopport# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - 0 - - - 2000000000 - - - 0 - - - - - - - - 0 - 0 - - - - Client ZMQ Port: - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Sets Stop Port -#stopport# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - 0 - - - 2000000000 - - - 0 - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Sets the Receiver UDP MAC -#rx_udpmac# - - - none - - - - - - - - 0 - 0 - - - - Receiver Online Status: - - - - - - - - 0 - 0 - - - - - 108 - 0 - - - - Detector Online Status: - - - - - - - - 0 - 0 - - - - Receiver ZMQ Port: - - - - - - - - 0 - 0 - - - - Receiver UDP Port: - - - - - - - - 0 - 0 - - - - - 127 - 0 - - - - Sets Receiver UDP Port -#rx_udpport# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - 0 - - - 2000000000 - - - 0 - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Sets the detector IP to send packets to receiver -#detectorip# - - - - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Sets the Receiver UDP IP + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + 0 + + + 2000000000 + + + 0 + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Sets the Receiver UDP IP #rx_udpip# - - - - - - - - - - - 0 - 0 - - - - Receiver ZMQ IP: - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Gets the detector online status + + + none + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Sets the Receiver UDP MAC +#rx_udpmac# + + + none + + + + + + + + 0 + 0 + + + + + 108 + 0 + + + + Detector Online Status: + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Sets the detector MAC to send packets to receiver +#detectormac# + + + + + + + + + + + 0 + 0 + + + + + 127 + 0 + + + + Sets Receiver UDP Port +#rx_udpport# + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + 0 + + + 2000000000 + + + 0 + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Gets the detector online status #online# - - - - - - true - - - - - - - - 0 - 0 - - - - - 180 - 0 - - - - Gets the receiver online status + + + + + + true + + + + + + + + 0 + 0 + + + + + 127 + 0 + + + + Sets Receiver TCP Port +#rx_tcpport# + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + 0 + + + 2000000000 + + + 0 + + + + + + + + 0 + 0 + + + + Client ZMQ IP: + + + + + + + + 0 + 0 + + + + Receiver Online Status: + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Sets the detector IP to send packets to receiver +#detectorip# + + + + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Sets Stop Port +#stopport# + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + 0 + + + 2000000000 + + + 0 + + + + + + + + 0 + 0 + + + + Receiver ZMQ IP: + + + + + + + + 0 + 0 + + + + Receiver TCP Port: + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Sets Stop Port +#stopport# + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + 0 + + + 2000000000 + + + 0 + + + + + + + + 0 + 0 + + + + Receiver UDP Port: + + + + + + + + 0 + 0 + + + + + 127 + 0 + + + + Sets Receiver UDP Port +#rx_udpport# + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + 0 + + + 2000000000 + + + 0 + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Sets the Receiver UDP IP +#rx_udpip# + + + + + + + + + + + 0 + 0 + + + + Client ZMQ Port: + + + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Gets the receiver online status #r_online# - - - - - - true - - - - - - - - - Acquisition - - - - - 14 - 13 - 367 - 110 - - - - - - - false - - - - 0 - 0 - - - - <nobr> + + + + + + true + + + + + + + + 0 + 0 + + + + Detector Control Port: + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + + + + + + 0 + 0 + + + + Detector UDP MAC: + + + + + + + + 0 + 0 + + + + + 108 + 0 + + + + Detector: + + + + + + + + 0 + 0 + + + + Receiver ZMQ Port: + + + + + + + + 0 + 0 + + + + Receiver UDP MAC: + + + + + + + + 0 + 0 + + + + Detector UDP IP: + + + + + + + + 0 + 0 + + + + Detector Stop Port: + + + + + + + + 0 + 0 + + + + + 180 + 0 + + + + Sets the detector IP to send packets to receiver +#detectorip# + + + + + + + + + + + 0 + 0 + + + + Receiver: + + + + + + + + Acquisition + + + + + + false + + + <html><head/><body><p>Number of additional storage cells. For Jungfrau only. </p><p>Default: 0. </p><p>Number of Images received: #frames * #cycles * (#storagecells+1) </p><p> #storagecells#</p><p><br/></p></body></html> + + + Number of Storage cells: + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 190 + + + + + + + + false + + + + 0 + 0 + + + + <html><head/><body><p>Number of additional storage cells. For Jungfrau only. </p><p>Default: 0. </p><p>Number of Images received: #frames * #cycles * (#storagecells+1) </p><p> #storagecells#</p><p><br/></p></body></html> + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + -1 + + + 15 + + + 0 + + + + + + + false + + + + 0 + 0 + + + + <nobr> Exposure Time of a sub frame. Only for Eiger in 32 bit mode </nobr><br><nobr> #subexptime# </nobr> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - 9 - - - -1.000000000000000 - - - 2000000000.000000000000000 - - - 1.000000000000000 - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - false - - - <html><head/><body><p>Number of additional storage cells. For Jungfrau only. </p><p>Default: 0. </p><p>Number of Images received: #frames * #cycles * (#storagecells+1) </p><p> #storagecells#</p><p><br/></p></body></html> - - - Number of Storage cells: - - - - - - - false - - - <nobr> -Exposure Time of a sub frame. Only for Eiger in 32 bit mode -</nobr><br><nobr> - #subexptime# -</nobr> - - - Sub Frame Exposure Time: - - - - - - - false - - - - 0 - 0 - - - - <nobr> -Exposure Time of a sub frame. Only for Eiger in 32 bit mode -</nobr><br><nobr> - #subexptime# -</nobr> - - - Qt::LeftToRight - - - 2 - - - - hr - - - - min + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - s + + false - - - - ms + + 9 - - - - us + + -1.000000000000000 - - - - ns + + 2000000000.000000000000000 - - - - - - - false - - - - 0 - 0 - - - - <html><head/><body><p>Number of additional storage cells. For Jungfrau only. </p><p>Default: 0. </p><p>Number of Images received: #frames * #cycles * (#storagecells+1) </p><p> #storagecells#</p><p><br/></p></body></html> - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - -1 - - - 15 - - - 0 - - - - - - - false - - - <nobr> + + 1.000000000000000 + + + + + + + false + + + <nobr> Dead time between sub frames. Only for Eiger in 32 bit mode. </nobr><br><nobr> Default value is 0. A value less than the required minimum is ignored. </nobr><br><nobr> #subdeadtime# </nobr> - - - Sub Frame Dead Time: - - - - - - - false - - - - 0 - 0 - - - - <nobr> + + + Sub Frame Dead Time: + + + + + + + false + + + + 0 + 0 + + + + <nobr> Period between sub frames. Only for Eiger in 32 bit mode. </nobr><br><nobr> Default value is 0. A value less than the required minimum is ignored. </nobr><br><nobr> #subperiod# </nobr> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - 9 - - - -1.000000000000000 - - - 2000000000.000000000000000 - - - 1.000000000000000 - - - - - - - false - - - - 0 - 0 - - - - <nobr> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + 9 + + + -1.000000000000000 + + + 2000000000.000000000000000 + + + 1.000000000000000 + + + + + + + false + + + <nobr> +Exposure Time of a sub frame. Only for Eiger in 32 bit mode +</nobr><br><nobr> + #subexptime# +</nobr> + + + Sub Frame Exposure Time: + + + + + + + false + + + + 0 + 0 + + + + <nobr> Period between sub frames. Only for Eiger in 32 bit mode. </nobr><br><nobr> Default value is 0. A value less than the required minimum is ignored. </nobr><br><nobr> #subperiod# </nobr> - - - Qt::LeftToRight - - - 2 - - - - hr - - - - min + + Qt::LeftToRight - - - - s + + 2 - - - - ms + + + hr + + + + + min + + + + + s + + + + + ms + + + + + us + + + + + ns + + + + + + + + false - - - - us + + + 0 + 0 + - - - - ns + + <nobr> +Exposure Time of a sub frame. Only for Eiger in 32 bit mode +</nobr><br><nobr> + #subexptime# +</nobr> - - - - + + Qt::LeftToRight + + + 2 + + + + hr + + + + + min + + + + + s + + + + + ms + + + + + us + + + + + ns + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 350 + 20 + + + + + + - - + + - - tabAdvancedSettings - btnClearRoi - scrollArea - comboDetector - spinControlPort - spinStopPort - diff --git a/slsDetectorGui/forms/form_tab_dataoutput.ui b/slsDetectorGui/forms/form_tab_dataoutput.ui index f8751b1b4..45d4c5b59 100755 --- a/slsDetectorGui/forms/form_tab_dataoutput.ui +++ b/slsDetectorGui/forms/form_tab_dataoutput.ui @@ -24,665 +24,700 @@ - 1000 - 1000 + 775 + 365 Form - - - - 15 - 170 - 746 - 170 - - - - Options - - - - - 14 - 21 - 527 - 76 - - - - - 6 + + + + + false - - - - false - - - - 0 - 0 - - - - ns - - - -1 - - - 200000000 - - - 0 - - - - - - - false - - - Default Dead Time - - - - - - - false - - - Rate: - - - - - - - false - - - <nobr> -Compression using Root. Available only for Gotthard in Expert Mode. -</nobr><br><nobr> - #r_compression# -</nobr> - - - 10GbE - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - false - - - Custom Dead Time: - - - - - - - - false - - - - 3 - 92 - 547 - 72 - - - - - - 11 - 4 - 527 - 68 - + + File - - - - - - 200 - 16777215 - + + + + + + 0 + 0 + - - - Continous - - - - - Store in RAM - - - - - - - + 105 - 16777215 + 25 - - Clock Divider: - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - 200 - 16777215 - - - - - Full Speed - - - - - Half Speed - - - - - Quarter Speed - - - - - Qt::Horizontal + + + + 0 + 0 + - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - 105 + 16777215 16777215 + + + + + + + 2 + 2 + 2 + + + + + + + + + 0 + 0 + 0 + + + + + + + + + 119 + 119 + 119 + + + + + + + + <html><head/><body><p>Name of file. Can be modified in Measurement tab.<br/>#fname# <br/></p></body></html> + - Flags: + Name Prefix: - - - - - Parallel - - - - - Non Parallel - - - - - Safe - - - - - - - - - - - false - - - - 20 - 40 - 735 - 100 - - - - File - - - - - 12 - 20 - 714 - 70 - - - - - 4 - - - - - - 0 - 0 - - - - <nobr> + + + + + 0 + 0 + + + + <nobr> Directory where one saves the data. </nobr><br> #outdir# <br> Disabled if receiver pc is not same as client pc. - - - Browse - - - - :/icons/images/browse.png:/icons/images/browse.png - - - - - - - - 0 - 0 - - - - - 105 - 0 - - - - <html><head/><body><p>File Format<br/>#fileformat# <br/></p></body></html> - - - - Binary - - - HDF5 + Browse - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - 0 - 0 - - - - - 105 - 0 - - - - - - - - - 0 - 0 - - - - - 70 - 16777215 - - - - - - - - - 2 - 2 - 2 - - - - - - - - - 0 - 0 - 0 - - - - - - - - - 119 - 119 - 119 - - - - - - - - <nobr> + + + :/icons/images/browse.png:/icons/images/browse.png + + + + + + + + 0 + 0 + + + + + 70 + 16777215 + + + + + + + + + 2 + 2 + 2 + + + + + + + + + 0 + 0 + 0 + + + + + + + + + 119 + 119 + 119 + + + + + + + + <html><head/><body><p>File Format<br/>#fileformat# <br/></p></body></html> + + + Format: + + + + + + + + 0 + 0 + + + + + 105 + 25 + + + + <html><head/><body><p>File Format<br/>#fileformat# <br/></p></body></html> + + + + Binary + + + + + HDF5 + + + + + + + + + 0 + 0 + + + + + 70 + 16777215 + + + + + + + + + 2 + 2 + 2 + + + + + + + + + 0 + 0 + 0 + + + + + + + + + 119 + 119 + 119 + + + + + + + + <nobr> Directory where one saves the data. </nobr><br> #outdir# <br> - - - Path: - - - - - - - - 0 - 0 - - - - - 70 - 16777215 - - - - - - - - - 2 - 2 - 2 - - - - - - - - - 0 - 0 - 0 - - - - - - - - - 119 - 119 - 119 - - - - - - - - <html><head/><body><p>File Format<br/>#fileformat# <br/></p></body></html> - - - Format: - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Overwrite Enable + + + Path: + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + + 16777215 + 16777215 + + + + Qt::NoFocus + + + <html><head/><body><p>Name of file. Can be modified in Measurement tab.<br/>#fname# <br/></p></body></html> + + + false + + + QLineEdit::Normal + + + true + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Overwrite Enable #overwrite# - - - Overwrite - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - 0 - 0 - - - - - 75 - 16777215 - - - - - - - - - 2 - 2 - 2 - - - - - - - - - 0 - 0 - 0 - - - - - - - - - 119 - 119 - 119 - - - - - - - - <html><head/><body><p>Name of file. Can be modified in Measurement tab.<br/>#fname# <br/></p></body></html> - - - Name Prefix: - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Qt::NoFocus - - - <html><head/><body><p>Name of file. Can be modified in Measurement tab.<br/>#fname# <br/></p></body></html> - - - false - - - QLineEdit::Normal - - - true - - - - - - - Qt::StrongFocus - - - <nobr> + + + Overwrite + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + + 0 + 25 + + + + Qt::StrongFocus + + + <nobr> Directory where one saves the data. </nobr><br> #outdir# <br> - - - - - - + + + + + + + + + + Options + + + + + + false + + + Default Dead Time + + + + + + + false + + + <nobr> +Compression using Root. Available only for Gotthard in Expert Mode. +</nobr><br><nobr> + #r_compression# +</nobr> + + + 10GbE + + + + + + + false + + + + 0 + 0 + + + + + 0 + 25 + + + + ns + + + -1 + + + 200000000 + + + 0 + + + + + + + false + + + Rate: + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + false + + + Custom Dead Time: + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 10 + 20 + + + + + + + + false + + + + + + + 0 + 25 + + + + + 200 + 16777215 + + + + + Continous + + + + + Store in RAM + + + + + + + + + 0 + 25 + + + + + 200 + 16777215 + + + + + Full Speed + + + + + Half Speed + + + + + Quarter Speed + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 10 + 20 + + + + + + + + + 105 + 16777215 + + + + Flags: + + + + + + + + 0 + 25 + + + + + 200 + 16777215 + + + + + Parallel + + + + + Non Parallel + + + + + Safe + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + + 105 + 16777215 + + + + Clock Divider: + + + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + - - chkRate - diff --git a/slsDetectorGui/forms/form_tab_debugging.ui b/slsDetectorGui/forms/form_tab_debugging.ui index 36a31951c..4458caa08 100755 --- a/slsDetectorGui/forms/form_tab_debugging.ui +++ b/slsDetectorGui/forms/form_tab_debugging.ui @@ -31,272 +31,215 @@ Form - - - - 45 - 75 - 686 - 231 - - - - Qt::NoFocus - - - Tests - - - - - 15 - 110 - 149 - 58 - - - - - - - Qt::NoFocus - - - Module Firmware - - - - - - - Qt::NoFocus - - - Module Bus - - - - - - - - - 15 - 185 - 147 - 36 - - - - - - - - 0 - 0 - - - - Run Test - - - - :/icons/images/start.png:/icons/images/start.png - - - - - - - - - 15 - 30 - 276 - 32 - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 150 - 16777215 - - - - Module: - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - - 15 - 60 - 276 - 31 - - - - - - - - 0 - 0 - - - - - 150 - 16777215 - - - - Status: - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - 0 - 0 - - - - IDLE - - - - - - - - - 5 - 95 - 676 - 16 - - - - Qt::Horizontal - - - - - - - 45 - 25 - 686 - 34 - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Get ID Information - - - - :/icons/images/download.png:/icons/images/download.png - - - - - + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Get ID Information + + + + :/icons/images/download.png:/icons/images/download.png + + + + + + + Qt::NoFocus + + + Tests + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + + 0 + 0 + + + + + 150 + 16777215 + + + + Status: + + + + + + + + 0 + 0 + + + + Run Test + + + + :/icons/images/start.png:/icons/images/start.png + + + + + + + Qt::NoFocus + + + Module Firmware + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 150 + 16777215 + + + + Module: + + + + + + + Qt::NoFocus + + + Module Bus + + + + + + + + 0 + 0 + + + + IDLE + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + + Qt::Horizontal + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 450 + 20 + + + + + - - btnGetInfo - comboDetector - btnTest - diff --git a/slsDetectorGui/forms/form_tab_measurement.ui b/slsDetectorGui/forms/form_tab_measurement.ui index 79488a7f2..3fbffe22e 100755 --- a/slsDetectorGui/forms/form_tab_measurement.ui +++ b/slsDetectorGui/forms/form_tab_measurement.ui @@ -24,950 +24,1029 @@ - 1000 + 775 345 Form - - - - 21 - 130 - 319 - 103 - + + + 9 - - - 0 - 0 - - - - Progress Monitor - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - -2 - 67 - 319 - 23 - - - - 24 - - - - - - 1 - 25 - 96 - 16 - - - - Current Frame: - - - - - - 99 - 25 - 101 - 16 - - - - 0 - - - - - - 145 - 45 - 76 - 16 - - - - - 0 - 0 - - - - - 60 - 0 - - - - 0 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 1 - 45 - 146 - 16 - - - - Current Measurement: - - - - - - - 368 - 8 - 403 - 332 - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - 3 - 10 - 390 - 314 - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - false - - - - 0 - 0 - - - - <nobr> -Frame period between exposures. -</nobr><br><nobr> - #period# -</nobr> - - - Qt::LeftToRight - - - 2 - - - - hr - - - - - min - - - - - s - - - - - ms - - - - - us - - - - - ns - - - - - - - - - 0 - 0 - - - - Timing Mode of the detector. - #timing# - - - - Auto - - - - - Trigger Exposure Series - - - - - Gated with fixed number - - - - - Burst Trigger - - - - - - - - false - - - Number of Triggers to be expected. - #cycles# - - - Number of Triggers: - - - - - - - false - - - - 0 - 0 - - - - Number of Triggers to be expected. - #cycles# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - -1 - - - 2000000000 - - - 1 - - - - - - - false - - - The Delay between Trigger Edge and Start of Exposure ( or Readout). -#delay# - - - Delay After Trigger: - - - - - - - false - - - - 0 - 0 - - - - The Delay between Trigger Edge and Start of Exposure ( or Readout). -#delay# - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - 9 - - - -1.000000000000000 - - - 2000000000.000000000000000 - - - 0.000000000000000 - - - - - - - false - - - - 0 - 0 - - - - The Delay between Trigger Edge and Start of Exposure ( or Readout). -#delay# - - - Qt::LeftToRight - - - 2 - - - - hr - - - - - min - - - - - s - - - - - ms - - - - - us - - - - - ns - - - - - - - - false - - - Number of Frames: - - - - - - - false - - - - 0 - 0 - - - - Number of measurements (not in real time) that will be acquired. - #frames# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - -1 - - - 2000000000 - - - 1 - - - - - - - true - - - <nobr> -Exposure Time of a frame. -</nobr><br><nobr> - #exptime# -</nobr> - - - Exposure Time: - - - - - - - true - - - - 0 - 0 - - - - <nobr> -Exposure Time of a frame. -</nobr><br><nobr> - #exptime# -</nobr> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - 9 - - - -1.000000000000000 - - - 2000000000.000000000000000 - - - 1.000000000000000 - - - - - - - true - - - - 0 - 0 - - - - <nobr> -Exposure Time of a frame. -</nobr><br><nobr> - #exptime# -</nobr> - - - Qt::LeftToRight - - - 2 - - - - hr - - - - - min - - - - - s - - - - - ms - - - - - us - - - - - ns - - - - - - - - false - - - <nobr> -Frame period between exposures. -</nobr><br><nobr> - #period# -</nobr> - - - Acquisition Period: - - - - - - - false - - - - 0 - 0 - - - - <nobr> -Frame period between exposures. -</nobr><br><nobr> - #period# -</nobr> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - 9 - - - -1.000000000000000 - - - 2000000000.000000000000000 - - - 0.000000000000000 - - - - - - - Timing Mode: - - - - - - - false - - - Number of Triggers to be expected. - #cycles# - - - Number of Samples: - - - - - - - false - - - - 0 - 0 - - - - Number of Triggers to be expected. - #cycles# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - -1 - - - 2000000000 - - - 1 - - - - - - - Number of Measurements: - - - - - - - - 0 - 0 - - - - Number of measurements (not in real time) that will be acquired. - #frames# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - -1 - - - 2000000000 - - - 1 - - - - - - - - - - 10 - 5 - 336 - 96 - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - 10 - 13 - 321 - 76 - - - - - 6 + + + + QFrame::NoFrame - - - - - 0 - 0 - - - - Root of the file name - please check that the output directory is correctly set and select the file name format. - #fname# - - - - - - - - - - Run Index: - - - - - - - - 0 - 0 - - - - Run index (automatically incremented) + + QFrame::Plain + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 16777215 + 35 + + + + Qt::NoFocus + + + Starts Acquisition + + + Start + + + + :/icons/images/start.png:/icons/images/start.png + + + Shift+Space + + + false + + + false + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + true + + + + 0 + 0 + + + + + 16777215 + 35 + + + + Qt::NoFocus + + + Stops Acquisition + + + Stop + + + + :/icons/images/stop.png:/icons/images/stop.png + + + false + + + false + + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Progress Monitor + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + 18 + + + 18 + + + 18 + + + + + Current Frame: + + + + + + + Current Measurement: + + + + + + + + 0 + 0 + + + + + 60 + 0 + + + + 0 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + 0 + + + + + + + + 0 + 0 + + + + 24 + + + + + + + + + + + 0 + 120 + + + + + 16777215 + 16777215 + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + Run index (automatically incremented) #index# - - - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - - -1 - - - 2000000000 - - - 0 - - - - - - - <nobr>Sets output file name prefix</nobr><br> + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + -1 + + + 2000000000 + + + 0 + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + Root of the file name - please check that the output directory is correctly set and select the file name format. + #fname# + + + + + + + + + + Run Index: + + + + + + + <nobr>Sets output file name prefix</nobr><br> <nobr>Check the box to enable write to file. </nobr> - - - File Name: - - - true - - - - - - - - - - 20 - 270 - 318 - 34 - - - - - - - - 0 - 0 - + + + File Name: + + + true + + + + + + + + + + + 400 + 0 + + + + + 400 + 380 + + + + QFrame::NoFrame + + + QFrame::Plain + + + + 6 - - Qt::NoFocus + + 4 - - Starts Acquisition - - - Start - - - - :/icons/images/start.png:/icons/images/start.png - - - Shift+Space - - - false - - - false - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - true - - - - 0 - 0 - - - - - 90 - 16777215 - - - - Qt::NoFocus - - - Stops Acquisition - - - Stop - - - - :/icons/images/stop.png:/icons/images/stop.png - - - false - - - false - - - - - + + + + false + + + Number of Triggers to be expected. + #cycles# + + + Number of Triggers: + + + + + + + false + + + + 0 + 0 + + + + + 0 + 25 + + + + <nobr> +Frame period between exposures. +</nobr><br><nobr> + #period# +</nobr> + + + Qt::LeftToRight + + + 2 + + + + hr + + + + + min + + + + + s + + + + + ms + + + + + us + + + + + ns + + + + + + + + Timing Mode: + + + + + + + false + + + + 0 + 0 + + + + + 0 + 25 + + + + Number of Triggers to be expected. + #cycles# + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + -1 + + + 2000000000 + + + 1 + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + Number of measurements (not in real time) that will be acquired. + #frames# + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + -1 + + + 2000000000 + + + 1 + + + + + + + Number of Measurements: + + + + + + + false + + + Number of Triggers to be expected. + #cycles# + + + Number of Samples: + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + Timing Mode of the detector. + #timing# + + + + Auto + + + + + Trigger Exposure Series + + + + + Gated with fixed number + + + + + Burst Trigger + + + + + + + + false + + + The Delay between Trigger Edge and Start of Exposure ( or Readout). +#delay# + + + Delay After Trigger: + + + + + + + false + + + + 0 + 0 + + + + + 0 + 25 + + + + Number of Triggers to be expected. + #cycles# + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + -1 + + + 2000000000 + + + 1 + + + + + + + false + + + + 0 + 0 + + + + + 0 + 25 + + + + The Delay between Trigger Edge and Start of Exposure ( or Readout). +#delay# + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + 9 + + + -1.000000000000000 + + + 2000000000.000000000000000 + + + 0.000000000000000 + + + + + + + true + + + + 0 + 0 + + + + + 0 + 25 + + + + <nobr> +Exposure Time of a frame. +</nobr><br><nobr> + #exptime# +</nobr> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + 9 + + + -1.000000000000000 + + + 2000000000.000000000000000 + + + 1.000000000000000 + + + + + + + false + + + <nobr> +Frame period between exposures. +</nobr><br><nobr> + #period# +</nobr> + + + Acquisition Period: + + + + + + + false + + + Number of Frames: + + + + + + + true + + + <nobr> +Exposure Time of a frame. +</nobr><br><nobr> + #exptime# +</nobr> + + + Exposure Time: + + + + + + + false + + + + 0 + 0 + + + + + 0 + 25 + + + + Number of measurements (not in real time) that will be acquired. + #frames# + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + -1 + + + 2000000000 + + + 1 + + + + + + + false + + + + 0 + 0 + + + + + 0 + 25 + + + + The Delay between Trigger Edge and Start of Exposure ( or Readout). +#delay# + + + Qt::LeftToRight + + + 2 + + + + hr + + + + + min + + + + + s + + + + + ms + + + + + us + + + + + ns + + + + + + + + true + + + + 0 + 0 + + + + + 0 + 25 + + + + <nobr> +Exposure Time of a frame. +</nobr><br><nobr> + #exptime# +</nobr> + + + Qt::LeftToRight + + + 2 + + + + hr + + + + + min + + + + + s + + + + + ms + + + + + us + + + + + ns + + + + + + + + false + + + + 0 + 0 + + + + + 0 + 25 + + + + <nobr> +Frame period between exposures. +</nobr><br><nobr> + #period# +</nobr> + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + 9 + + + -1.000000000000000 + + + 2000000000.000000000000000 + + + 0.000000000000000 + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 30 + 20 + + + + + - - chkFile - dispFileName - spinIndex - comboTimingMode - spinNumFrames - spinExpTime - comboExpUnit - spinPeriod - comboPeriodUnit - spinNumTriggers - spinDelay - comboDelayUnit - diff --git a/slsDetectorGui/forms/form_tab_plot.ui b/slsDetectorGui/forms/form_tab_plot.ui index a882c7c57..1ddae0990 100755 --- a/slsDetectorGui/forms/form_tab_plot.ui +++ b/slsDetectorGui/forms/form_tab_plot.ui @@ -11,7 +11,7 @@ - + 0 0 @@ -24,8 +24,8 @@ - 1000 - 1000 + 775 + 345 @@ -68,2364 +68,2488 @@ Form - - - true + + + 6 - - - 400 - 61 - 351 - 67 - + + 6 - - 2D Plot Options 1 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - 12 - 22 - 334 - 39 - - - - 0 - - - - - - 8 - 0 - 317 - 36 - + + + + true + + + + 0 + 0 + + + + + 375 + 70 + + + + + 16777215 + 16777215 + + + + 2D Plot Options 1 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 4 - - - - - - 0 - 0 - - - - Interpolate - - - - - - - - 0 - 0 - - - - Contour - - - - - - - - 0 - 0 - - - - Log Scale (Z) - - - - - - - - - - - 9 - 0 - 314 - 35 - + + 0 - - - 0 - - - - - true - - - - 0 - 0 - - - - Accumulate - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 30 - 20 - - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - Qt::NoFocus - - - Reset Accumulation - - - - :/icons/images/calculate.png:/icons/images/calculate.png - - - - 24 - 24 - - - - - - - - - - - - 8 - 0 - 328 - 35 - + + 4 - - - 0 - - - - - true - - - - 0 - 0 - - - - Pedestal - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 60 - 20 - - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - Qt::NoFocus - - - Recalculate Pedestal - - - - :/icons/images/calculate.png:/icons/images/calculate.png - - - - 24 - 24 - - - - - - - - - - - - 10 - 0 - 313 - 36 - + + 0 - - - 1 - - - - - - 0 - 0 - - - - Binary - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - false - - - - 0 - 0 - - - - from - - - - - - - false - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - -16777215 - - - 16777215 - - - 0 - - - - - - - false - - - - 0 - 0 - - - - to - - - - - - - false - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - -16777215 - - - 16777215 - - - 0 - - - - - - - - - - - 9 - 0 - 322 - 35 - + + 2 - - - 0 - - - - - true - - - - 0 - 0 - - - - <nobr> + + 0 + + + + + + 0 + 0 + + + + + 16 + 16 + + + + Qt::NoFocus + + + + + + + :/icons/images/leftArrow.png:/icons/images/leftArrow.png + + + + 16 + 16 + + + + true + + + + + + + 0 + + + + + + + + 0 + 0 + + + + Interpolate + + + + + + + + 0 + 0 + + + + Contour + + + + + + + + 0 + 0 + + + + Log Scale (Z) + + + + + + + + + + + true + + + + 0 + 0 + + + + Accumulate + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 30 + 20 + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + Qt::NoFocus + + + Reset Accumulation + + + + :/icons/images/calculate.png:/icons/images/calculate.png + + + + 24 + 24 + + + + + + + + + + + + true + + + + 0 + 0 + + + + Pedestal + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 60 + 20 + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + Qt::NoFocus + + + Recalculate Pedestal + + + + :/icons/images/calculate.png:/icons/images/calculate.png + + + + 24 + 24 + + + + + + + + + + + + + 0 + 0 + + + + Binary + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 10 + 20 + + + + + + + + false + + + + 0 + 0 + + + + from + + + + + + + false + + + + 0 + 0 + + + + + 50 + 0 + + + + + 16777215 + 16777215 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + -16777215 + + + 16777215 + + + 0 + + + + + + + false + + + + 0 + 0 + + + + to + + + + + + + false + + + + 0 + 0 + + + + + 50 + 0 + + + + + 16777215 + 16777215 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + -16777215 + + + 16777215 + + + 0 + + + + + + + + + + + true + + + + 0 + 0 + + + + <nobr> Displays statistics, ie. minimum, maximum and sum of values for each plot. <nobr> - - - Display Statistics - + + + Display Statistics + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 80 + 20 + + + + + - - - - - false - - - - 0 - 0 - - - - <nobr> + + + + + + false + + + + 0 + 0 + + + + <nobr> Displays minimum, maximum and sum of values for each plot. <nobr> - - - Gain Plot - - - - - - - false - - - - 0 - 0 - - - - <nobr> + + + Gain Plot + + + + + + + false + + + + 0 + 0 + + + + <nobr> Displays minimum, maximum and sum of values for each plot. <nobr> - - - Gap Pixels - + + + Gap Pixels + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 80 + 20 + + + + + - - - + + + + + + + 0 + 0 + + + + + 16 + 16 + + + + Qt::NoFocus + + + + + + + :/icons/images/rightArrow.png:/icons/images/rightArrow.png + + + + 16 + 16 + + + + true + + + + - - - - - 2 - 31 - 16 - 16 - - - - - 0 - 0 - - - - Qt::NoFocus - - - - - - - :/icons/images/leftArrow.png:/icons/images/leftArrow.png - - - - 16 - 16 - - - - true - - - - - - 337 - 32 - 16 - 16 - - - - - 0 - 0 - - - - Qt::NoFocus - - - - - - - :/icons/images/rightArrow.png:/icons/images/rightArrow.png - - - - 16 - 16 - - - - true - - - - - - - 12 - 61 - 371 - 64 - - - - 1D Plot Options 1 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - 12 - 22 - 355 - 40 - - - - 0 - - - - - - 5 - 0 - 333 - 35 - + + + + + + 0 + 0 + + + + + 350 + 70 + + + + + 16777215 + 16777215 + + + + 1D Plot Options 1 + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 4 - - - - - - 0 - 0 - - - - Superimpose - - - false - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 30 - 20 - - - - - - - - false - - - - 0 - 0 - - - - Persistency: - - - - - - - false - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - 1 - - - 10 - - - 1 - - - - - - - - - - - 6 - 0 - 330 - 36 - + + 0 - - - - - - 0 - 0 - - - - Log Scale (Y) - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 95 - 20 - - - - - - - - true - - - - 0 - 0 - - - - Points - - - - - - - true - - - - 0 - 0 - - - - Lines - - - true - - - - - - - - - - - 8 - 0 - 329 - 35 - + + 4 - - - 0 - - - - - true - - - - 0 - 0 - - - - Accumulate - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 30 - 20 - - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - Qt::NoFocus - - - Reset Accumulation - - - - :/icons/images/calculate.png:/icons/images/calculate.png - - - - 24 - 24 - - - - - - - - - - - - 6 - 0 - 331 - 36 - + + 0 - - - 0 - - - - - true - - - - 0 - 0 - - - - Pedestal - + + 2 + + + 0 + + + + + + 0 + 0 + + + + + 16 + 16 + + + + Qt::NoFocus + + + + + + + :/icons/images/leftArrow.png:/icons/images/leftArrow.png + + + + 16 + 16 + + + + true + + + + + + + + 0 + 0 + + + + + 16 + 16 + + + + Qt::NoFocus + + + + + + + :/icons/images/rightArrow.png:/icons/images/rightArrow.png + + + + 16 + 16 + + + + true + + + + + + + 3 + + + + + + + + 0 + 0 + + + + Superimpose + + + false + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 20 + 20 + + + + + + + + false + + + + 0 + 0 + + + + Persistency: + + + + + + + false + + + + 0 + 0 + + + + + 50 + 0 + + + + + 16777215 + 16777215 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + 1 + + + 10 + + + 1 + + + + - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 60 - 20 - - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - Qt::NoFocus - - - Recalculate Pedestal - - - - :/icons/images/calculate.png:/icons/images/calculate.png - - - - 24 - 24 - - + + + + + + + 0 + 0 + + + + Log Scale (Y) + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 95 + 20 + + + + + + + + true + + + + 0 + 0 + + + + Points + + + + + + + true + + + + 0 + 0 + + + + Lines + + + true + + + + - - - + + + + + + true + + + + 0 + 0 + + + + Accumulate + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 30 + 20 + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + Qt::NoFocus + + + Reset Accumulation + + + + :/icons/images/calculate.png:/icons/images/calculate.png + + + + 24 + 24 + + + + + + + + + + + + true + + + + 0 + 0 + + + + Pedestal + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 60 + 20 + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + Qt::NoFocus + + + Recalculate Pedestal + + + + :/icons/images/calculate.png:/icons/images/calculate.png + + + + 24 + 24 + + + + + + + + + <nobr> +All values between <b>from</b> and <b>to</b> will be reset to 1, others to 0. +</nobr> + + + + + + + 0 + 0 + + + + <nobr> +All values between <b>from</b> and <b>to</b> will be reset to 1, others to 0. +</nobr> + + + Binary + + + + + + + false + + + + 0 + 0 + + + + from + + + + + + + false + + + + 0 + 0 + + + + + 50 + 0 + + + + + 16777215 + 16777215 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + -16777215 + + + 16777215 + + + 0 + + + + + + + false + + + + 0 + 0 + + + + to + + + + + + + false + + + + 0 + 0 + + + + + 50 + 0 + + + + + 16777215 + 16777215 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + -16777215 + + + 16777215 + + + 0 + + + + + + + + + + + true + + + + 0 + 0 + + + + <nobr> +Displays minimum, maximum and sum of values for each plot. +<nobr> + + + Display Statistics + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + - + + + + + true + + + + 0 + 0 + + + + + 0 + 65 + + + + + 16777215 + 16777215 + + + + Plot Type + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 6 + + + 0 + + + 6 + + + 0 + + + 2 + + + 0 + + + + + + 0 + 0 + + + + Data Graph + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 10 + 20 + + + + + + + + + 0 + 0 + + + + No Plot + + + + + + + + + + true + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Snapshot + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 9 + + + 6 + + + 9 + + + 9 + + + 2 + + + 9 + + + + + + 0 + 0 + + + + + 108 + 35 + + + + + 16777215 + 35 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + Qt::NoFocus + + + Close All + + + + :/icons/images/close.png:/icons/images/close.png + + + false + + + + + + + true + + + + 0 + 0 + + + + + 108 + 35 + + + + + 16777215 + 35 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + Qt::NoFocus + + + Save All + + + + :/icons/images/saveAll.png:/icons/images/saveAll.png + + + false + + + + + + + + 0 + 0 + + + + + 108 + 35 + + + + + 16777215 + 35 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + Qt::NoFocus + + + Create + + + + :/icons/images/new.png:/icons/images/new.png + + + false + + + + + + + + + + + 0 + 0 + + + + + 0 + 170 + + + + + 16777215 + 16777215 + + + + Plot Axis + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 9 + + + 0 + + + 9 + + + 0 + + + 2 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + X Min: + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + Qt::ImhDigitsOnly + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Y Axis: + + + + + + + + 0 + 0 + + + + X Max: + + + + + + + + 0 + 0 + + + + Z Max: + + + + + + + + 0 + 0 + + + + Y Max: + + + + + + + + 0 + 0 + + + + Y Min: + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + Qt::ImhDigitsOnly + + + + + + + + 0 + 0 + + + + X Axis: + + + + + + + true + + + + 0 + 0 + + + + + 50 + 0 + + + + + + + + + 0 + 0 + + + + Z Axis: + + + + + + + + 0 + 0 + + + + Z Min: + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + Qt::ImhDigitsOnly + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + + + + Title : + + + + + + + + 0 + 0 + + + + + 250 + 0 + + + + QLineEdit::Normal + + + false + + + + + + + + 0 + 0 + + + + Keep Aspect Ratio + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Qt::ImhDigitsOnly + + + + + + + + + + + 0 + 0 + + + + + 0 + 65 + + + + + 120 + 16777215 + + + + Image + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 9 + + + 4 + + + 9 + + + 6 + + + 2 + + + 0 + + + + + + 0 + 0 + + + + + 16777215 + 35 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + + 20 + 20 + 20 + + + + + + + + Qt::NoFocus + + + Save + + + + :/icons/images/save.png:/icons/images/save.png + + + + 24 + 24 + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + 65 + + <nobr> -All values between <b>from</b> and <b>to</b> will be reset to 1, others to 0. -</nobr> - - - - - 8 - 0 - 327 - 36 - - - - - 1 - - - - - - 0 - 0 - - - - <nobr> -All values between <b>from</b> and <b>to</b> will be reset to 1, others to 0. -</nobr> - - - Binary - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - false - - - - 0 - 0 - - - - from - - - - - - - false - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - -16777215 - - - 16777215 - - - 0 - - - - - - - false - - - - 0 - 0 - - - - to - - - - - - - false - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - -16777215 - - - 16777215 - - - 0 - - - - - - - - - - - 6 - 0 - 140 - 35 - - - - - 0 - - - - - true - - - - 0 - 0 - - - - <nobr> -Displays minimum, maximum and sum of values for each plot. -<nobr> - - - Display Statistics - - - - - - - - - - - 0 - 30 - 16 - 16 - - - - - 0 - 0 - - - - Qt::NoFocus - - - - - - - :/icons/images/leftArrow.png:/icons/images/leftArrow.png - - - - 16 - 16 - - - - true - - - - - - 351 - 31 - 16 - 16 - - - - - 0 - 0 - - - - Qt::NoFocus - - - - - - - :/icons/images/rightArrow.png:/icons/images/rightArrow.png - - - - 16 - 16 - - - - true - - - - - - - 11 - 124 - 356 - 57 - - - - Save Image - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - 18 - 22 - 72 - 35 - - - - - 0 - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - Qt::NoFocus - - - Save - - - - :/icons/images/save.png:/icons/images/save.png - - - - 24 - 24 - - - - - - - - - - - 11 - 187 - 746 - 150 - - - - Plot Axis - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - 10 - 20 - 726 - 129 - - - - - QLayout::SetNoConstraint - - - 0 - - - - - Title Prefix: - - - - - - - true - - - - 0 - 0 - - - - - 50 - 0 - - - - - - - - - 0 - 0 - - - - Z Max: - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - - - - - 0 - 0 - - - - Y Max: - - - - - - - - 0 - 0 - - - - X Max: - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Z Min: - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - - - - - 0 - 0 - - - - X Min: - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - Qt::ImhDigitsOnly - - - - - - - - 0 - 0 - - - - Y Min: - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - X Axis: - - - - - - - - 0 - 0 - - - - - 250 - 0 - - - - Qt::ImhDigitsOnly - - - - - - - - 0 - 0 - - - - Y Axis: - - - - - - - - 0 - 0 - - - - - 20 - 0 - - - - Qt::ImhDigitsOnly - - - - - - - - 0 - 0 - - - - Z Axis: - - - - - - - - 0 - 0 - - - - - 20 - 0 - - - - Qt::ImhDigitsOnly - - - - - - - - 0 - 0 - - - - - 250 - 0 - - - - QLineEdit::Normal - - - false - - - - - - - - 0 - 0 - - - - Keep Aspect Ratio - - - - - - - - - true - - - - 15 - 5 - 371 - 51 - - - - Plot Type - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - 10 - 20 - 345 - 27 - - - - - - - - 0 - 0 - - - - No Plot - - - - - - - - 0 - 0 - - - - Data Graph - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 10 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 120 - 10 - - - - - - - - - - - 400 - 5 - 357 - 58 - - - - <nobr> Streaming Interval between 2 plots. Default is time interval with 200 ms. </nobr><br><br><nobr> <b>Time Interval</b>: Streaming time interval when an image should be streamed. </nobr><br><nobr> <b>Every nth Image</b>: Only every nth image is streamed. </nobr> - - - Interval between Plots - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - 10 - 19 - 340 - 32 - - - - - 0 - - - - - 0 - 0 - - - - - 150 - 0 - - - - - 16777215 - 16777215 - - - - - - - - - 11 - 11 - 11 - - - - - - - 20 - 20 - 20 - - - - - - - - - 11 - 11 - 11 - - - - - - - 20 - 20 - 20 - - - - - - - - - 119 - 119 - 119 - - - - - - - 20 - 20 - 20 - - - - - - - - 0 - - - - Time Interval + + Interval between Plots + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + 8 + + + 0 + + + 6 + + + 6 + + + 2 + + + 0 + + + + + + 0 + 0 + - - - - Every nth Image + + + 150 + 0 + - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 80 - 20 - - - - - - - - - 0 - 0 - - - - - 140 - 21 - - - - - - - - - - true - - - - 399 - 122 - 355 - 60 - - - - Snapshot - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - false - - - - - 10 - 23 - 336 - 37 - - - - - - - - 0 - 0 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - Qt::NoFocus - - - Create - - - - :/icons/images/new.png:/icons/images/new.png - - - false - - - - - - - - 0 - 0 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - Qt::NoFocus - - - Close All - - - - :/icons/images/close.png:/icons/images/close.png - - - false - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 5 - 20 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 5 - 20 - - - - - - - - true - - - - 0 - 0 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - - 20 - 20 - 20 - - - - - - - - Qt::NoFocus - - - Save All - - - - :/icons/images/saveAll.png:/icons/images/saveAll.png - - - false - - - - - - + + + 16777215 + 16777215 + + + + + + + + + 11 + 11 + 11 + + + + + + + 20 + 20 + 20 + + + + + + + + + 11 + 11 + 11 + + + + + + + 20 + 20 + 20 + + + + + + + + + 119 + 119 + 119 + + + + + + + 20 + 20 + 20 + + + + + + + + 0 + + + + Time Interval + + + + + Every nth Image + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 80 + 20 + + + + + + + + 0 + + + + + + + + 0 + 0 + + + + 3 + + + 999999.000000000000000 + + + 200.000000000000000 + + + + + + + + 0 + 0 + + + + + 55 + 16777215 + + + + 3 + + + + hr + + + + + min + + + + + s + + + + + ms + + + + + + + + + + + + + 0 + 0 + + + + + 20 + 0 + + + + 1 + + + 2000000000 + + + + + + + + + + + + boxPlotType box1D + boxFrequency box2D + horizontalSpacer_6 boxSave boxPlotAxis - boxPlotType - boxFrequency boxSnapshot - - radioNoPlot - radioDataGraph - chkInterpolate - chkContour - chkLogz - comboFrequency - chkTitle - dispTitle - chkXAxis - dispXAxis - chkXMin - dispXMin - chkXMax - dispXMax - chkYAxis - dispYAxis - chkYMin - dispYMin - chkYMax - dispYMax - chkZAxis - dispZAxis - chkZMin - dispZMin - chkZMax - dispZMax - chk1DLog - chkPoints - chkLines - diff --git a/slsDetectorGui/forms/form_tab_settings.ui b/slsDetectorGui/forms/form_tab_settings.ui index d02bcd854..67c234f1d 100755 --- a/slsDetectorGui/forms/form_tab_settings.ui +++ b/slsDetectorGui/forms/form_tab_settings.ui @@ -24,221 +24,256 @@ - 1000 - 1000 + 775 + 400 Form - - - - 30 - 20 - 316 - 135 - - - - - - - false - + + + + + false + + + + 0 + 25 + + + + false + + + eV + + + -100000 + + + 100000 + + + 100 + + + -1 + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + false + + + + 0 + 25 + + + - Dynamic Range: + 1.67772e+07 - - - - - - true + + + + 65535 - - - 0 - 0 - + + + + 255 - - Settings of the detector. + + + + 7 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 20 + 20 + + + + + + + + true + + + + 0 + 0 + + + + + 0 + 25 + + + + Settings of the detector. #settings# - - - - Standard - - - - - Fast - - - - - High Gain - - - - - Dynamic Gain - - - - - Low Gain - - - - - Medium Gain - - - - - Very High Gain - - - - - Dynamic HG0 - - - - - Fix Gain 1 - - - - - Fix Gain 2 - - - - - Force Switch G1 - - - - - Force Switch G2 - - - - - Very Low Gain - - - - - Undefined - - - - - Uninitialized - - - - - - - - false - + + - Threshold: - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - false - - - - 1.67772e+07 - - - - - 65535 - - - - - 255 - - - - - 7 - - - - - - - - true + Standard + + - Settings: + Fast - - - - - - false + + + + High Gain - - false + + + + Dynamic Gain - - eV + + + + Low Gain - - -100000 + + + + Medium Gain - - 100000 + + + + Very High Gain - - 100 + + + + Dynamic HG0 - - -1 + + + + Fix Gain 1 - - - - + + + + Fix Gain 2 + + + + + Force Switch G1 + + + + + Force Switch G2 + + + + + Very Low Gain + + + + + Undefined + + + + + Uninitialized + + + + + + + + false + + + Threshold: + + + + + + + false + + + Dynamic Range: + + + + + + + true + + + Settings: + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 190 + + + + + - - comboSettings - spinThreshold - comboDynamicRange - diff --git a/slsDetectorGui/include/qTabPlot.h b/slsDetectorGui/include/qTabPlot.h index 9318c295e..c332812ba 100755 --- a/slsDetectorGui/include/qTabPlot.h +++ b/slsDetectorGui/include/qTabPlot.h @@ -6,12 +6,7 @@ class qDrawPlot; class multiSlsDetector; -class QStackedLayout; -class QSpinBox; -class QDoubleSpinBox; -class QComboBox; class QButtonGroup; -class QPalette; class qTabPlot:public QWidget, private Ui::TabPlotObject{ Q_OBJECT @@ -54,11 +49,7 @@ private: qDrawPlot *myPlot; bool is1d; - QButtonGroup *btnGroupPlotType; - QStackedLayout *stackedLayout; - QSpinBox *spinNthFrame; - QDoubleSpinBox *spinTimeGap; - QComboBox *comboTimeGapUnit; + QButtonGroup *btnGroupPlotType{nullptr}; /** default plot and axis titles */ static QString defaultPlotTitle; diff --git a/slsDetectorGui/src/qDetectorMain.cpp b/slsDetectorGui/src/qDetectorMain.cpp index 69f56f0b6..3dd994c3c 100755 --- a/slsDetectorGui/src/qDetectorMain.cpp +++ b/slsDetectorGui/src/qDetectorMain.cpp @@ -143,10 +143,6 @@ qDetectorMain::~qDetectorMain() { void qDetectorMain::SetUpWidgetWindow() { - // Layout - QGridLayout *layoutTabs = new QGridLayout; - centralwidget->setLayout(layoutTabs); - // plot setup myPlot = new qDrawPlot(dockWidgetPlot, myDet); FILE_LOG(logDEBUG) << "DockPlot ready"; diff --git a/slsDetectorGui/src/qTabMeasurement.cpp b/slsDetectorGui/src/qTabMeasurement.cpp index d4ed4a39b..2854fbbe5 100755 --- a/slsDetectorGui/src/qTabMeasurement.cpp +++ b/slsDetectorGui/src/qTabMeasurement.cpp @@ -442,13 +442,20 @@ void qTabMeasurement::GetFileWrite() { try { dispFileName->setEnabled(true); // default, even when exception + lblIndex->setEnabled(true); + spinIndex->setEnabled(true); int retval = myDet->getFileWrite(); if (retval == -1) { qDefs::Message(qDefs::WARNING, "File write is inconsistent for all detectors.", "qTabMeasurement::GetFileWrite"); dispFileName->setEnabled(true); + lblIndex->setEnabled(true); + spinIndex->setEnabled(true); } else { - chkFile->setChecked(retval == 0 ? false : true); - dispFileName->setEnabled(chkFile->isChecked()); + bool enable = (retval == 0 ? false : true); + chkFile->setChecked(enable); + dispFileName->setEnabled(enable); + lblIndex->setEnabled(enable); + spinIndex->setEnabled(enable); } } CATCH_DISPLAY ("Could not get file over write enable.", "qTabMeasurement::GetFileWrite") @@ -460,7 +467,10 @@ void qTabMeasurement::SetFileWrite(bool val) { try { myDet->setFileWrite(val); - dispFileName->setEnabled(chkFile->isChecked()); + bool enable = chkFile->isChecked(); + dispFileName->setEnabled(enable); + lblIndex->setEnabled(enable); + spinIndex->setEnabled(enable); } CATCH_HANDLE("Could not set file write enable.", "qTabMeasurement::SetFileWrite", this, &qTabMeasurement::GetFileWrite) } diff --git a/slsDetectorGui/src/qTabPlot.cpp b/slsDetectorGui/src/qTabPlot.cpp index f3a387ad0..9b8a5016d 100755 --- a/slsDetectorGui/src/qTabPlot.cpp +++ b/slsDetectorGui/src/qTabPlot.cpp @@ -20,8 +20,7 @@ QString qTabPlot::defaultImageZAxisTitle("Intensity"); qTabPlot::qTabPlot(QWidget *parent, multiSlsDetector *detector, qDrawPlot *plot) : - QWidget(parent), myDet(detector), myPlot(plot), is1d(false), - btnGroupPlotType(0), stackedLayout(nullptr), spinNthFrame(nullptr), spinTimeGap(nullptr), comboTimeGapUnit(nullptr) { + QWidget(parent), myDet(detector), myPlot(plot), is1d(false) { setupUi(this); SetupWidgetWindow(); FILE_LOG(logDEBUG) << "Plot ready"; @@ -30,14 +29,6 @@ qTabPlot::qTabPlot(QWidget *parent, multiSlsDetector *detector, qDrawPlot *plot) qTabPlot::~qTabPlot() { if (btnGroupPlotType) delete btnGroupPlotType; - if (stackedLayout) - delete stackedLayout; - if (spinNthFrame) - delete spinNthFrame; - if (spinTimeGap) - delete spinTimeGap; - if (comboTimeGapUnit) - delete comboTimeGapUnit; } void qTabPlot::SetupWidgetWindow() { @@ -45,34 +36,7 @@ void qTabPlot::SetupWidgetWindow() { btnGroupPlotType = new QButtonGroup(this); btnGroupPlotType->addButton(radioNoPlot, 0); btnGroupPlotType->addButton(radioDataGraph, 1); - // Plotting Frequency - stackedLayout = new QStackedLayout; - stackedLayout->setSpacing(0); - spinNthFrame = new QSpinBox; - spinNthFrame->setMinimum(1); - spinNthFrame->setMaximum(2000000000); - spinNthFrame->setValue(1); - spinTimeGap = new QDoubleSpinBox; - spinTimeGap->setMinimum(0); - spinTimeGap->setDecimals(3); - spinTimeGap->setMaximum(999999); - spinTimeGap->setValue(DEFAULT_STREAMING_TIMER_IN_MS); - comboTimeGapUnit = new QComboBox; - comboTimeGapUnit->addItem("hr"); - comboTimeGapUnit->addItem("min"); - comboTimeGapUnit->addItem("s"); - comboTimeGapUnit->addItem("ms"); - comboTimeGapUnit->setCurrentIndex(3); - QWidget *wTimeInterval = new QWidget; - QHBoxLayout *h1 = new QHBoxLayout; - wTimeInterval->setLayout(h1); - h1->setContentsMargins(0, 0, 0, 0); - h1->setSpacing(3); - h1->addWidget(spinTimeGap); - h1->addWidget(comboTimeGapUnit); - stackedLayout->addWidget(wTimeInterval); - stackedLayout->addWidget(spinNthFrame); - stackWidget->setLayout(stackedLayout); + // 1D and 2D options stackedWidget1D->setCurrentIndex(0); stackedWidget2D->setCurrentIndex(0); @@ -622,7 +586,7 @@ void qTabPlot::GetStreamingFrequency() { // time interval else if (freq == 0) { comboFrequency->setCurrentIndex(0); - stackedLayout->setCurrentIndex(0); + stackedTimeInterval->setCurrentIndex(0); try { int timeMs = myDet->setReceiverStreamingTimer(-1); if (freq < 0) { @@ -638,7 +602,7 @@ void qTabPlot::GetStreamingFrequency() { // every nth frame else { comboFrequency->setCurrentIndex(1); - stackedLayout->setCurrentIndex(1); + stackedTimeInterval->setCurrentIndex(1); spinNthFrame->setValue(freq); } } CATCH_DISPLAY ("Could not get streaming frequency.", "qTabPlot::GetStreamingFrequency") @@ -655,7 +619,7 @@ void qTabPlot::SetStreamingFrequency() { auto freqVal = spinNthFrame->value(); auto timeVal = spinTimeGap->value(); auto timeUnit = static_cast(comboTimeGapUnit->currentIndex()); - + stackedTimeInterval->setCurrentIndex(comboFrequency->currentIndex()); try { if (frequency) { FILE_LOG(logINFO) << "Setting Streaming Frequency to " << freqVal;