Index: trunk/FACT++/gui/design.ui =================================================================== --- trunk/FACT++/gui/design.ui (revision 12061) +++ trunk/FACT++/gui/design.ui (revision 12062) @@ -4345,19 +4345,5 @@ - - - - - - 0 - 0 - - - - Controls - - - - + @@ -4430,11 +4416,11 @@ - -501 + -2001 - 500 + 2000 - -500 + -100 @@ -4484,11 +4470,11 @@ - -500 + -2001 - 500 + 2000 - 500 + 100 @@ -4524,5 +4510,5 @@ - + @@ -4546,5 +4532,5 @@ - + @@ -4563,11 +4549,11 @@ - -101 + -2001 - 100 + 2000 - -100 + -500 @@ -4594,5 +4580,5 @@ - + @@ -4608,18 +4594,48 @@ - V + mV - -1 + -2001 - 90 + 2000 - 75 + 500 + + + + + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + @@ -10581,5 +10597,5 @@ - + 0 0 @@ -10588,6 +10604,6 @@ - 65 - 52 + 0 + 0 @@ -12319,4 +12335,487 @@ + + + + 0 + + + + + FTM top + + + + + + + FTM bottom + + + + + + + FSC bottom + + + + + + + FSC top + + + + + + + Backpanel + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + PS aux + + + 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::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 + + + true + + + QAbstractSpinBox::NoButtons + + + °C + + + 1 + + + -99.900000000000006 + + + 1000.000000000000000 + + + + + + + Back + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + °C + + + 1 + + + -99.900000000000006 + + + 1000.000000000000000 + + + + + + + Switchbox + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 40 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -12352,14 +12851,4 @@ - - - - Back - - - Qt::AlignBottom|Qt::AlignHCenter - - - @@ -12372,15 +12861,5 @@ - - - - PS back - - - Qt::AlignBottom|Qt::AlignHCenter - - - - + @@ -12389,29 +12868,4 @@ Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - °C - - - 1 - - - -99.900000000000006 - - - 1000.000000000000000 @@ -12442,79 +12896,4 @@ - - - - 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 - - - @@ -12592,5 +12971,215 @@ + + + + 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::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 + + + + + + + Back + + + Qt::AlignBottom|Qt::AlignHCenter + + + + @@ -12617,5 +13206,5 @@ - + @@ -12642,5 +13231,5 @@ - + @@ -12667,5 +13256,5 @@ - + @@ -12692,106 +13281,16 @@ - - + + + + PS back + - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - °C - - - 1 - - - -99.900000000000006 - - - 99.900000000000006 + 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::Vertical @@ -12808,6 +13307,6 @@ - - + + Qt::Vertical @@ -12825,487 +13324,4 @@ - - - - - 0 - - - - - FTM top - - - - - - - FTM bottom - - - - - - - FSC bottom - - - - - - - FSC top - - - - - - - Backpanel - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - PS aux - - - 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::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 - - - true - - - QAbstractSpinBox::NoButtons - - - °C - - - 1 - - - -99.900000000000006 - - - 1000.000000000000000 - - - - - - - Back - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - °C - - - 1 - - - -99.900000000000006 - - - 1000.000000000000000 - - - - - - - Switchbox - - - Qt::AlignCenter - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 40 - - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - -