Index: /trunk/FACT++/gui/FactGui.h =================================================================== --- /trunk/FACT++/gui/FactGui.h (revision 11634) +++ /trunk/FACT++/gui/FactGui.h (revision 11635) @@ -397,4 +397,5 @@ DimStampedInfo fDimFadRefClock; DimStampedInfo fDimFadRoi; + DimStampedInfo fDimFadDac; DimStampedInfo fDimFadStatus; DimStampedInfo fDimFadStatistics1; @@ -1095,4 +1096,37 @@ SetLedColor(fFadLedRoi, kLedGray, d.time); + } + + void handleDac(QPushButton *led, QSpinBox *box, const DimData &d, int idx) + { + if (d.size()==0) + { + box->setEnabled(false); + SetLedColor(led, kLedGray, d.time); + return; + } + + const uint16_t *ptr = d.ptr()+idx*42; + + box->setEnabled(true); + box->setValue(ptr[40]==ptr[41]?ptr[40]:0); + + SetLedColor(led, ptr[40]==ptr[41]?kLedGreen:kLedOrange, d.time); + handleFadToolTip(d.time, led, ptr); + } + + void handleFadDac(const DimData &d) + { + if (!CheckSize(d, 8*42*sizeof(uint16_t)) && !d.size()==0) + return; + + handleDac(fFadLedDac0, fFadDac0, d, 0); + handleDac(fFadLedDac1, fFadDac1, d, 1); + handleDac(fFadLedDac2, fFadDac2, d, 2); + handleDac(fFadLedDac3, fFadDac3, d, 3); + handleDac(fFadLedDac4, fFadDac4, d, 4); + handleDac(fFadLedDac5, fFadDac5, d, 5); + handleDac(fFadLedDac6, fFadDac6, d, 6); + handleDac(fFadLedDac7, fFadDac7, d, 7); } @@ -2324,4 +2358,7 @@ if (getInfo()==&fDimFadRoi) return PostInfoHandler(&FactGui::handleFadRoi); + + if (getInfo()==&fDimFadDac) + return PostInfoHandler(&FactGui::handleFadDac); if (getInfo()==&fDimFadPrescaler) @@ -2781,4 +2818,5 @@ fDimFadRefClock ("FAD_CONTROL/REFERENCE_CLOCK", (void*)NULL, 0, this), fDimFadRoi ("FAD_CONTROL/REGION_OF_INTEREST", (void*)NULL, 0, this), + fDimFadDac ("FAD_CONTROL/DAC", (void*)NULL, 0, this), fDimFadStatus ("FAD_CONTROL/STATUS", (void*)NULL, 0, this), fDimFadStatistics1 ("FAD_CONTROL/STATISTICS1", (void*)NULL, 0, this), Index: /trunk/FACT++/gui/MainWindow.cc =================================================================== --- /trunk/FACT++/gui/MainWindow.cc (revision 11634) +++ /trunk/FACT++/gui/MainWindow.cc (revision 11635) @@ -353,4 +353,10 @@ } +void MainWindow::FadDacCmd_valueChanged(uint16_t val, uint16_t idx) +{ + const uint16_t cmd[2] = { idx, val }; + Dim::SendCommand("FAD_CONTROL/SET_DAC_VALUE", cmd); +} + void MainWindow::SetTriggerSequence() { Index: /trunk/FACT++/gui/MainWindow.h =================================================================== --- /trunk/FACT++/gui/MainWindow.h (revision 11634) +++ /trunk/FACT++/gui/MainWindow.h (revision 11635) @@ -89,4 +89,15 @@ void on_fFadRoiCmd_valueChanged(int); + void FadDacCmd_valueChanged(uint16_t, uint16_t); + + void on_fFadDac0Cmd_valueChanged(int v) { FadDacCmd_valueChanged(v, 0); } + void on_fFadDac1Cmd_valueChanged(int v) { FadDacCmd_valueChanged(v, 1); } + void on_fFadDac2Cmd_valueChanged(int v) { FadDacCmd_valueChanged(v, 2); } + void on_fFadDac3Cmd_valueChanged(int v) { FadDacCmd_valueChanged(v, 3); } + void on_fFadDac4Cmd_valueChanged(int v) { FadDacCmd_valueChanged(v, 4); } + void on_fFadDac5Cmd_valueChanged(int v) { FadDacCmd_valueChanged(v, 5); } + void on_fFadDac6Cmd_valueChanged(int v) { FadDacCmd_valueChanged(v, 6); } + void on_fFadDac7Cmd_valueChanged(int v) { FadDacCmd_valueChanged(v, 7); } + // Tab: Adc virtual void DisplayEventData() = 0; Index: /trunk/FACT++/gui/design.ui =================================================================== --- /trunk/FACT++/gui/design.ui (revision 11634) +++ /trunk/FACT++/gui/design.ui (revision 11635) @@ -12,5 +12,5 @@ 0 1144 - 855 + 838 @@ -3236,42 +3236,4 @@ - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - @@ -3780,18 +3742,43 @@ + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + - - - - - Qt::Horizontal - - - - 40 - 20 - - - @@ -3815,18 +3802,622 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - FAD DNAs + + + 0 - - - - - - + + + + FAD DNAs + + + + + + + + + + + + DACs + + + + + + 0 + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 65535 + + + + + + + DAC0 + + + + + + + DAC1 + + + + + + + DAC2 + + + + + + + DAC3 + + + + + + + DAC4 + + + + + + + DAC5 + + + + + + + DAC6 + + + + + + + DAC7 + + + + + + + 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 + + + + + + + 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 + + + + + + + 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 + + + + + + + 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 + + + + + + + + + @@ -4695,5 +5286,5 @@ - + Constant busy off Index: /trunk/FACT++/src/EventBuilderWrapper.h =================================================================== --- /trunk/FACT++/src/EventBuilderWrapper.h (revision 11634) +++ /trunk/FACT++/src/EventBuilderWrapper.h (revision 11635) @@ -802,4 +802,5 @@ DimDescribedService fDimRefClock; DimDescribedService fDimRoi; + DimDescribedService fDimDac; DimDescribedService fDimStatistics1; DimDescribedService fDimStatistics2; @@ -853,4 +854,5 @@ fDimRefClock ("FAD_CONTROL/REFERENCE_CLOCK", "I:42", ""), fDimRoi ("FAD_CONTROL/REGION_OF_INTEREST", "S:2", ""), + fDimDac ("FAD_CONTROL/DAC", "S:336", ""), fDimStatistics1 ("FAD_CONTROL/STATISTICS1", "I:3;I:5;X:4;I:3;I:3;I:40;I:1;I:2;C:40;I:40;I:40;X:40", ""), fDimStatistics2 ("FAD_CONTROL/STATISTICS2", "I:1;I:280;X:40;I:40;I:4;I:4;I:2;I:2;I:3;C:40", ""), @@ -1743,4 +1745,17 @@ } + if (memcmp(old.fDac, h.fDac, sizeof(h.fDac)) || changed) + { + array dacs; + + for (int i=0; i dac = Compare(&fVecHeader[0], &fVecHeader[0].fDac[i]); + memcpy(&dacs[i*42], &dac[0], sizeof(uint16_t)*42); + } + + Update(fDimDac, dacs); + } + // -----------