seraplot 2.3.80__tar.gz → 2.3.81__tar.gz

{seraplot-2.3.80 → seraplot-2.3.81}/Cargo.lock

@@ -3471,7 +3471,7 @@ checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
 
 [[package]]
 name = "seraplot"
-version = "2.3.80"
+version = "2.3.81"
 dependencies = [
  "base64 0.22.1",
  "criterion",

{seraplot-2.3.80 → seraplot-2.3.81}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "seraplot"
-version = "2.3.80"
+version = "2.3.81"
 edition = "2021"
 authors = ["feur25"]
 description = "Rust data visualization framework - The modern Plotly alternative"

{seraplot-2.3.80 → seraplot-2.3.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seraplot
-Version: 2.3.80
+Version: 2.3.81
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Win32 (MS Windows)
 Classifier: Intended Audience :: Developers

{seraplot-2.3.80 → seraplot-2.3.81}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "seraplot"
-version = "2.3.80"
+version = "2.3.81"
 description = "Rust data visualization framework - The modern Plotly alternative"
 readme = "README.md"
 readme-content-type = "text/markdown"

{seraplot-2.3.80 → seraplot-2.3.81}/src/bindings/commands/native.rs

@@ -261,58 +261,13 @@ impl KMeansModel {
 }
 
 #[cfg(feature = "python")]
-#[pyfunction]
-#[pyo3(signature = (charts, cols=2, gap=16, bg=None, cell_height=520))]
-pub fn build_grid(
-    charts: Vec<PyRef<Chart>>,
-    cols: usize,
-    gap: i32,
-    bg: Option<&str>,
-    cell_height: i32,
-) -> Chart {
-    let html_strs: Vec<String> = charts.iter().map(|c| c.html.clone()).collect();
-    Chart::new_doc(
-        crate::bindings::commands::charts::build_grid(
-            &serde_json::json!({"charts": html_strs, "cols": cols, "gap": gap, "background": bg, "cell_height": cell_height}).to_string()
-        ),
-        crate::bindings::commands::docs::DOC_BUILD_GRID,
-    )
-}
+crate::impl_python_build_grid!();
 
 #[cfg(feature = "python")]
-#[pyfunction]
-#[pyo3(signature = (charts, interval_ms=2500, title="", width=900, height=520))]
-pub fn build_slideshow(
-    charts: Vec<PyRef<Chart>>,
-    interval_ms: u32,
-    title: &str,
-    width: i32,
-    height: i32,
-) -> Chart {
-    let html_strs: Vec<String> = charts.iter().map(|c| c.html.clone()).collect();
-    Chart::new_doc(
-        crate::bindings::commands::charts::build_slideshow(
-            &serde_json::json!({"charts": html_strs, "interval_ms": interval_ms, "title": title, "width": width, "height": height}).to_string()
-        ),
-        crate::bindings::commands::docs::DOC_BUILD_SLIDESHOW,
-    )
-}
+crate::impl_python_build_slideshow!();
 
 #[cfg(feature = "python")]
-#[pyfunction]
-#[pyo3(signature = (labels, images=None, descriptions=None))]
-pub fn build_hover_json(
-    labels: Vec<String>,
-    images: Option<Vec<Option<String>>>,
-    descriptions: Option<Vec<Vec<(String, String)>>>,
-) -> String {
-    let desc_json: Option<Vec<Vec<Vec<String>>>> = descriptions.map(|outer|
-        outer.into_iter().map(|row| row.into_iter().map(|(k, v)| vec![k, v]).collect()).collect()
-    );
-    crate::bindings::commands::charts::build_hover_json(
-        &serde_json::json!({"labels": labels, "images": images, "descriptions": desc_json}).to_string()
-    )
-}
+crate::impl_python_build_hover_json!();
 
 #[cfg(feature = "python")]
 #[pyfunction]

{seraplot-2.3.80 → seraplot-2.3.81}/src/bindings/registry_macro.rs

@@ -182,3 +182,69 @@ macro_rules! for_each_fn {
         $mac!(reset_global_background,   "resetGlobalBackground");
     };
 }
+
+#[macro_export]
+macro_rules! impl_python_build_grid {
+    () => {
+        #[pyfunction]
+        #[pyo3(signature = (charts, cols=2, gap=16, bg=None, cell_height=520))]
+        pub fn build_grid(
+            charts: Vec<pyo3::PyRef<crate::Chart>>,
+            cols: usize,
+            gap: i32,
+            bg: Option<&str>,
+            cell_height: i32,
+        ) -> crate::Chart {
+            let html_strs: Vec<String> = charts.iter().map(|c| c.html.clone()).collect();
+            crate::Chart::new_doc(
+                crate::bindings::commands::charts::build_grid(
+                    &serde_json::json!({"charts": html_strs, "cols": cols, "gap": gap, "background": bg, "cell_height": cell_height}).to_string()
+                ),
+                crate::bindings::commands::docs::DOC_BUILD_GRID,
+            )
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! impl_python_build_slideshow {
+    () => {
+        #[pyfunction]
+        #[pyo3(signature = (charts, interval_ms=2500, title="", width=900, height=520))]
+        pub fn build_slideshow(
+            charts: Vec<pyo3::PyRef<crate::Chart>>,
+            interval_ms: u32,
+            title: &str,
+            width: i32,
+            height: i32,
+        ) -> crate::Chart {
+            let html_strs: Vec<String> = charts.iter().map(|c| c.html.clone()).collect();
+            crate::Chart::new_doc(
+                crate::bindings::commands::charts::build_slideshow(
+                    &serde_json::json!({"charts": html_strs, "interval_ms": interval_ms, "title": title, "width": width, "height": height}).to_string()
+                ),
+                crate::bindings::commands::docs::DOC_BUILD_SLIDESHOW,
+            )
+        }
+    };
+}
+
+#[macro_export]
+macro_rules! impl_python_build_hover_json {
+    () => {
+        #[pyfunction]
+        #[pyo3(signature = (labels, images=None, descriptions=None))]
+        pub fn build_hover_json(
+            labels: Vec<String>,
+            images: Option<Vec<Option<String>>>,
+            descriptions: Option<Vec<Vec<(String, String)>>>,
+        ) -> String {
+            let desc_json: Option<Vec<Vec<Vec<String>>>> = descriptions.map(|outer|
+                outer.into_iter().map(|row| row.into_iter().map(|(k, v)| vec![k, v]).collect()).collect()
+            );
+            crate::bindings::commands::charts::build_hover_json(
+                &serde_json::json!({"labels": labels, "images": images, "descriptions": desc_json}).to_string()
+            )
+        }
+    };
+}