Index: /trunk/FACT++/gui/MainWindow.cc =================================================================== --- /trunk/FACT++/gui/MainWindow.cc (revision 10915) +++ /trunk/FACT++/gui/MainWindow.cc (revision 10916) @@ -13,4 +13,38 @@ using namespace std; + +void MainWindow::MakeLEDs(QPushButton **arr, QGridLayout *lay, const char *slot) const +{ + arr[0]->setToolTip("Crate 0, Board 0, Index 0"); + + for (int i=1; i<40; i++) + { + QPushButton *b = new QPushButton(static_cast(arr[0]->parent())); + + b->setEnabled(arr[0]->isEnabled()); + b->setSizePolicy(arr[0]->sizePolicy()); + b->setMaximumSize(arr[0]->maximumSize()); + b->setIcon(arr[0]->icon()); + b->setIconSize(arr[0]->iconSize()); + b->setCheckable(arr[0]->isCheckable()); + b->setFlat(arr[0]->isFlat()); + + ostringstream str; + str << "Crate " << i/10 << ", Board " << i%10 << ", Index " << i; + b->setToolTip(str.str().c_str()); + + lay->addWidget(b, i/10+1, i%10+1, 1, 1); + + arr[i] = b; + } + + const QString name = arr[0]->objectName(); + + for (int i=0; i<40; i++) + { + arr[i]->setObjectName(name+QString::number(i)); + QObject::connect(arr[i], SIGNAL(clicked()), this, slot); + } +} MainWindow::MainWindow(QWidget *p) : QMainWindow(p) @@ -37,32 +71,9 @@ // Initialize the 40 FTU Leds as a copy of the prototype LED fFtuLED[0] = fFtuLEDPrototype; - fFtuLED[0]->setToolTip("Crate 0, Board 0, Index 0"); - - for (int i=1; i<40; i++) - { - QPushButton *b = new QPushButton(static_cast(fFtuLEDPrototype->parent())); - - b->setEnabled(fFtuLEDPrototype->isEnabled()); - b->setSizePolicy(fFtuLEDPrototype->sizePolicy()); - b->setMaximumSize(fFtuLEDPrototype->maximumSize()); - b->setIcon(fFtuLEDPrototype->icon()); - b->setIconSize(fFtuLEDPrototype->iconSize()); - b->setCheckable(fFtuLEDPrototype->isCheckable()); - b->setFlat(fFtuLEDPrototype->isFlat()); - - ostringstream str; - str << "Crate " << i/10 << ", Board " << i%10 << ", Index " << i; - b->setToolTip(str.str().c_str()); - - fFtuLedLayout->addWidget(b, i/10+1, i%10+1, 1, 1); - - fFtuLED[i] = b; - } - - for (int i=0; i<40; i++) - { - fFtuLED[i]->setObjectName(QString::fromUtf8("fFtuLED")+QString::number(i)); - QObject::connect(fFtuLED[i], SIGNAL(clicked()), this, SLOT(slot_fFtuLED_clicked())); - } + MakeLEDs(fFtuLED, fFtuLedLayout, SLOT(slot_fFtuLED_clicked())); + + // Initialize the 40 FAD Leds as a copy of the prototype LED + fFadLED[0] = fFadLEDPrototype; + MakeLEDs(fFadLED, fFadLedLayout, SLOT(slot_fFadLED_clicked())); // Initialize a timer to update the displayed UTC time Index: /trunk/FACT++/gui/MainWindow.h =================================================================== --- /trunk/FACT++/gui/MainWindow.h (revision 10915) +++ /trunk/FACT++/gui/MainWindow.h (revision 10916) @@ -13,4 +13,6 @@ Q_OBJECT; + void MakeLEDs(QPushButton **arr, QGridLayout *lay, const char *slot) const; + void SelectTab(const QString &name); void SetTriggerSequence(); @@ -20,4 +22,5 @@ protected: QPushButton *fFtuLED[40]; + QPushButton *fFadLED[40]; bool fInHandler; @@ -90,4 +93,7 @@ virtual void on_fRateBoard2_valueChanged(int) { } + // Tab: FADs + void slot_fFadLED_clicked() { } + // Tab: Chat void on_fChatSend_clicked(); Index: /trunk/FACT++/gui/design.ui =================================================================== --- /trunk/FACT++/gui/design.ui (revision 10915) +++ /trunk/FACT++/gui/design.ui (revision 10916) @@ -52,5 +52,5 @@ - 1 + 4 @@ -2683,325 +2683,210 @@ - - - - - - 0 - 0 - - - - DRS Temperatures - - - - - - 0 - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - °C - - - 1 - - - -20.000000000000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - °C - - - 1 - - - -20.000000000000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - °C - - - 1 - - - -20.000000000000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - °C - - - 1 - - - -20.000000000000000 - - - - - - - + + + + 10 + 10 + 307 + 161 + + + + + 0 + 0 + + + + + 307 + 161 + + + + + 359 + 16777215 + + + + Connection + + + + + + 4 + + + + + true + - + 0 0 - - QFrame::StyledPanel - - - QFrame::Sunken - - - - 3 - - - - - - 0 - 0 - - - - - - - - 0 - - - - - Patch - - - - - - - off - - - -1 - - - 159 - - - -1 - - - - - - - off - - - -1 - - - 39 - - - -1 - - - - - - - Board - - - - - - - off - - - -1 - - - 159 - - - -1 - - - - - - - off - - - -1 - - - 39 - - - -1 - - - - - - - - - - - - - - - - 0 - 0 - - - - FAD Passport - - - + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + true + + + true + + + + + + + Crate #0 + + + + + + + Crate #1 + + + + - Version - - - - + Crate #2 + + + + - Board ID - - - - + Crate #3 + + + + - DNA - - - - - + 0 + - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - QAbstractSpinBox::NoButtons - - - - - + Qt::AlignCenter + + + + + + + 1 + - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - QAbstractSpinBox::NoButtons - - - - - + Qt::AlignCenter + + + + + + + 2 + - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true + Qt::AlignCenter + + + + + + + 3 + + + Qt::AlignCenter + + + + + + + 4 + + + Qt::AlignCenter + + + + + + + 5 + + + Qt::AlignCenter + + + + + + + 6 + + + Qt::AlignCenter + + + + + + + 7 + + + Qt::AlignCenter + + + + + + + 8 + + + Qt::AlignCenter + + + + + + + 9 + + + Qt::AlignCenter - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - - - - - 20 - - - - + + + @@ -3017,5 +2902,5 @@ - + @@ -3048,5 +2933,5 @@ - + @@ -3055,5 +2940,5 @@ - + @@ -3062,5 +2947,5 @@ - + @@ -3072,5 +2957,5 @@ - + @@ -3082,5 +2967,5 @@ - + @@ -3098,59 +2983,5 @@ - - - - - - false - - - Qt::DefaultContextMenu - - - 1000 - - - 0 - - - Qt::AlignCenter - - - false - - - Qt::Vertical - - - false - - - QProgressBar::BottomToTop - - - %p% - - - - - - - - - - 0 - 0 - - - - Empty - - - Qt::AlignHCenter|Qt::AlignTop - - - - + @@ -3168,27 +2999,216 @@ - - - - Remaining free disk space - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - GB + + + + + + + 0 + 0 + + + + Number of bytes written since startup of data logger. + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + MB + + + + + + + true + + + + 0 + 0 + + + + + 50 + false + + + + Current writing speed + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + true + + + kB/s + + + 99999.000000000000000 + + + 0.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Rate - + + + + Written + + + + + + + 0 + + + + + Open files / subscriptions + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + / + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + log + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + true + + + + + + + rep + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + true + + + + + + + fits + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + true + + + + + + + + + Qt::Horizontal + + + + @@ -3240,209 +3260,81 @@ - - - - - - - 0 - 0 - - - - Number of bytes written since startup of data logger. + + + + Remaining free disk space + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + GB + + + + + + + + + false + + + Qt::DefaultContextMenu + + + 1000 + + + 0 - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - MB + Qt::AlignCenter + + + false + + + Qt::Vertical + + + false + + + QProgressBar::BottomToTop + + + %p% - - - - - true - - - - 0 - 0 - - - - - 50 - false - - - - Current writing speed - - - true - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - true - - - kB/s - - - 99999.000000000000000 - - - 0.000000000000000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + + + 0 + 0 + + - Rate + Empty + + + Qt::AlignHCenter|Qt::AlignTop - - - - Written - - - - - - - 0 - - - - - Open files / subscriptions - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - / - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - log - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - true - - - - - - - rep - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - true - - - - - - - fits - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - true - - - - - - + @@ -3457,4 +3349,430 @@ Qt::AlignBottom|Qt::AlignHCenter + + + + + + + + 0 + 0 + + + + + 50 + false + false + false + false + + + + Estimated time until disk is filled with the current writing speed. + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + QDateTimeEdit::HourSection + + + hh:mm:ss + + + false + + + Qt::OffsetFromUTC + + + + + + + + + + + 0 + 0 + + + + Empty + + + Qt::AlignHCenter|Qt::AlignTop + + + + + + + + + false + + + Qt::DefaultContextMenu + + + 1000 + + + 0 + + + Qt::AlignCenter + + + false + + + Qt::Vertical + + + false + + + QProgressBar::BottomToTop + + + %p% + + + + + + + + + + 0 + 0 + + + + >=1GB + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Remaining free disk space + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + GB + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Open files / runs + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + bin + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + true + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + fits + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + + + + 0 + 20 + + + + + + + + true + + + true + + + + + + + Newest file + + + + + + + 0 + + + + + + 0 + 0 + + + + Number of bytes written since startup of data logger. + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + MB + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + + 0 + 0 + + + + + 50 + false + + + + Current writing speed + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + true + + + kB/s + + + 99999.000000000000000 + + + 0.000000000000000 + + + + + + + + + Written + + + + + + + Rate @@ -4615,42 +4933,4 @@ - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - @@ -4909,4 +5189,42 @@ :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + true + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false