Index: /trunk/FACT++/gui/design.ui =================================================================== --- /trunk/FACT++/gui/design.ui (revision 11923) +++ /trunk/FACT++/gui/design.ui (revision 11924) @@ -11,5 +11,5 @@ 0 0 - 1252 + 1346 898 @@ -53,5 +53,5 @@ - 6 + 3 @@ -3272,5 +3272,5 @@ - + @@ -3287,5 +3287,5 @@ - FTU rate display + BIAS power supply @@ -3297,5 +3297,431 @@ - + + + + Controls + + + + + + 0 + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 9 + + + + + + + Board + + + + + + + Channel + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + QAbstractSpinBox::UpDownArrows + + + 31 + + + + + + + Bias supply + + + Qt::AlignCenter + + + + + + + + + 0 + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 3 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 9 + + + + + + + Crate + + + + + + + Board + + + + + + + Patch + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 3 + + + + + + + Pixel + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + QAbstractSpinBox::UpDownArrows + + + 8 + + + 1 + + + + + + + Camera + + + Qt::AlignCenter + + + + + + + + + 0 + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + µA + + + 5000.000000000000000 + + + + + + + ref + + + + + + + cur + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + Feedback values + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + V + + + 90.000000000000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + V + + + 90.000000000000000 + + + + + + + + + + + Command Voltage + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 4095 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + V + + + 90.000000000000000 + + + + + + + Apply + + + + + + + Global Apply + + + + + + + + + 0 + + + + + Over current reset + + + + + + + Set to 0 + + + + + + + Set to G-APD ref + + + + + + + Request Status + + + + + + + + + @@ -3322,432 +3748,19 @@ - - - - - - - - - - 0 - 0 - - - - Controls - - - - QLayout::SetMinimumSize - - - - - 0 - - - - - Bias supply - - - Qt::AlignCenter - - - - - - - 0 - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 9 - - - - - - - Board - - - - - - - Channel - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - QAbstractSpinBox::UpDownArrows - - - 31 - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - Camera - - - Qt::AlignCenter - - - - - - - 0 - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 3 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 9 - - - - - - - Crate - - - - - - - Board - - - - - - - Patch - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 3 - - - - - - - Pixel - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - QAbstractSpinBox::UpDownArrows - - - 8 - - - 1 - - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 40 - - - - - - - - Command Voltage - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 4095 - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - V - - - 2 - - - 90.000000000000000 - - - 0.000000000000000 - - - - - - - Apply globally - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 5 - - - - - - - - Current - - - - - - - 0 - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - µA - - - 5000.000000000000000 - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Reset - - - - - - - Set to 0 - - - - - - - Set Reference - - - - - - - Request Status - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal + + + + 0 + 0 + - - - - QLayout::SetDefaultConstraint - + + 0 - + @@ -3762,8 +3775,8 @@ - - + + - + 0 0 @@ -3790,5 +3803,18 @@ - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -3803,8 +3829,8 @@ - - + + - + 0 0 @@ -3828,4 +3854,151 @@ 5000 + + + + + + + + + + + + + 0 + 0 + + + + + 500 + 500 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + 3 + + + + + + 0 + 0 + + + + + + + + 0 + + + + + Min + + + + + + + + 0 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + auto + + + V + + + -1 + + + 5000 + + + 0 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Display Reference Voltage + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Max + + + + + + + + 0 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + auto + + + V + + + -1 + + + 90 + + + 90 @@ -13772,6 +13945,6 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';"></p></body></html> @@ -13825,5 +13998,5 @@ 0 0 - 1252 + 1346 21 @@ -14066,5 +14239,5 @@ - 241 + 251 745