core: re-add StraightPath core shape

1 files changed, 17 insertions, 13 deletions

diff --git a/core/src/solving.rs b/core/src/solving.rs
index 261b4d4..bf5fe95 100644
--- a/core/src/solving.rs
+++ b/core/src/solving.rs
@@ -1,4 +1,7 @@
-use crate::core_shapes::{CoreDrawable, CoreShape, DefinedCoreDrawable, DefinedCoreShape};
+use crate::core_shapes::{
+    CoreDrawable, CoreShape, DefinedCoreDrawable, DefinedCoreShape, DefinedStraightPath,
+    StraightPath,
+};
 
 use super::styles::*;
 use super::text::*;
@@ -155,6 +158,7 @@ impl Constrainable for CoreShape {
         match self {
             CoreShape::Rectangle(r) => Some(DefinedCoreShape::Rectangle(*r)),
             CoreShape::Text(t) => t.fixate(model).map(DefinedCoreShape::Text),
+            CoreShape::StraightPath(p) => p.fixate(model).map(DefinedCoreShape::StraightPath),
         }
     }
 }
@@ -288,15 +292,15 @@ impl Constrainable for Text {
     }
 }
 
-// impl Constrainable for StraightPath {
-//     type Fixated = DefinedStraightPath;
-//
-//     fn fixate(&self, model: &dyn SolverModel) -> Option<Self::Fixated> {
-//         let points: Option<_> = self
-//             .points
-//             .iter()
-//             .map(|point| point.fixate(model))
-//             .collect();
-//         Some(DefinedStraightPath { points: points? })
-//     }
-// }
+impl Constrainable for StraightPath {
+    type Fixated = DefinedStraightPath;
+
+    fn fixate(&self, model: &dyn SolverModel) -> Option<Self::Fixated> {
+        let points: Option<_> = self
+            .points
+            .iter()
+            .map(|point| point.fixate(model))
+            .collect();
+        Some(DefinedStraightPath { points: points? })
+    }
+}