Merge pull request #77 from martinling/more-tree-model-improvements

More tree model improvements

Cargo.toml

@@ -40,6 +40,7 @@ rand_xorshift = "0.3.0"
 step-decoder = []
 record-ui-test = ["serde", "serde_json"]
 test-ui-replay = ["serde", "serde_json"]
+debug-region-map = []
 
 [[test]]
 name = "test_replay"

src/capture.rs

@@ -219,14 +219,14 @@ pub type EndpointDataEvent = u64;
 pub type EndpointByteCount = u64;
 pub type DeviceVersion = u32;
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug)]
 pub enum TrafficItem {
     Transfer(TransferId),
     Transaction(TransferId, TransactionId),
     Packet(TransferId, TransactionId, PacketId),
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug)]
 pub enum DeviceItem {
     Device(DeviceId, DeviceVersion),
     DeviceDescriptor(DeviceId),
@@ -1063,6 +1063,16 @@ pub enum CompletionStatus {
     Ongoing
 }
 
+impl CompletionStatus {
+    pub fn is_complete(&self) -> bool {
+        use CompletionStatus::*;
+        match self {
+            Complete => true,
+            Ongoing => false,
+        }
+    }
+}
+
 pub trait ItemSource<Item> {
     fn item(&mut self, parent: Option<&Item>, index: u64)
         -> Result<Item, CaptureError>;

src/id.rs

@@ -36,7 +36,7 @@ impl<T> Debug for Id<T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>)
         -> Result<(), std::fmt::Error>
     {
-        write!(f, "Id({})", self.value)
+        write!(f, "{}", self.value)
     }
 }
 

src/model/mod.rs

@@ -61,7 +61,7 @@ impl GenericModel<TrafficItem> for TrafficModel {
     {
         let tree_opt  = self.imp().tree.borrow();
         let tree = tree_opt.as_ref().unwrap();
-        tree.set_expanded(self, node, position, expanded)
+        tree.set_expanded(self, node, position as u64, expanded)
     }
 
     fn update(&self) -> Result<bool, ModelError> {
@@ -107,7 +107,7 @@ impl GenericModel<DeviceItem> for DeviceModel {
     {
         let tree_opt  = self.imp().tree.borrow();
         let tree = tree_opt.as_ref().unwrap();
-        tree.set_expanded(self, node, position, expanded)
+        tree.set_expanded(self, node, position as u64, expanded)
     }
 
     fn update(&self) -> Result<bool, ModelError> {