Changeset 11413


Ignore:
Timestamp:
07/15/11 07:44:31 (13 years ago)
Author:
ogrimm
Message:
Fixed bug when changing displayed event scope channel too fast
File:
1 edited

Legend:

Unmodified
Added
Removed
  • fact/tools/Edd/Edd.cc

    r11360 r11413  
    130130  // Open temporary raw data file
    131131  OpenRawFile(File.fileName());
    132 
    133132
    134133  // Process all pending events, then allow data again
     
    191190 
    192191  // Display first event
    193   NewEventNum(DAQPage->Channel->value());
     192  NewEventNum(DAQPage->Event->value());
    194193}
    195194
     
    387386  setAttribute(Qt::WA_DeleteOnClose);
    388387  EddLineDisplay *Line;
    389  
    390   EddPlot *Plot = new EddPlot();
    391   Plot->setMinimumWidth(400);
    392   for (int i=0; i<18; i++) {
    393     Line = new EddLineDisplay("Bias/VOLT/ID00", i+64);
    394     Layout->addWidget(Line, i%9+1, 0+i/9, 1, 1);
    395     Plot->AddService("Bias/VOLT/ID00", i+64);
    396 
    397     Line = new EddLineDisplay("Bias/VOLT/ID00", i+96);
    398     Layout->addWidget(Line, i%9+1, 2+i/9, 1, 1);
    399     Plot->AddService("Bias/VOLT/ID00",i+96);
    400   }
    401 
    402   Layout->addWidget(Plot, 0, 4, 12, 3);
     388
    403389  Line = new EddLineDisplay("Bias/Message");
    404390  Line->setMaximumWidth(200);
    405   Layout->addWidget(Line, 0, 0, 1, 3);     
     391  Layout->addWidget(Line, 0, 0, 1, 8);     
    406392
    407393  EddCommand *Command = new EddCommand("Bias/Command");
    408   Layout->addWidget(Command, 10, 0, 1, 4);   
    409 
    410   EddText *Text = new EddText("Bias/ConsoleOut", true);
    411   Text->setFixedWidth(400);
    412   Layout->addWidget(Text, 11, 0, 4, 4);
     394  Layout->addWidget(Command, 0, 9, 1, 7);   
     395
     396  //EddText *Text = new EddText("Bias/ConsoleOut", true);
     397  //Text->setFixedWidth(400);
     398  //Layout->addWidget(Text, 1, 0, 3, 8);
     399 
     400  EddPlot *Plot = new EddPlot();
     401  //Plot->setMinimumWidth(400);
     402  for (int i=0; i<320; i++) {
     403    Line = new EddLineDisplay("Bias/VOLT/ID00", i);
     404        Line->setMaximumWidth(25);
     405    Layout->addWidget(Line, 6+i/16, i%16);
     406    //Plot->AddService("Bias/VOLT/ID00", i+64);
     407
     408    //Line = new EddLineDisplay("Bias/VOLT/ID00", i+96);
     409    //Layout->addWidget(Line, i%9+1, 2+i/9, 1, 1);
     410    //Plot->AddService("Bias/VOLT/ID00",i+96);
     411  }
     412
     413  //Layout->addWidget(Plot, 0, 4, 12, 3);
    413414
    414415  // Current page
    415416  EddWindow *Button = new EddWindow("Currents", "Edd - Edd - Bias currents");
    416   Layout->addWidget(Button, 13, 4, 1, 1);     
     417  Layout->addWidget(Button, 0, 16);     
    417418
    418419  Plot = new EddPlot();
Note: See TracChangeset for help on using the changeset viewer.