Changeset 17037 for fact/tools/Edd

Timestamp:

08/23/13 14:54:34 (11 years ago)

Author:

ogrimm

Message:

Evidence GUI ported to qwt 6.1.0. Added highlighting of curves in GUI.

Location:

fact/tools/Edd

Files:

• Edd.cc (modified) (3 diffs)
• Edd.h (modified) (1 diff)

fact/tools/Edd/Edd.cc

@@ -85 +85 @@
   N.Channel = Channel;
   N.Trigger = new QwtPlotMarker();
-  N.Trigger->setSymbol(QwtSymbol(QwtSymbol::Diamond, QBrush(N.Curve->pen().color()), N.Curve->pen(), QSize(10,10)));
+  N.Trigger->setSymbol(new QwtSymbol(QwtSymbol::Diamond, QBrush(N.Curve->pen().color()), N.Curve->pen(), QSize(10,10)));
   N.Trigger->attach(this);
 
@@ -778 +778 @@
 
   for (int i=0; i<Data.size(); i++) {
-        Pixel[i]->setPalette(QPalette(Map.color(QwtDoubleInterval(300, 400), Data[i])));
+        Pixel[i]->setPalette(QPalette(Map.color(QwtInterval(300, 400), Data[i])));
   }
 }
@@ -1053 +1053 @@
   static bool AlarmServerWarned = false;
 
+
+  // Removed 19 August 2013
+  return;
+
   // === Check service Alarm/MasterAlarm ===
   DimCurrentInfo MasterAlarm("Alarm/MasterAlarm", -1);

fact/tools/Edd/Edd.h

@@ -49 +49 @@
   public slots:
         void OpenRawFile(QString=QString());
-        
+        void RemoveService(QwtPlotCurve *) {};
+                
   signals:
         void PixelData(QVector<double>);