Begin refactor frame handling, update clap

items_2/src/eventsdim0.rs

@@ -11,13 +11,6 @@ use std::any::Any;
 use std::collections::VecDeque;
 use std::{fmt, mem};
 
-#[allow(unused)]
-macro_rules! trace {
-    ($($x:expr),*) => {
-        {let _ = format!($($x),*);}
-    };
-}
-
 #[derive(Clone, PartialEq, Serialize, Deserialize)]
 pub struct EventsDim0<NTY> {
     pub tss: VecDeque<u64>,
@@ -574,6 +567,7 @@ pub struct EventsDim0TimeBinner<NTY: ScalarOps> {
     edges: VecDeque<u64>,
     agg: EventsDim0Aggregator<NTY>,
     ready: Option<<EventsDim0Aggregator<NTY> as TimeBinnableTypeAggregator>::Output>,
+    range_complete: bool,
 }
 
 impl<NTY: ScalarOps> EventsDim0TimeBinner<NTY> {
@@ -594,6 +588,7 @@ impl<NTY: ScalarOps> EventsDim0TimeBinner<NTY> {
             edges,
             agg,
             ready: None,
+            range_complete: false,
         };
         Ok(ret)
     }
@@ -759,5 +754,7 @@ impl<NTY: ScalarOps> TimeBinner for EventsDim0TimeBinner<NTY> {
         }
     }
 
-    fn set_range_complete(&mut self) {}
+    fn set_range_complete(&mut self) {
+        self.range_complete = true;
+    }
 }

items_2/src/items_2.rs

@@ -253,7 +253,7 @@ pub trait TimeBinnable: fmt::Debug + WithLen + RangeOverlapInfo + Any + Send {
 }
 
 /// Container of some form of events, for use as trait object.
-pub trait Events: fmt::Debug + Any + Collectable + TimeBinnable + Send {
+pub trait Events: fmt::Debug + Any + Collectable + TimeBinnable + Send + erased_serde::Serialize {
     fn as_time_binnable(&self) -> &dyn TimeBinnable;
     fn verify(&self) -> bool;
     fn output_info(&self);
@@ -264,6 +264,8 @@ pub trait Events: fmt::Debug + Any + Collectable + TimeBinnable + Send {
     fn partial_eq_dyn(&self, other: &dyn Events) -> bool;
 }
 
+erased_serde::serialize_trait_object!(Events);
+
 impl PartialEq for Box<dyn Events> {
     fn eq(&self, other: &Self) -> bool {
         Events::partial_eq_dyn(self.as_ref(), other.as_ref())
@@ -429,13 +431,13 @@ pub fn empty_binned_dyn(scalar_type: &ScalarType, shape: &Shape, agg_kind: &AggK
     }
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub enum ConnStatus {
     Connect,
     Disconnect,
 }
 
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct ConnStatusEvent {
     pub ts: u64,
     pub status: ConnStatus,
@@ -458,7 +460,7 @@ impl<T: MergableEvents> MergableEvents for Box<T> {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Serialize)]
 pub enum ChannelEvents {
     Events(Box<dyn Events>),
     Status(ConnStatusEvent),