Squashed commit of the following:

commit 5e1137c460 Author: Emilia <contact@emiliaallison.com> Date: Fri Dec 29 18:03:00 2023 -0500 Fix: indexing error w.r.t. logarithm argument commit 535b14a586 Author: Emilia <contact@emiliaallison.com> Date: Fri Dec 29 18:02:00 2023 -0500 Space colors evenly, consistently, etc Colors should now: - Not change if new transfers are added - Be evenly spaced throughout the palette - Be persistent across refreshes commit 6e08f47955 Author: Emilia <contact@emiliaallison.com> Date: Fri Dec 29 18:01:00 2023 -0500 Add palette function for ordered ids Given an id and a list of sorted ids, yields a color commit 88e838e102 Author: Emilia <contact@emiliaallison.com> Date: Fri Dec 29 18:00:00 2023 -0500 Switch to v7 UUIDs from v4 v7 UUIDs are timestamp based and thus we can establish a useful total ordering over them; will base colors on this
2023-12-29 18:05:00 -05:00 · 2023-12-29 18:05:00 -05:00 · ec37887c2f
parent 85d4b30d47
commit ec37887c2f
7 changed files with 55 additions and 15 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -34,6 +34,12 @@ dependencies = [
 "syn 2.0.16",
 ]

+[[package]]
+name = "atomic"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@ -885,10 +891,11 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"

 [[package]]
 name = "uuid"
-version = "1.3.3"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
+checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
 dependencies = [
+ "atomic",
 "getrandom",
 "rand",
 "serde",
@ -898,9 +905,9 @@ dependencies = [

 [[package]]
 name = "uuid-macro-internal"
-version = "1.3.3"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f67b459f42af2e6e1ee213cb9da4dbd022d3320788c3fb3e1b893093f1e45da"
+checksum = "f49e7f3f3db8040a100710a11932239fd30697115e2ba4107080d8252939845e"
 dependencies = [
 "proc-macro2",
 "quote",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -18,7 +18,7 @@ log = "0.4"
 wasm-logger = "0.2"
 regex = "1"
 lazy_static = "1.4"
-uuid = { version = "1.3", features = ["v4", "fast-rng", "macro-diagnostics", "js", "serde"] }
+uuid = { version = "1.6", features = ["v7", "fast-rng", "macro-diagnostics", "js", "serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 csv = "1.2"
--- a/src/components/plates/destination_plate.rs
+++ b/src/components/plates/destination_plate.rs
@ -41,6 +41,14 @@ pub fn DestinationPlate(props: &DestinationPlateProps) -> Html {
    }
    let destination_wells = ct_state.transfer.transfer_region.get_destination_wells();

+    let ordered_ids: Vec<uuid::Uuid> = {
+        let mut ids: Vec<uuid::Uuid> = main_state.transfers.clone().iter()
+        .map(|x| x.id)
+        .collect();
+        ids.sort_unstable();
+        ids
+    };
+
    let mouse_callback = {
        let m_start_handle = m_start_handle.clone();
        let m_end_handle = m_end_handle.clone();
@ -118,7 +126,7 @@ pub fn DestinationPlate(props: &DestinationPlateProps) -> Html {
                in_transfer={destination_wells.contains(&(i,j))}
                color={transfer_map.get(&(i,j))
                    .and_then(|t| t.last())
-                    .map(|t| PALETTE.get_uuid(t.get_uuid()))
+                    .map(|t| PALETTE.get_ordered(t.get_uuid(), &ordered_ids))
                }
                cell_height={props.cell_height}
                title={transfer_map.get(&(i,j)).map(|transfers| format!("Used by: {}", transfers.iter().map(|t| t.name.clone())
--- a/src/components/plates/source_plate.rs
+++ b/src/components/plates/source_plate.rs
@ -61,6 +61,14 @@ pub fn SourcePlate(props: &SourcePlateProps) -> Html {

    let source_wells = ct_state.transfer.transfer_region.get_source_wells();

+    let ordered_ids: Vec<uuid::Uuid> = {
+        let mut ids: Vec<uuid::Uuid> = main_state.transfers.clone().iter()
+        .map(|x| x.id)
+        .collect();
+        ids.sort_unstable();
+        ids
+    };
+
    let mouse_callback = {
        let m_start_handle = m_start_handle.clone();
        let m_end_handle = m_end_handle.clone();
@ -122,7 +130,7 @@ pub fn SourcePlate(props: &SourcePlateProps) -> Html {
                        in_transfer={source_wells.contains(&(i,j))}
                        color={transfer_map.get(&(i,j))
                            .and_then(|t| t.last())
-                            .map(|t| PALETTE.get_uuid(t.get_uuid()))
+                            .map(|t| PALETTE.get_ordered(t.get_uuid(), &ordered_ids))
                        }
                        cell_height={props.cell_height}
                        title={transfer_map.get(&(i,j)).map(|transfers| format!("Used by: {}", transfers.iter().map(|t| t.name.clone())
--- a/src/components/plates/util.rs
+++ b/src/components/plates/util.rs
@ -35,10 +35,23 @@ impl ColorPalette {
        self.get((2f64.powi(-(t.ilog2() as i32))) * (t as f64 + 0.5f64) - 1.0f64)
    }

-    pub fn get_uuid(&self, t: uuid::Uuid) -> [f64; 3] {
-        // self.get(t.as_u128() as f64 / (u128::MAX) as f64)
-        let mut r = SmallRng::seed_from_u64(t.as_u128() as u64);
-        self.get(r.gen_range(0.0..1.0f64))
+    // pub fn get_uuid(&self, t: uuid::Uuid) -> [f64; 3] {
+    //     // self.get(t.as_u128() as f64 / (u128::MAX) as f64)
+    //     let mut r = SmallRng::seed_from_u64(t.as_u128() as u64);
+    //     self.get(r.gen_range(0.0..1.0f64))
+    // }
+
+    pub fn get_ordered(&self, t: uuid::Uuid, ordered_uuids: &Vec<uuid::Uuid>)
+        -> [f64; 3] {
+        let index = ordered_uuids.iter().position(|&x| x == t).expect("uuid must be in list of uuids") + 1;
+        return self.get(Self::space_evenly(index))
+    }
+
+    fn space_evenly(x: usize) -> f64 {
+        let e: usize = (x.ilog2() + 1) as usize;
+        let d: usize = (2usize.pow(e as u32)) as usize;
+        let n: usize = (2*x + 1) % d;
+        return (n as f64) / (d as f64);
    }
 }

--- a/src/data/plate_instances.rs
+++ b/src/data/plate_instances.rs
@ -5,6 +5,8 @@ use uuid::Uuid;
 #[derive(PartialEq, Clone, Serialize, Deserialize)]
 pub struct PlateInstance {
    pub plate: Plate,
+    #[serde(rename = "id_v7")]
+    #[serde(default = "Uuid::now_v7")]
    id: Uuid,
    pub name: String,
 }
@ -16,7 +18,7 @@ impl PlateInstance {
                plate_type: sort,
                plate_format: format,
            },
-            id: Uuid::new_v4(),
+            id: Uuid::now_v7(),
            name,
        }
    }
@ -34,7 +36,7 @@ impl From<Plate> for PlateInstance {
    fn from(value: Plate) -> Self {
        PlateInstance {
            plate: value,
-            id: Uuid::new_v4(),
+            id: Uuid::now_v7(),
            name: "New Plate".to_string(),
        }
    }
--- a/src/data/transfer.rs
+++ b/src/data/transfer.rs
@ -10,7 +10,9 @@ pub struct Transfer {
    pub source_id: Uuid,
    pub dest_id: Uuid,
    pub name: String,
-    id: Uuid,
+    #[serde(rename = "id_v7")]
+    #[serde(default = "Uuid::now_v7")]
+    pub id: Uuid,
    pub transfer_region: TransferRegion,
    #[serde(default = "default_volume")]
    pub volume: f32,
@ -44,7 +46,7 @@ impl Transfer {
            source_id: source.get_uuid(),
            dest_id: dest.get_uuid(),
            name,
-            id: Uuid::new_v4(),
+            id: Uuid::now_v7(),
            transfer_region: tr,
            volume: 2.5,
        }