Changeset 164 for Evidence

Timestamp:

02/08/10 15:03:53 (15 years ago)

Author:

ogrimm

Message:

Revision number tracked in server status

Location:

Evidence

Files:

• Edd/Edd.cc (modified) (7 diffs)
• Edd/Edd.h (modified) (2 diffs)
• Evidence.cc (modified) (1 diff)
• Evidence.h (modified) (2 diffs, 1 prop)

Evidence/Edd/Edd.cc

@@ -22 +22 @@
 class GUI *Handler;
 
+
+// History chooser function (opens plot for numeric data, TextHist for all other)
+QWidget *OpenHistory(char *Service) {
+
+  char *Name, *Format;
+  DimBrowser Browser;
+  
+  //if (Browser.getServices(Service) == 0) return NULL;
+  Browser.getServices(Service);
+  if (Browser.getNextService(Name, Format) != DimSERVICE) return NULL;
+  
+  if (strlen(Format) == 1 && *Format != 'C') return new Edd_Plot(Service);
+  else return new Edd_TextHist(Service);
+}
+
+
 //////////////////////////////////////////
 // Text display for arbitary DIM service//
@@ -41 +57 @@
   // Context menu
   Menu = new QMenu(this);
-  Menu->addAction("Open history", this, SLOT(MenuOpenHistory()));
+  Menu->addAction("Open new history", this, SLOT(MenuOpenHistory()));
   Menu->addAction("Copy service", this, SLOT(MenuCopyService()));
   Menu->addAction("Copy data", this, SLOT(MenuCopyData()));
@@ -135 +151 @@
 void Edd_Indicator::MenuOpenHistory() {
   
-  LastPlot = new Edd_Plot(Data->getName());
-  LastPlot->show();
+  LastPlot = OpenHistory(Data->getName());
+  if (LastPlot != NULL) LastPlot->show();
 }
 
@@ -165 +181 @@
   // Graph properties
   setAutoReplot(false);
-  QwtText XAxisTitle("Time (RJD-55200)");
-  XAxisTitle.setFont(QFont("Helvetica", 10));
-  setAxisTitle(QwtPlot::xBottom, XAxisTitle);
   setCanvasBackground(QColor(Qt::yellow));
+  setAxisScaleDraw(QwtPlot::xBottom, new TimeScale());
 
   Zoomer = new QwtPlotZoomer(QwtPlot::xBottom,QwtPlot::yLeft,canvas());
@@ -347 +361 @@
     else Items[ItemNo].Signal->setSymbol(Sym1);
 
-    int DataPoints = Items[ItemNo].x.size();
-        
+    int DataPoints = Items[ItemNo].x.size();    
         if (DataPoints == 0) continue;
-   
-    double *x = new double [DataPoints];
+ 
+    // Normalize y scale if requested
     double *y = new double [DataPoints];
- 
-    // Adapt time scale and normalize y scale if requested
     for (int i=0; i<DataPoints; i++) {
-      x[i] = Items[ItemNo].x[i] / 86400.0 + 40587.5 - 55200;
       y[i] = Items[ItemNo].y[i];
 
@@ -368 +378 @@
 
     // Plot data
-    Items[ItemNo].Signal->setData(x, y, DataPoints);
+    Items[ItemNo].Signal->setData(Items[ItemNo].x.data(), y, DataPoints);
     Items[ItemNo].Signal->show();
     Zoomer->setZoomBase(Items[ItemNo].Signal->boundingRect());
 
-    delete[] x;
     delete[] y;
   }
@@ -825 +834 @@
     Result = Result.trimmed();
     if (Result.endsWith(".hist")) Result.chop(5);
-    Edd_Plot *Plot = new Edd_Plot(Result);
-    Plot->show();
+    QWidget *Hist = OpenHistory(Result.toAscii().data());
+    if (Hist != NULL) Hist->show();
   }
 }

Evidence/Edd/Edd.h

@@ -24 +24 @@
 
 #define SVN_REVISION "$Revision$"
+
+QWidget *OpenHistory(char *);
+
+// Time scale for axis
+class TimeScale: public QwtScaleDraw {
+  public:
+    TimeScale() { }
+    virtual QwtText label(double v) const {
+      QDateTime t = QDateTime::fromTime_t((int) v);
+      return t.toString("dMMM'\n'h:m:s");
+    }
+};
+
                   
 // General indicator for DIM service
@@ -31 +44 @@
     QMenu *Menu;
     QPoint dragStart;
-    QwtPlot *LastPlot;
+    //QwtPlot *LastPlot;
+    QWidget *LastPlot;
         
     DimStampedInfo *Data;

Evidence/Evidence.cc

@@ -51 +51 @@
   
   // Start server
-  static char Init[] = "Server started";
+  static char Init[] = "Server started (" EVIDENCE_REVISION "  Compiled "__DATE__ __TIME__ ")";
   Status = new DimService((string(Name) + "/Status").c_str(), (char *) "C", Init, sizeof(Init));
 

Evidence/Evidence.h

@@ -8 +8 @@
 #include <exception>
 #include <vector>
-
+ 
 #include "dis.hxx"
 #include "dic.hxx"
@@ -14 +14 @@
 #define NO_LINK (char *) "__&DIM&NOLINK&__" // Data if no link available
 #define STATUS_SIZE 1000                                        // Bytes for status service string
+#define EVIDENCE_REVISION "$Revision$"
 
 // Class declation of Evidence server