Changeset 167


Ignore:
Timestamp:
Feb 9, 2010, 10:46:42 AM (11 years ago)
Author:
ogrimm
Message:
Replaced __TIMESTAMP__ by __DATE__ and __TIME__
Location:
Evidence
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Evidence/Edd/Edd.cc

    r164 r167  
    732732  //MainLayout->addWidget(Graph1, 2, 0, 1, 2);
    733733
     734  // Feedback page
     735  FeedbackWidget = new QWidget();
     736  FeedbackLayout = new QGridLayout(FeedbackWidget);
     737  Graph = new Edd_Plot();
     738  for (int i=0; i<36; i++) {
     739    Text = Text.sprintf("Feedback/Average/ID%.2d/%.2d",i/8, i%8);
     740    Value = new Edd_Indicator(Text);
     741
     742    FeedbackLayout->addWidget(Value, i%9+1, 0+i/9, 1, 1);
     743    //Graph->AddService(Text);
     744
     745    //Text = Text.sprintf("Bias/VOLT/ID00/01-%.3d",i);
     746    //Value = new Edd_Indicator(Text);
     747    //BiasLayout->addWidget(Value, i%9+1, 2+i/9, 1, 1);
     748    //Graph->AddService(Text);
     749  }
     750
     751  FeedbackLayout->addWidget(Graph, 0, 4, 12, 3);
     752  Value = new Edd_Indicator("Feedback/Status");
     753  Value->setMaximumWidth(200);
     754  FeedbackLayout->addWidget(Value, 0, 0, 1, 3);     
     755
    734756  // Bias voltage page
    735757  BiasWidget = new QWidget();
     
    780802  TabWidget = new QTabWidget(Central);
    781803  TabWidget->addTab(BiasWidget, "&Bias");
     804  TabWidget->addTab(FeedbackWidget, "&Feedback");
    782805  TabWidget->addTab(EnvironmentWidget, "&Environment");
    783806  TabWidget->addTab(MainWidget, "Evidence");
  • Evidence/Edd/Edd.h

    r164 r167  
    156156    QwtAnalogClock *Clock;
    157157       
    158     QWidget *Central, *MainWidget, *BiasWidget, *EnvironmentWidget;
    159     QGridLayout *MainLayout, *BiasLayout, *EnvironmentLayout;
     158    QWidget *Central, *MainWidget, *BiasWidget, *FeedbackWidget, *EnvironmentWidget;
     159    QGridLayout *MainLayout, *BiasLayout, *FeedbackLayout, *EnvironmentLayout;
    160160
    161161    QTabWidget *TabWidget;
  • Evidence/Evidence.cc

    r166 r167  
    5454  string Rev(EVIDENCE_REVISION);
    5555  Rev = Rev.substr(1, Rev.size()-3);
    56   if (asprintf(&InitMsg, "Server started (%s, compiled %s)", Rev.c_str(),__TIMESTAMP__) == -1) InitMsg = NULL;
     56  if (asprintf(&InitMsg, "Server started (%s, compiled %s %s)", Rev.c_str(),__DATE__, __TIME__) == -1) InitMsg = NULL;
    5757 
    5858  Status = new DimService((string(Name) + "/Status").c_str(), (char *) "C", InitMsg, strlen(InitMsg)+1);
Note: See TracChangeset for help on using the changeset viewer.