Index: trunk/FACT++/gui/design.ui =================================================================== --- trunk/FACT++/gui/design.ui (revision 11622) +++ trunk/FACT++/gui/design.ui (revision 11623) @@ -53,5 +53,5 @@ - 1 + 3 @@ -3464,5 +3464,5 @@ - + 0 0 @@ -3495,5 +3495,5 @@ - + 0 0 @@ -4050,6 +4050,6 @@ - - + + @@ -4170,27 +4170,34 @@ - - - - on - - - - - - - off - - - - Busy + Continous busy on - - + + + + Continous trigger + + + + + + + off + + + + + + + on + + + + + true @@ -4229,13 +4236,13 @@ - - + + - Continous trigger + on - - + + off @@ -4243,6 +4250,27 @@ - - + + + + DRS enable + + + + + + + Write enable + + + + + + + off + + + + + on @@ -4250,6 +4278,6 @@ - - + + true @@ -4288,48 +4316,6 @@ - - - - on - - - - - - - off - - - - - - - DRS enable - - - - - - - Write enable - - - - - - - off - - - - - - - on - - - - - + + true @@ -4368,6 +4354,87 @@ - - + + + + false + + + on + + + + + + + false + + + off + + + + + + + false + + + off + + + + + + + false + + + on + + + + + + + false + + + on + + + + + + + false + + + off + + + + + + + DCM locked + + + + + + + DCM ready + + + + + + + SPI serial clock + + + + + true @@ -4406,87 +4473,6 @@ - - - - false - - - on - - - - - - - false - - - off - - - - - - - false - - - off - - - - - - - false - - - on - - - - - - - false - - - on - - - - - - - false - - - off - - - - - - - DCM locked - - - - - - - DCM ready - - - - - - - SPI serial clock - - - - - + + true @@ -4525,6 +4511,6 @@ - - + + true @@ -4563,6 +4549,47 @@ - - + + + + false + + + Start + + + + + + + false + + + Stop + + + + + + + Run + + + + + + + Trigger + + + + + + + Reset Evt ID + + + + + true @@ -4601,42 +4628,74 @@ - - + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + false + + true + + + + + - Start + on - - - - false - + + - Stop + on - - + + - Run + off - - + + - Trigger + off - - + + - Reset Evt ID + Continous busy off @@ -4650,4 +4709,30 @@ + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + @@ -4693,735 +4778,948 @@ + + + + Memory + + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + MB + + + 1000000 + + + + + + + 0 + + + %p% + + + + + + + Maximum buffer size + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evts + + + 2147483647 + + + + + + + Complete + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Incomplete + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + + + + Released from buffer + + + + + + + Incomplete + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Write Error + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Complete + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evts + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evts + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evts + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evt/s + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evt/s + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evt/s + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evts + + + 2147483647 + + + + + + + Max in buffer + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Buffer contents + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + New in buffer + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + + + + + + + Ethernet + + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1 + + + 100000.000000000000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1 + + + 100000.000000000000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1 + + + 100000.000000000000000 + + + + + + + Per board + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Total + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1000000 + + + + + + + Min + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Avg + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Max + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + I/O Errors + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + 2147483647 + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + boards + + + 1000 + + + + + + + Connections + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + + + + Open output streams - - - - 0 - 40 - 421 - 206 - - - - - - - Run no. - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Number - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Qt::AlignCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Min - - - - - - - Max - - - - - - - Last run no. - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Opened - - - - - - - Closed - - - - - - - For max run no. - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Event ID - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Trigger ID - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - ------> - - - - - - - \----> - - - - - - - - - - - Ethernet - - - - - 80 - 70 - 268 - 152 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - kB/s - - - 1 - - - 100000.000000000000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - kB/s - - - 1 - - - 100000.000000000000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - kB/s - - - 1 - - - 100000.000000000000000 - - - - - - - Per board - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Total - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - kB/s - - - 1000000 - - - - - - - Min - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Avg - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Max - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - boards - - - 1000 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - 2147483647 - - - - - - - I/O Errors - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - - - - - Memory - - - - - 0 - 40 - 423 - 241 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - MB - - - 1000000 - - - - - - - 0 - - - %p% - - - - - - - Maximum buffer size - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - evts - - - 2147483647 - - - - - - - Complete in buffer - - - - - - - Incomplete in buffer - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Released from buffer - - - - - - - - Incomplete - - - - - - - - Write Error - - - - - - - - Complete - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - evts - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - evts - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - evts - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - evt/s - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - evt/s - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - evt/s - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - evts - - - 2147483647 - - - - - - - Max in buffer - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - + + + + + + + Run no. + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Number + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Qt::AlignCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Min + + + + + + + Max + + + + + + + Last run no. + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Opened + + + + + + + Closed + + + + + + + For max run no. + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Event ID + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Trigger ID + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + ------> + + + + + + + \----> + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + @@ -5431,147 +5729,200 @@ Output stream with maximum run no. - - - - 70 - 100 - 298 - 104 - - - - - - - Successfull - - - - - - - Rejected - - - - - - - Incomplete - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Current run - - - - - - - Total - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - + + + + + + + Successfull + + + + + + + Rejected + + + + + + + Incomplete + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Current run + + + + + + + Total + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + @@ -5651,5 +6002,9 @@ - + + + 3 + + @@ -5664,5 +6019,9 @@ - + + + 9 + + @@ -5677,5 +6036,12 @@ - + + + 0 + + + 8 + + @@ -6078,4 +6444,16 @@ QAbstractSpinBox::NoButtons + + QDateTimeEdit::HourSection + + + hh:mm:ss + + + false + + + Qt::OffsetFromUTC + - - - QDateTimeEdit::HourSection - - - hh:mm:ss - - - false - - - Qt::OffsetFromUTC @@ -6220,4 +6586,16 @@ QAbstractSpinBox::NoButtons + + QDateTimeEdit::HourSection + + + hh:mm:ss + + + false + + + Qt::OffsetFromUTC + - - - QDateTimeEdit::HourSection - - - hh:mm:ss - - - false - - - Qt::OffsetFromUTC @@ -8360,17 +8726,4 @@ - - - Qt::Vertical - - - - 20 - 40 - - - - - @@ -8412,4 +8765,17 @@ + + + + + Qt::Vertical + + + + 20 + 40 + + +