Changed API of geometry primitives

Author: pr0n1x

.editorconfig

@@ -0,0 +1,6 @@
+[*.toml]
+indent_size = 2
+indent_style = space
+[*.{rs,md}]
+indent_style = space
+indent_size = 4

Cargo.toml

@@ -22,7 +22,6 @@ cairo = ["cairo-rs", "png", "gio", "gtk", "ux-animate", "ux-animate/cairo"]
 [dependencies]
 log = "0.4"
 lazy_static = "1.4"
-ux-primitives = { version = "0.1" }
 ux-animate = { version = "0.1", default-features = false, optional = true }
 
 png = { version = "0.16", optional = true }
@@ -37,11 +36,15 @@ gloo = { version = "0.2", optional = true }
 js-sys = { version = "0.3", optional = true }
 wasm-bindgen-test = { version = "0.3", optional = true }
 
+[dependencies.ux-primitives]
+version = "0.1"
+features = [ "canvas" ]
+
 [dependencies.web-sys]
 version = "0.3"
 optional = true
 features = [
-  'KeyboardEvent',
+  "KeyboardEvent",
   "ValidityState",
   "CustomEvent",
   "Node",

src/bar.rs

@@ -3,7 +3,10 @@
 #![allow(dead_code)]
 
 use std::{collections::HashMap, fmt, cell::RefCell, rc::Rc};
-use ux_primitives::{canvas::*, math::*};
+use ux_primitives::{
+    canvas::CanvasContext,
+    geom::{Point, Size, Rect}
+};
 
 use crate::*;
 
@@ -77,8 +80,8 @@ struct BarChartProperties {
     x_label_hop: f64,
     /// Distance between two consecutive x-axis labels.
     y_label_hop: f64,
-    x_title_box: Rectangle<f64>,
-    y_title_box: Rectangle<f64>,
+    x_title_box: Rect<f64>,
+    y_title_box: Rect<f64>,
     x_title_center: Point<f64>,
     y_title_center: Point<f64>,
     x_labels: Vec<String>,

src/basechart.rs

@@ -1,5 +1,8 @@
 use std::{borrow::Borrow, cell::RefCell, collections::HashMap, fmt, rc::Rc};
-use ux_primitives::{canvas::*, math::*};
+use ux_primitives::{
+    canvas::CanvasContext,
+    geom::{Point, Size, Rect}
+};
 
 use super::*;
 
@@ -49,10 +52,10 @@ pub struct BaseChartProperties {
     pub tooltip_value_formatter: Option<ValueFormatter>,
 
     /// Bounding box of the series and axes.
-    pub series_and_axes_box: Rectangle<f64>,
+    pub series_and_axes_box: Rect<f64>,
 
     /// Bounding box of the chart title.
-    pub title_box: Rectangle<f64>,
+    pub title_box: Rect<f64>,
 
     /// A list used to keep track of the visibility of the series.
     pub series_states: Vec<Visibility>,
@@ -216,11 +219,12 @@ where
         }
 
         let mut props = self.props.borrow_mut();
-        props.series_and_axes_box = Rectangle {
-            left: CHART_PADDING,
-            top: CHART_PADDING,
-            width: props.width - 2.0 * CHART_PADDING,
-            height: props.height - 2.0 * CHART_PADDING,
+        props.series_and_axes_box = Rect {
+            origin: Point::new(CHART_PADDING, CHART_PADDING),
+            size: Size::new(
+                props.width - 2.0 * CHART_PADDING,
+                props.height - 2.0 * CHART_PADDING
+            ),
         };
 
         // // Consider the title.
@@ -229,18 +233,15 @@ where
             match title.position {
                 "above" => {
                     title_y = CHART_PADDING;
-                    props.series_and_axes_box.top =
-                        props.series_and_axes_box.top + title_h + CHART_TITLE_MARGIN;
-                    props.series_and_axes_box.height =
-                        props.series_and_axes_box.height - title_h + CHART_TITLE_MARGIN;
+                    props.series_and_axes_box.origin.x += title_h + CHART_TITLE_MARGIN;
+                    props.series_and_axes_box.size.height -= title_h + CHART_TITLE_MARGIN;
                 }
                 "middle" => {
                     title_y = f64::floor((props.height - title_h) / 2.0);
                 }
                 "below" => {
                     title_y = props.height - title_h - CHART_PADDING;
-                    props.series_and_axes_box.height =
-                        props.series_and_axes_box.height - title_h + CHART_TITLE_MARGIN;
+                    props.series_and_axes_box.size.height -= title_h + CHART_TITLE_MARGIN;
                 }
                 _ => {}
             }
@@ -253,11 +254,9 @@ where
             //   title_x = (width - titleW - 2 * TITLE_PADDING) ~/ 2;
         }
 
-        let title_box = Rectangle {
-            left: title_x,
-            top: title_y,
-            width: title_w,
-            height: title_h,
+        let title_box = Rect {
+            origin: Point::new(title_x, title_y),
+            size: Size::new(title_w, title_h),
         };
 
         // Consider the legend.

src/gauge.rs

@@ -3,7 +3,10 @@
 #![allow(dead_code)]
 
 use std::{collections::HashMap, fmt, cell::RefCell, rc::Rc};
-use ux_primitives::{canvas::*, math::*};
+use ux_primitives::{
+    canvas::CanvasContext,
+    geom::Point
+};
 
 use crate::*;
 
@@ -40,7 +43,7 @@ impl GaugeEntity {
 
     pub fn contains_point(&self, p: Point<f64>) -> bool {
         // let p = p - center;
-        let mag = p.magnitude();
+        let mag = p.distance_to(Point::default()); //p.magnitude()
         if mag > self.outer_radius || mag < self.inner_radius {
             return false;
         }

src/lib.rs

@@ -2,7 +2,10 @@
 #![allow(unused_variables)]
 
 use std::{collections::HashMap, fmt, rc::Rc, cell::RefCell};
-use ux_primitives::{canvas::*, math::*};
+use ux_primitives::{
+    canvas::CanvasContext,
+    geom::Point
+};
 
 #[macro_use] 
 extern crate lazy_static;
@@ -43,10 +46,10 @@ pub use utils::*;
 
 pub const PI: f64 = std::f64::consts::PI;
 /// The 2*pi constant - TAU
-pub const TAU: f64 = 6.28318530717958647692528676655900577_f64;
+pub const TAU: f64 = std::f64::consts::TAU;
 
 /// The pi/2 constant.
-pub const PI_2: f64 = 1.57079632679489661923132169163975144_f64;
+pub const PI_2: f64 = std::f64::consts::FRAC_PI_2;
 
 pub const FONT_FAMILY: &str = r#""Segoe UI", "Open Sans", Verdana, Arial"#;
 
@@ -86,7 +89,7 @@ pub fn default_value_formatter(value: f64) -> String {
 #[derive(Debug, Clone)]
 pub enum Visibility {
     Hidden,
-    Hidding,
+    Hiding,
     Showing,
     Shown,
 }

src/line.rs

@@ -3,12 +3,15 @@
 #![allow(dead_code)]
 
 use std::{collections::HashMap, fmt, cell::RefCell, rc::Rc};
-use ux_primitives::{canvas::*, math::*};
+use ux_primitives::{
+    canvas::CanvasContext,
+    geom::{Point, Rect},
+};
 
 use crate::*;
 
 #[derive(Default, Clone)]
-struct PointEntity {
+struct LinePoint {
     // Chart chart,
     color: String,
     highlight_color: String,
@@ -35,17 +38,14 @@ struct PointEntity {
     point_radius: f64,
 }
 
-impl PointEntity {
+impl LinePoint {
     fn as_point(&self) -> Point<f64> {
-        Point {
-            x: self.x,
-            y: self.y,
-        }
+        Point::new(self.x, self.y)
     }
 }
 
 /// A point in a line chart.
-impl<C> Drawable<C> for PointEntity
+impl<C> Drawable<C> for LinePoint
 where
     C: CanvasContext,
 {
@@ -67,7 +67,7 @@ where
     }
 }
 
-impl Entity for PointEntity {
+impl Entity for LinePoint {
     fn free(&mut self) {
         // chart = null;
     }
@@ -94,8 +94,8 @@ struct LineChartProperties {
     x_label_step: i64,
     x_label_hop: f64, // Distance between two consecutive x-axis labels.
     y_label_hop: f64, // Distance between two consecutive x-axis labels.
-    x_title_box: Rectangle<f64>,
-    y_title_box: Rectangle<f64>,
+    x_title_box: Rect<f64>,
+    y_title_box: Rect<f64>,
     x_title_center: Point<f64>,
     y_title_center: Point<f64>,
     x_labels: Vec<String>,
@@ -122,7 +122,7 @@ where
     D: fmt::Display,
 {
     props: RefCell<LineChartProperties>,
-    base: BaseChart<'a, C, PointEntity, M, D, LineChartOptions<'a>>,
+    base: BaseChart<'a, C, LinePoint, M, D, LineChartOptions<'a>>,
 }
 
 impl<'a, C, M, D> LineChart<'a, C, M, D>
@@ -551,7 +551,7 @@ where
         // }
     }
 
-    fn lerp_points(&self, points: Vec<PointEntity>, percent: f64) -> Vec<PointEntity> {
+    fn lerp_points(&self, points: Vec<LinePoint>, percent: f64) -> Vec<LinePoint> {
         // return points.map((p) {
         //   let x = lerp(p.oldX, p.x, percent);
         //   let y = lerp(p.oldY, p.y, percent);
@@ -580,7 +580,7 @@ where
     }
 }
 
-impl<'a, C, M, D> Chart<PointEntity> for LineChart<'a, C, M, D>
+impl<'a, C, M, D> Chart<LinePoint> for LineChart<'a, C, M, D>
 where
     C: CanvasContext,
     M: fmt::Display,
@@ -594,7 +594,7 @@ where
     }
 
     fn draw_series(&self, percent: f64) -> bool {
-        fn curve_to(cp1: Point<f64>, cp2: Point<f64>, p: PointEntity) {
+        fn curve_to(cp1: Point<f64>, cp2: Point<f64>, p: LinePoint) {
             //     if cp2 == null && cp1 == null {
             //       series_context.lineTo(p.x, p.y);
             //     } else if cp2 == null {
@@ -786,7 +786,7 @@ where
         value: String,
         color: String,
         highlight_color: String,
-    ) -> PointEntity {
+    ) -> LinePoint {
         // let x = x_label_x(entityIndex);
         // let oldY = x_axis_top;
         // // oldCp1 and oldCp2 are calculated in [update_series].

src/pie.rs

@@ -4,7 +4,10 @@
 #![allow(dead_code)]
 
 use std::{collections::HashMap, fmt, cell::RefCell, rc::Rc};
-use ux_primitives::{canvas::*, math::*};
+use ux_primitives::{
+    canvas::CanvasContext,
+    geom::Point
+};
 
 use crate::*;
 
@@ -43,7 +46,7 @@ impl PieEntity {
 
     fn contains_point(&self, p: Point<f64>) -> bool {
         // p -= center;
-        let mag = p.magnitude();
+        let mag = p.distance_to(Point::default()); //p.magnitude();
         if mag > self.outer_radius || mag < self.inner_radius {
             return false;
         }
@@ -169,7 +172,7 @@ where
     }
 
     fn get_entity_group_index(&self, x: f64, y: f64) -> i64 {
-        let p = Point { x, y };
+        let p = Point::new(x, y);
         // let entities = series_list.first.entities;
         // for (let i = entities.length - 1; i >= 0; i--) {
         //   let pie = entities[i] as Pie;
@@ -209,8 +212,8 @@ where
     fn calculate_drawing_sizes(&self) {
         self.base.calculate_drawing_sizes();
         let rect = &self.base.props.borrow().series_and_axes_box;
-        let half_w = rect.width as i64 >> 1;
-        let half_h = rect.height as i64 >> 1;
+        let half_w = rect.size.width as i64 >> 1;
+        let half_h = rect.size.height as i64 >> 1;
 
         // self.center = Point {
         //     x: (rect.left + half_w) as f64,