Index: /trunk/FACT++/gui/FactGui.h
===================================================================
--- /trunk/FACT++/gui/FactGui.h (revision 12003)
+++ /trunk/FACT++/gui/FactGui.h (revision 12004)
@@ -2373,11 +2373,23 @@
fTempCam50, fTempCam51, fTempCam52, fTempCam53, fTempCam54,
fTempCam60, fTempCam61,
- fTempCrate00, fTempCrate01, fTempCrate10, fTempCrate11,
- fTempCrate20, fTempCrate21, fTempCrate30, fTempCrate31,
- fTempPS00, fTempPS01, fTempPS10, fTempPS11,
- fTempPS20, fTempPS21, fTempPS30, fTempPS31,
- fTempAux0a, fTempAux0b, fTempAux1a, fTempAux1b,
- fTempBackpanel0a, fTempBackpanel0b, fTempBackpanel1a, fTempBackpanel1b,
- fTempSwitchbox0a, fTempSwitchbox0b, fTempSwitchbox1a, fTempSwitchbox1b,
+ // 0:b/f 1:b/f 2:b/f 3:b/f
+ fTempCrate0back, fTempCrate0front,
+ fTempCrate1back, fTempCrate1front,
+ fTempCrate2back, fTempCrate2front,
+ fTempCrate3back, fTempCrate3front,
+ // 0:b/f 1:b/f 2:b/f 3:b/f
+ fTempPS0back, fTempPS0front,
+ fTempPS1back, fTempPS1front,
+ fTempPS2back, fTempPS2front,
+ fTempPS3back, fTempPS3front,
+ // AUX PS: FTM t/b; FSC t/b
+ fTempAuxFTMtop, fTempAuxFTMbottom,
+ fTempAuxFSCtop, fTempAuxFSCbottom,
+ // Backpanel: FTM t/b; FSC t/b
+ fTempBackpanelFTMtop, fTempBackpanelFTMbottom,
+ fTempBackpanelFSCtop, fTempBackpanelFSCbottom,
+ // top front/back; bottom front/back
+ fTempSwitchboxTopFront, fTempSwitchboxTopBack,
+ fTempSwitchboxBottomFront, fTempSwitchboxBottomBack,
};
Index: /trunk/FACT++/gui/design.ui
===================================================================
--- /trunk/FACT++/gui/design.ui (revision 12003)
+++ /trunk/FACT++/gui/design.ui (revision 12004)
@@ -53,5 +53,5 @@
- 4
+ 9
@@ -12344,5 +12344,5 @@
0
- -
+
-
@@ -12351,5 +12351,5 @@
- -
+
-
@@ -12358,5 +12358,5 @@
- -
+
-
@@ -12365,5 +12365,5 @@
- -
+
-
@@ -12372,84 +12372,533 @@
- -
+
-
- Pos1
+ Back
+
+
+ Qt::AlignBottom|Qt::AlignHCenter
- -
+
-
- Pos2
+ Front
+
+
+ Qt::AlignBottom|Qt::AlignHCenter
- -
+
-
- PS1
+ PS back
+
+
+ Qt::AlignBottom|Qt::AlignHCenter
- -
+
-
- PS2
+ PS front
+
+
+ Qt::AlignBottom|Qt::AlignHCenter
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 99.900000000000006
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Preferred
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Preferred
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ FTM top
+
+
+
+ -
+
+
+ FTM bottom
+
+
+
+ -
+
+
+ FSC bottom
+
+
+
+ -
+
+
+ FSC top
-
-
+
+
+ Backpanel
+
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
+ Qt::AlignBottom|Qt::AlignHCenter
- -
-
+
-
+
+
+ PS aux
+
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
+ Qt::AlignBottom|Qt::AlignHCenter
-
-
+
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -12476,5 +12925,5 @@
-
-
+
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -12501,5 +12950,268 @@
-
-
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Preferred
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Preferred
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ Front
+
+
+ Qt::AlignBottom|Qt::AlignHCenter
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ °C
+
+
+ 1
+
+
+ -99.900000000000006
+
+
+ 1000.000000000000000
+
+
+
+ -
+
+
+ Top
+
+
+
+ -
+
+
+ Bottom
+
+
+
+ -
+
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -12526,55 +13238,15 @@
-
-
+
+
+ Back
+
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
+ Qt::AlignBottom|Qt::AlignHCenter
-
-
+
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -12600,561 +13272,60 @@
- -
-
+
-
+
+
+ Switchbox
+
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
+ Qt::AlignCenter
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
+
-
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Preferred
+
+
+
+ 20
+ 40
+
+
+
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 99.900000000000006
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
+
-
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Preferred
+
+
+
+ 20
+ 40
+
+
+
- -
-
-
- 0
-
-
-
-
-
- 0a
-
-
-
- -
-
-
- 0b
-
-
-
- -
-
-
- 1b
-
-
-
- -
-
-
- 1a
-
-
-
- -
-
-
- Backpanel
-
-
-
- -
-
-
- Switchbox
-
-
-
- -
-
-
- PS aux
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
- °C
-
-
- 1
-
-
- -99.900000000000006
-
-
- 1000.000000000000000
-
-
-
-
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+