use mjd as x axis labels, and improve x axis display

gwbres · gwbres · commit cedb4ef435d5 · 2023-12-12T09:01:43.000+01:00
Signed-off-by: Guillaume W. Bres &lt;guillaume.bressaix@gmail.com&gt;
diff --git a/cggtts-cli/src/plot/context.rs b/cggtts-cli/src/plot/context.rs
@@ -1,4 +1,5 @@
-use super::{build_default_2y_plot, build_default_plot, Plot};
+use super::{build_timedomain_2y_plot, build_timedomain_plot, Plot};
+
 use plotly::Trace;
 
 /// Plot Context
@@ -17,12 +18,12 @@ impl PlotContext {
         let len = self.plots.len() - 1;
         self.plots.get_mut(len)
     }*/
-    pub fn add_cartesian2d_plot(&mut self, title: &str, y_label: &str) {
-        self.plots.push(build_default_plot(title, y_label));
+    pub fn add_timedomain_plot(&mut self, title: &str, y_label: &str) {
+        self.plots.push(build_timedomain_plot(title, y_label));
     }
-    pub fn add_cartesian2d_2y_plot(&mut self, title: &str, y1_label: &str, y2_label: &str) {
+    pub fn add_timedomain_2y_plot(&mut self, title: &str, y1_label: &str, y2_label: &str) {
         self.plots
-            .push(build_default_2y_plot(title, y1_label, y2_label));
+            .push(build_timedomain_2y_plot(title, y1_label, y2_label));
     }
     pub fn add_trace(&mut self, trace: Box<dyn Trace>) {
         let len = self.plots.len() - 1;
diff --git a/cggtts-cli/src/plot/mod.rs b/cggtts-cli/src/plot/mod.rs
@@ -4,6 +4,8 @@ use plotly::{
         //DashType,
         Font,
         HoverInfo,
+        //Marker,
+        //MarkerSymbol,
         Mode,
         Side,
         Title,
@@ -12,45 +14,69 @@ use plotly::{
     Layout, Plot, Scatter,
 };
 
-use serde::Serialize;
-
 mod context;
 pub use context::PlotContext;
 
+use serde::Serialize;
+
 use cggtts::prelude::Epoch;
 
+/*
+ * Builds a default chart, 2D, X = time axis
+ */
+pub fn build_chart_epoch_axis<T: Clone + Default + Serialize>(
+    name: &str,
+    mode: Mode,
+    epochs: Vec<Epoch>,
+    data_y: Vec<T>,
+) -> Box<Scatter<f64, T>> {
+    let txt: Vec<String> = epochs.iter().map(|e| e.to_string()).collect();
+    Scatter::new(epochs.iter().map(|e| e.to_mjd_utc_days()).collect(), data_y)
+        .mode(mode)
+        //.web_gl_mode(true)
+        .name(name)
+        .hover_text_array(txt)
+        .hover_info(HoverInfo::All)
+}
+
 /*
  * builds a standard 2D plot single Y scale,
  * ready to plot data against time (`Epoch`)
  */
-pub fn build_default_plot(title: &str, y_title: &str) -> Plot {
+pub fn build_timedomain_plot(title: &str, y_title: &str) -> Plot {
     build_plot(
         title,
         Side::Top,
         Font::default(),
-        "Epoch",
+        "MJD",
         y_title,
         (true, true), // y=0 lines
         true,         // show legend
         true,         // autosize
+        true,         // show tick labels
+        0.25,         // ticks dx
+        "{:05}",      // ticks fmt
     )
 }
 
 /*
  * build a standard 2D plot dual Y axes,
  * to plot against `Epochs`
  */
-pub fn build_default_2y_plot(title: &str, y1_title: &str, y2_title: &str) -> Plot {
+pub fn build_timedomain_2y_plot(title: &str, y1_title: &str, y2_title: &str) -> Plot {
     build_plot_2y(
         title,
         Side::Top,
         Font::default(),
-        "Epoch",
+        "MJD",
         y1_title,
         y2_title,
         (false, false), // y=0 lines
         true,           // show legend
         true,           // autosize
+        true,           // show x tick label
+        0.25,           // dx tick
+        "{:05}",        // x tick fmt
     )
 }
 
@@ -66,14 +92,19 @@ fn build_plot(
     zero_line: (bool, bool), // plots a bold line @ (x=0,y=0)
     show_legend: bool,
     auto_size: bool,
+    show_xtick_labels: bool,
+    dx_tick: f64,
+    x_tick_fmt: &str,
 ) -> Plot {
     let layout = Layout::new()
         .title(Title::new(title).font(title_font))
         .x_axis(
             Axis::new()
                 .title(Title::new(x_axis_title).side(title_side))
                 .zero_line(zero_line.0)
-                .show_tick_labels(false),
+                .show_tick_labels(show_xtick_labels)
+                .dtick(dx_tick)
+                .tick_format(x_tick_fmt),
         )
         .y_axis(
             Axis::new()
@@ -97,14 +128,19 @@ fn build_plot_2y(
     zero_line: (bool, bool), // plots a bold line @ (x=0,y=0)
     show_legend: bool,
     auto_size: bool,
+    show_xtick_labels: bool,
+    dx_tick: f64,
+    xtick_fmt: &str,
 ) -> Plot {
     let layout = Layout::new()
         .title(Title::new(title).font(title_font))
         .x_axis(
             Axis::new()
                 .title(Title::new(x_title).side(title_side))
                 .zero_line(zero_line.0)
-                .show_tick_labels(false),
+                .show_tick_labels(show_xtick_labels)
+                .dtick(dx_tick)
+                .tick_format(xtick_fmt),
         )
         .y_axis(
             Axis::new()
@@ -124,21 +160,3 @@ fn build_plot_2y(
     p.set_layout(layout);
     p
 }
-
-/*
- * Builds a default chart, 2D, X = time axis
- */
-pub fn build_chart_epoch_axis<T: Clone + Default + Serialize>(
-    name: &str,
-    mode: Mode,
-    epochs: Vec<Epoch>,
-    data_y: Vec<T>,
-) -> Box<Scatter<f64, T>> {
-    let txt: Vec<String> = epochs.iter().map(|e| e.to_string()).collect();
-    Scatter::new(epochs.iter().map(|e| e.to_utc_seconds()).collect(), data_y)
-        .mode(mode)
-        //.web_gl_mode(true)
-        .name(name)
-        .hover_text_array(txt)
-        .hover_info(HoverInfo::All)
-}
diff --git a/cggtts-cli/src/processing.rs b/cggtts-cli/src/processing.rs
@@ -1,9 +1,14 @@
-use crate::plot::{build_chart_epoch_axis, PlotContext};
 use cggtts::prelude::{Epoch, CGGTTS};
 use itertools::Itertools;
 use plotly::common::Mode;
 use std::collections::HashMap;
 
+use crate::plot::{
+    //build_timedomain_plot,
+    build_chart_epoch_axis,
+    PlotContext,
+};
+
 pub fn single_clock(cggtts: &CGGTTS, ctx: &mut PlotContext) {
     let sv: Vec<_> = cggtts.tracks().map(|trk| trk.sv).unique().collect();
     let codes: Vec<_> = cggtts
@@ -13,7 +18,11 @@ pub fn single_clock(cggtts: &CGGTTS, ctx: &mut PlotContext) {
         .collect();
 
     //REFSV/SRSV analysis
-    ctx.add_cartesian2d_2y_plot(&format!("{} REFSV/SRSV", cggtts.station), "REFSV", "SRSV");
+    ctx.add_timedomain_2y_plot(
+        &format!("{} REFSV/SRSV", cggtts.station),
+        "REFSV [s]",
+        "SRSV [s/s]",
+    );
     for sv in &sv {
         for code in &codes {
             let epochs: Vec<_> = cggtts
@@ -63,10 +72,10 @@ pub fn single_clock(cggtts: &CGGTTS, ctx: &mut PlotContext) {
     }
 
     //REFSYS/SRSYS analysis
-    ctx.add_cartesian2d_2y_plot(
+    ctx.add_timedomain_2y_plot(
         &format!("{} REFSYS/SRSYS", cggtts.station),
-        "REFSYS",
-        "SRSYS",
+        "REFSYS [s]",
+        "SRSYS [s/s]",
     );
     for sv in &sv {
         for code in &codes {
@@ -117,7 +126,11 @@ pub fn single_clock(cggtts: &CGGTTS, ctx: &mut PlotContext) {
     }
 
     //TROPO
-    ctx.add_cartesian2d_2y_plot(&format!("{} MDTR/SMDT", cggtts.station), "MDTR", "SMDT");
+    ctx.add_timedomain_2y_plot(
+        &format!("{} MDTR/SMDT", cggtts.station),
+        "MDTR [s]",
+        "SMDT [s/s]",
+    );
     for sv in &sv {
         for code in &codes {
             let epochs: Vec<_> = cggtts
@@ -183,7 +196,7 @@ pub fn clock_comparison(pool: &Vec<CGGTTS>, ctx: &mut PlotContext) {
         .collect();
 
     for i in 1..pool.len() {
-        ctx.add_cartesian2d_plot(
+        ctx.add_timedomain_plot(
             &format!("{}-{}", ref_clock.station, pool[i].station),
             "Delta [s]",
         );
