update dive-deco to 2.0.0

Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/KG32/dive-reporter.git"
 
 [dependencies]
 colored = "2.1.0"
-dive-deco = "1.3.2"
+dive-deco = "2.0.0"
 eframe = "0.27.2"
 futures = "0.3.30"
 quick-xml = {version = "0.31.0", features = ["serialize"] }

src/common.rs

@@ -1,4 +1,4 @@
 pub type Depth = f64;
-pub type Seconds = usize;
+pub type Seconds = u64;
 pub type GF = f64;
 pub type GradientFactorsSetting = (u8, u8);

src/dive.rs

@@ -54,13 +54,13 @@ impl Dive {
         let (gf_lo, gf_hi) = self.meta.gradient_factors;
         let mut model = BuehlmannModel::new(BuehlmannConfig::new().gradient_factors(gf_lo, gf_hi));
         // calc by data point
-        let mut last_waypoint_time: usize = 0;
+        let mut last_waypoint_time: Seconds = 0;
         let dive_data_points = &dive_data.samples.waypoints;
         for data_point in dive_data_points {
             self.process_data_point(
                 &mut model,
                 &data_point,
-                &last_waypoint_time,
+                last_waypoint_time,
                 &gas_mixes,
             );
             // update last waypoint time
@@ -72,11 +72,11 @@ impl Dive {
         &mut self,
         model: &mut BuehlmannModel,
         data_point: &WaypointElem,
-        last_waypoint_time: &usize,
+        last_waypoint_time: Seconds,
         gas_mixes: &GasMixesData,
     ) {
         // time
-        let step_time = data_point.dive_time - last_waypoint_time;
+        let step_time: Seconds = data_point.dive_time - last_waypoint_time;
         self.total_time += step_time;
 
         // depth
@@ -102,7 +102,7 @@ impl Dive {
 
         // deco model step
         let gas = &self.meta.current_mix;
-        model.step(&data_point.depth, &step_time, gas);
+        model.step(data_point.depth, step_time, gas);
 
         // GFs
         let Supersaturation { gf_99, gf_surf } = model.supersaturation();

src/stats.rs

@@ -189,7 +189,7 @@ impl Stats {
         }
     }
 
-    pub fn seconds_to_readable(s: usize) -> String {
+    pub fn seconds_to_readable(s: Seconds) -> String {
         let seconds = s % 60;
         let minutes = (s / 60) % 60;
         let hours = (s / 60) / 60;