Added class field to GraphicSpec.

Dependencies

• [2] XPXYFEZM Finished code for building TSJson struct.
• [3] EHEK63WA Cleaning up ts.rs.
• [4] TSY4YBBZ Changed ts Spec datastructures to new format.
• [5] GQVS55HI Finished generate_ts_spec() function.
• [6] TTR5IFSG Working on building generic TSSpec.
• [7] 5B2HBV3J Completed first try at ts Json data-structure.
• [8] SPSFTMLR Completed loading ts_data from specification.
• [9] 2CCG6KUP Redo time-series spec.
• [*] 4MG5JFXT First record.

Change contents

• edit in src/ts.rs at line 156
  [3.1134]

  [3.1134]
  + class_opt,
• edit in src/ts.rs at line 159
  [3.1229]→[3.1229:1260](∅→∅)
  − text_spec,
• edit in src/ts.rs at line 171
  [2.1330]

  [3.1524]
  + let text_spec = match graphic_spec.class_opt {

  + Some(GraphicClass::Cleaned) => TextSpec::Link,

  + Some(GraphicClass::Collated) => TextSpec::Link,

  + Some(GraphicClass::Source) => TextSpec::Meta,

  + // Default is assumed implicitly to be GraphicClass::Source.

  + None => TextSpec::Meta,

  + };

  +
• replacement in src/ts.rs at line 182
  [2.1375]→[3.1661:1717](∅→∅),[3.1661]→[3.1661:1717](∅→∅)
  − text_spec: graphic_spec.text_spec,
  [2.1375]

  [3.1717]
  + text_spec: text_spec,
• edit in src/ts.rs at line 427
  [3.1851]

  [3.1851]
  + }

  + }

  +

  + #[derive(Debug)]

  + pub enum GraphicClass {

  + /// Generally the top graphic which displays all time-series.

  + Collated,

  +

  + /// A single time-series which displays un-transformed data directly from source.

  + Source,

  +

  + /// Data that has been selected and transformed.

  + Cleaned,

  + }

  +

  + impl FromStr for GraphicClass {

  + type Err = Error;

  +

  + fn from_str(s: &str) -> Result<Self, Error> {

  + match s {

  + "collated" => Ok(GraphicClass::Collated),

  + "source" => Ok(GraphicClass::Source),

  + "cleaned" => Ok(GraphicClass::Cleaned),

  + _ => Err(keytree_error(file!(), line!(), "Failed to parse GraphicClass")),

  + }
• edit in src/ts.rs at line 455
  [3.1860]

  [3.9224]
  + impl fmt::Display for GraphicClass {

  + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

  + let s = match self {

  + GraphicClass::Collated => "collated",

  + GraphicClass::Source => "source",

  + GraphicClass::Cleaned => "cleaned",

  + };

  + write!(f, "{}", s)

  + }

  + }

  +
• edit in src/ts.rs at line 478
  [3.9473]

  [3.3497]
  + pub class_opt: Option<GraphicClass>,
• edit in src/ts.rs at line 481
  [3.3601]→[3.2038:2068](∅→∅),[3.2038]→[3.2038:2068](∅→∅)
  − pub text_spec: TextSpec,
• edit in src/ts.rs at line 489
  [3.1845]

  [3.3602]
  + class_opt: self.opt_value("graphic::class")?,
• edit in src/ts.rs at line 492
  [3.3808]→[3.2069:2131](∅→∅),[3.2116]→[3.2069:2131](∅→∅)
  − text_spec: self.value("graphic::text")?,
• edit in src/ts.rs at line 502
  [3.7063]

  [3.3809]
  + if let Some(class) = &self.class_opt {

  + kt.push_value(1, "class", class);

  + }

  +
• edit in src/ts.rs at line 513
  [3.2673]→[3.2673:2725](∅→∅)
  −

  − kt.push_value(1, "text", &self.text_spec);
• edit in src/lib.rs at line 205
  [3.4283]

  [3.4177]
  + GraphicClass,
• edit in src/lib.rs at line 488
  [3.4990]

  [3.4917]
  + class_opt: Some(GraphicClass::Collated),
• edit in src/lib.rs at line 491
  [3.5025]→[3.5138:5182](∅→∅),[3.5138]→[3.5138:5182](∅→∅)
  − text_spec: TextSpec::Link,
• edit in src/lib.rs at line 513
  [3.5840]

  [3.5270]
  + class_opt: Some(GraphicClass::Source),
• edit in src/lib.rs at line 516
  [3.5416]→[3.6030:6078](∅→∅),[3.6030]→[3.6030:6078](∅→∅)
  − text_spec: TextSpec::Meta,