Rename EventValues → ScalarEvents

archapp/src/archeng/datablock.rs

@@ -4,8 +4,8 @@ use commonio::ringbuf::RingBuf;
 use commonio::{read_exact, seek};
 use err::Error;
 use items::eventsitem::EventsItem;
-use items::eventvalues::EventValues;
 use items::plainevents::{PlainEvents, ScalarPlainEvents, WavePlainEvents};
+use items::scalarevents::ScalarEvents;
 use items::waveevents::WaveEvents;
 use netpod::log::*;
 use netpod::timeunits::SEC;
@@ -353,7 +353,7 @@ ex_v!(f64, ex_v_f64);
 macro_rules! read_msg {
     ($sty:ident, $exfs:ident, $exfv:ident, $evvar:ident, $rb:expr, $msglen:expr, $numsamples:expr, $dbrt:expr, $dbrcount:ident) => {
         if $dbrcount == 1 {
-            let mut evs = EventValues::empty();
+            let mut evs = ScalarEvents::empty();
             for _ in 0..$numsamples {
                 $rb.fill_min($msglen).await?;
                 let buf = $rb.data();
@@ -459,7 +459,7 @@ pub async fn read_data2(
         DbrType::DbrTimeString => {
             if dbrcount == 1 {
                 // TODO
-                let evs = ScalarPlainEvents::I8(EventValues::empty());
+                let evs = ScalarPlainEvents::I8(ScalarEvents::empty());
                 let plain = PlainEvents::Scalar(evs);
                 let item = EventsItem::Plain(plain);
                 item
@@ -494,7 +494,7 @@ pub async fn read_data_1(
         DbrType::DbrTimeDouble => {
             if datafile_header.dbr_count == 1 {
                 trace!("~~~~~~~~~~~~~~~~~~~~~   read  scalar  DbrTimeDouble");
-                let mut evs = EventValues {
+                let mut evs = ScalarEvents {
                     tss: vec![],
                     values: vec![],
                 };

archapp/src/events.rs

@@ -9,8 +9,8 @@ use futures_core::Stream;
 use futures_util::StreamExt;
 use items::binnedevents::{MultiBinWaveEvents, SingleBinWaveEvents, XBinnedEvents};
 use items::eventsitem::EventsItem;
-use items::eventvalues::EventValues;
 use items::plainevents::{PlainEvents, ScalarPlainEvents, WavePlainEvents};
+use items::scalarevents::ScalarEvents;
 use items::waveevents::WaveEvents;
 use items::xbinnedscalarevents::XBinnedScalarEvents;
 use items::xbinnedwaveevents::XBinnedWaveEvents;
@@ -190,7 +190,7 @@ macro_rules! arm1 {
                 }
                 AggKind::Plain => arm2!(
                     $item,
-                    EventValues,
+                    ScalarEvents,
                     Plain,
                     PlainEvents,
                     Scalar,
@@ -200,7 +200,7 @@ macro_rules! arm1 {
                 ),
                 AggKind::TimeWeightedScalar => arm2!(
                     $item,
-                    EventValues,
+                    ScalarEvents,
                     XBinnedEvents,
                     XBinnedEvents,
                     Scalar,
@@ -210,7 +210,7 @@ macro_rules! arm1 {
                 ),
                 AggKind::DimXBins1 => arm2!(
                     $item,
-                    EventValues,
+                    ScalarEvents,
                     XBinnedEvents,
                     XBinnedEvents,
                     Scalar,
@@ -220,7 +220,7 @@ macro_rules! arm1 {
                 ),
                 AggKind::DimXBinsN(_) => arm2!(
                     $item,
-                    EventValues,
+                    ScalarEvents,
                     XBinnedEvents,
                     XBinnedEvents,
                     Scalar,
@@ -643,7 +643,7 @@ fn events_item_to_framable(ei: EventsItem) -> Result<Box<dyn Framable + Send>, E
                     b.push(k);
                     (a, b)
                 });
-            let b = EventValues { tss: x, values: y };
+            let b = ScalarEvents { tss: x, values: y };
             let b = Ok(StreamItem::DataItem(RangeCompletableItem::Data(b)));
             let ret = Box::new(b);
             Ok(ret)

archapp/src/parse.rs

@@ -8,8 +8,8 @@ use async_channel::{bounded, Receiver};
 use chrono::{TimeZone, Utc};
 use err::{ErrStr, Error};
 use items::eventsitem::EventsItem;
-use items::eventvalues::EventValues;
 use items::plainevents::{PlainEvents, ScalarPlainEvents, WavePlainEvents};
+use items::scalarevents::ScalarEvents;
 use items::waveevents::WaveEvents;
 use netpod::log::*;
 use netpod::{ArchiverAppliance, ChannelConfigQuery, ChannelConfigResponse};
@@ -41,7 +41,7 @@ pub struct PbFileReader {
 fn parse_scalar_byte(m: &[u8], year: u32) -> Result<EventsItem, Error> {
     let msg = crate::generated::EPICSEvent::ScalarByte::parse_from_bytes(m)
         .map_err(|_| Error::with_msg(format!("can not parse pb-type {}", "ScalarByte")))?;
-    let mut t = EventValues::<i8> {
+    let mut t = ScalarEvents::<i8> {
         tss: vec![],
         values: vec![],
     };
@@ -57,7 +57,7 @@ macro_rules! scalar_parse {
     ($m:expr, $year:expr, $pbt:ident, $eit:ident, $evty:ident) => {{
         let msg = crate::generated::EPICSEvent::$pbt::parse_from_bytes($m)
             .map_err(|e| Error::with_msg(format!("can not parse pb-type {}  {:?}", stringify!($pbt), e)))?;
-        let mut t = EventValues::<$evty> {
+        let mut t = ScalarEvents::<$evty> {
             tss: vec![],
             values: vec![],
         };