Updated Property Class

- Remade entirely (skipping rebase etc) using new understanding of subclassing

Updated Processor Class
- Added default implmementation in mod.rs

Added Formatter Class
- Processes Vec of Strings (removes characters other than digits and '.', checks that they are convertable into floats and then formats using passed closure)
- Closure used over subclasses as subclasses of subclasses was hurting my brain

Updated Main Program
- Made button comments clearer, explaining purpose of each
- Added button4 - testing various processor/formatter/property combos

Signed-off-by: Deren Vural <[email protected]>

Author: Deren Vural

src/formatter/imp.rs

@@ -0,0 +1,165 @@
+// SPDX-FileCopyrightText: 2022 Deren Vural
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/*
+ * Name:
+ * imp.rs
+ *
+ * Description:
+ * Implementation of our custom GObject class (Formatter)
+ *
+ * Made:
+ * 05/10/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ * Most of this left blank, may add fields later
+ */
+
+// Imports
+use gtk::glib::once_cell::sync::Lazy;
+use gtk::glib::{self, ParamSpec, Value};
+use gtk::subclass::prelude::*;
+
+// Modules
+//
+
+// Object holding the state
+#[derive(Default)]
+pub struct Formatter;
+
+// The central trait for subclassing a GObject
+#[glib::object_subclass]
+impl ObjectSubclass for Formatter {
+    //Crate+Obj to avoid collisions
+    const NAME: &'static str = "NvidiaExtensionRustFormatter";
+    // the actual GObject that will be created
+    type Type = super::Formatter;
+    // Parent GObject we inherit from
+    type ParentType = gtk::Widget;
+}
+
+/*
+ * Trait Name:
+ * ObjectImpl
+ *
+ * Description:
+ * Trait shared by all GObjects
+ *
+ * Made:
+ * 05/10/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ *
+ */
+impl ObjectImpl for Formatter {
+    /*
+     * Name:
+     * properties
+     *
+     * Description:
+     * Create list of custom properties for our GObject
+     *
+     * Made:
+     * 05/10/2022
+     *
+     * Made by:
+     * Deren Vural
+     *
+     * Notes:
+     * beware that you need to use kebab-case (https://en.wikipedia.org/wiki/Letter_case#Kebab_case)
+     *
+     * ParamSpec Examples:
+     * glib::ParamSpecString::builder("icon").build(),
+     * glib::ParamSpecUInt::builder("gpu_count").build(),
+     * glib::ParamSpecString::builder("call_extension").build(),
+     * TODO: these are from property class
+     * glib::ParamSpecBoxed::builder("processor").build(),
+     * glib::ParamSpecObject::builder("formatter").build(),
+     */
+    fn properties() -> &'static [ParamSpec] {
+        static PROPERTIES: Lazy<Vec<ParamSpec>> = Lazy::new(|| {
+            vec![
+                //
+            ]
+        });
+
+        //println!("PROPERTIES: {:?}", PROPERTIES);//TEST
+        //println!("trying to add `base_call`: {:?}", glib::ParamSpecString::builder("base_call").build());//TEST
+
+        PROPERTIES.as_ref()
+    }
+
+    /*
+     * Name:
+     * set_property
+     *
+     * Description:
+     * Mutator for custom GObject properties
+     *
+     * Made:
+     * 05/10/2022
+     *
+     * Made by:
+     * Deren Vural
+     *
+     * Notes:
+     *
+     */
+    fn set_property(&self, _obj: &Self::Type, _id: usize, _value: &Value, pspec: &ParamSpec) {
+        //println!("setting: {:?}", pspec.name());//TEST
+
+        match pspec.name() {
+            //
+            _ => unimplemented!(), //TODO
+        }
+    }
+
+    /*
+     * Name:
+     * property
+     *
+     * Description:
+     * Accessir for custom GObject properties
+     *
+     * Made:
+     * 05/10/2022
+     *
+     * Made by:
+     * Deren Vural
+     *
+     * Notes:
+     *
+     */
+    fn property(&self, _obj: &Self::Type, _id: usize, pspec: &ParamSpec) -> Value {
+        //println!("getting: {:?}", pspec.name());//TEST
+
+        match pspec.name() {
+            //
+            _ => unimplemented!(), //TODO
+        }
+    }
+}
+
+/*
+ * Trait Name:
+ * WidgetImpl
+ *
+ * Description:
+ * Trait shared by all widgets
+ *
+ * Made:
+ * 05/10/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ * leaving blank atm, boilerplate
+ */
+impl WidgetImpl for Formatter {}

src/formatter/mod.rs

@@ -0,0 +1,143 @@
+// SPDX-FileCopyrightText: 2022 Deren Vural
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/*
+ * Name:
+ * mod.rs
+ *
+ * Description:
+ * Public-facing interface/wrapper for our custom GObject (Formatter)
+ *
+ * Made:
+ * 05/10/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ *
+ */
+
+// Custom GObjects
+mod imp;
+
+// Imports
+use glib::Object;
+use gtk::{glib, prelude::ObjectExt};
+
+// Modules
+//
+
+// GObject wrapper for Formatter
+glib::wrapper! {
+    pub struct Formatter(ObjectSubclass<imp::Formatter>)
+    @extends gtk::Widget,
+    @implements gtk::Accessible, gtk::Actionable, gtk::Buildable, gtk::ConstraintTarget;
+}
+
+/*
+ * Trait Name:
+ * Formatter
+ *
+ * Description:
+ * Trait shared by all properties
+ *
+ * Made:
+ * 05/10/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ *
+ */
+impl Formatter {
+    /*
+     * Name:
+     * new
+     *
+     * Description:
+     * Create a new Formatter object
+     *
+     * Made:
+     * 05/10/2022
+     *
+     * Made by:
+     * Deren Vural
+     *
+     * Notes:
+     *
+     */
+    pub fn new() -> Self {
+        Object::new(&[]).expect("Failed to create `Formatter`.")
+    }
+
+
+    pub fn format(self, values: Vec<String>, func: fn(Vec<String>) -> Option<String>) -> Option<String>{
+        let mut results: Vec<String> = Vec::new();
+
+        // For each item in input list
+        for i in values {
+            // Remove all non-number characters
+            let cleaned_value: String = i.chars().filter(|c| {
+                // check if (base 10) digit
+                if c.is_digit(10) {
+                    true
+                } else {
+                    // check if full-stop
+                    if c.eq(&'.') {
+                        true
+                    } else {
+                        false
+                    }
+                }
+            }).collect();
+
+            // Convert to float
+            match cleaned_value.parse::<f64>() {
+                Ok(parsed_value) => {
+                    // Convert to string
+                    results.push(parsed_value.to_string());
+                },
+                Err(err) => {
+                    // Catch any errors..
+                    println!("Not a valid number: {}", err);
+                },
+            }
+        }
+
+        // Check for empty results
+        if results.len() > 0 {
+            // Apply any valid formatting
+            match func(results) {
+                Some(formatted_results) => Some(formatted_results),
+                None => return None,
+            }
+        } else {
+            None
+        }
+    }
+}
+
+/*
+ * Trait Name:
+ * Default
+ *
+ * Description:
+ * Default object
+ *
+ * Made:
+ * 08/10/2022
+ *
+ * Made by:
+ * Deren Vural
+ *
+ * Notes:
+ *
+ */
+impl Default for Formatter {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+