feat(plan): spread fixtures in a circle

Author: maxjoehnk

crates/api/protos/plans.proto

@@ -48,6 +48,7 @@ message SpreadFixturesRequest {
   enum SpreadGeometry {
     SQUARE = 0;
     TRIANGLE = 1;
+    CIRCLE = 2;
   }
 }
 

crates/api/src/mappings/plans.rs

@@ -66,6 +66,7 @@ impl From<spread_fixtures_request::SpreadGeometry> for SpreadFixturesGeometry {
         match geometry {
             SpreadGeometry::Square => Self::Square,
             SpreadGeometry::Triangle => Self::Triangle,
+            SpreadGeometry::Circle => Self::Circle,
         }
     }
 }

crates/components/plan/src/commands/spread_fixtures.rs

@@ -19,6 +19,7 @@ pub struct SpreadFixturesInPlanCommand {
 pub enum SpreadFixturesGeometry {
     Square,
     Triangle,
+    Circle,
 }
 
 impl<'a> Command<'a> for SpreadFixturesInPlanCommand {
@@ -97,6 +98,7 @@ impl SpreadFixturesGeometry {
         match self {
             SpreadFixturesGeometry::Square => Self::spread_square(origin, fixtures),
             SpreadFixturesGeometry::Triangle => Self::spread_triangle(origin, fixtures),
+            SpreadFixturesGeometry::Circle => Self::spread_circle(origin, fixtures),
         }
     }
 
@@ -169,6 +171,24 @@ impl SpreadFixturesGeometry {
 
         hashmap
     }
+
+    fn spread_circle(
+        origin: (f64, f64),
+        fixtures: &[FixturePosition],
+    ) -> HashMap<FixtureId, (f64, f64)> {
+        let mut hashmap = HashMap::with_capacity(fixtures.len());
+        let radius = fixtures.len() as f64 / (2.0 * std::f64::consts::PI);
+        let angle_increment = 2.0 * std::f64::consts::PI / fixtures.len() as f64;
+
+        for (i, fixture) in fixtures.iter().enumerate() {
+            let angle = i as f64 * angle_increment;
+            let x = origin.0 + radius * angle.cos();
+            let y = origin.1 + radius * angle.sin();
+            hashmap.insert(fixture.fixture, (x, y));
+        }
+
+        hashmap
+    }
 }
 
 #[cfg(test)]

crates/ui/lib/protos/plans.pb.dart

@@ -1,21 +1,17 @@
-//
+///
 //  Generated code. Do not modify.
 //  source: plans.proto
 //
 // @dart = 2.12
+// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
+// ignore_for_file: UNDEFINED_SHOWN_NAME
 import 'dart:core' as $core;
-
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class AlignFixturesRequest_AlignDirection extends $pb.ProtobufEnum {
-  static const AlignFixturesRequest_AlignDirection LEFT_TO_RIGHT = AlignFixturesRequest_AlignDirection._(0, _omitEnumNames ? '' : 'LEFT_TO_RIGHT');
-  static const AlignFixturesRequest_AlignDirection TOP_TO_BOTTOM = AlignFixturesRequest_AlignDirection._(1, _omitEnumNames ? '' : 'TOP_TO_BOTTOM');
+  static const AlignFixturesRequest_AlignDirection LEFT_TO_RIGHT = AlignFixturesRequest_AlignDirection._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'LEFT_TO_RIGHT');
+  static const AlignFixturesRequest_AlignDirection TOP_TO_BOTTOM = AlignFixturesRequest_AlignDirection._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'TOP_TO_BOTTOM');
 
   static const $core.List<AlignFixturesRequest_AlignDirection> values = <AlignFixturesRequest_AlignDirection> [
     LEFT_TO_RIGHT,
@@ -29,12 +25,14 @@ class AlignFixturesRequest_AlignDirection extends $pb.ProtobufEnum {
 }
 
 class SpreadFixturesRequest_SpreadGeometry extends $pb.ProtobufEnum {
-  static const SpreadFixturesRequest_SpreadGeometry SQUARE = SpreadFixturesRequest_SpreadGeometry._(0, _omitEnumNames ? '' : 'SQUARE');
-  static const SpreadFixturesRequest_SpreadGeometry TRIANGLE = SpreadFixturesRequest_SpreadGeometry._(1, _omitEnumNames ? '' : 'TRIANGLE');
+  static const SpreadFixturesRequest_SpreadGeometry SQUARE = SpreadFixturesRequest_SpreadGeometry._(0, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'SQUARE');
+  static const SpreadFixturesRequest_SpreadGeometry TRIANGLE = SpreadFixturesRequest_SpreadGeometry._(1, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'TRIANGLE');
+  static const SpreadFixturesRequest_SpreadGeometry CIRCLE = SpreadFixturesRequest_SpreadGeometry._(2, const $core.bool.fromEnvironment('protobuf.omit_enum_names') ? '' : 'CIRCLE');
 
   static const $core.List<SpreadFixturesRequest_SpreadGeometry> values = <SpreadFixturesRequest_SpreadGeometry> [
     SQUARE,
     TRIANGLE,
+    CIRCLE,
   ];
 
   static final $core.Map<$core.int, SpreadFixturesRequest_SpreadGeometry> _byValue = $pb.ProtobufEnum.initByValue(values);
@@ -43,5 +41,3 @@ class SpreadFixturesRequest_SpreadGeometry extends $pb.ProtobufEnum {
   const SpreadFixturesRequest_SpreadGeometry._($core.int v, $core.String n) : super(v, n);
 }
 
-
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');