Add kdmoncat bricks view to diagram view #293
Conversation
|
@epost can this be merged? |
|
Oh right, this is superseded by #296 |
|
No not yet, I have a pending comments/WIP notes to myself on this PR. |
| @@ -15,6 +15,7 @@ | |||
| <link rel="stylesheet" href="diagram.css"> | |||
| <link rel="stylesheet" href="typedefs.css"> | |||
| <link rel="stylesheet" href="auths.css"> | |||
| <link rel="stylesheet" href="bricks.css"> | |||
There was a problem hiding this comment.
Maybe we should add comments on what these CSS files are needed for, in particular as things like 'bricks' vs' 'diagram' aren't terribly instructive.
| @@ -42,11 +47,13 @@ type ChildSlots = | |||
| ( objectTree :: H.Slot VoidF (TreeMenu.Msg Route) Unit | |||
| , petrinetEditor :: H.Slot VoidF PetrinetEditor.Msg Unit | |||
| , diagramEditor :: H.Slot VoidF DiagramEditor.Msg Unit | |||
| , bricks :: Bricks.Slot Unit | |||
There was a problem hiding this comment.
- I think this should perhaps be called
kdmoncatBricksor something, with the goal of clarifying what sort of bricks we're talking about. - Perhaps we could qualify
BricksasKDMonCat.Bricksor something.
| ) | ||
|
|
||
| _objectTree = SProxy :: SProxy "objectTree" | ||
| _petrinetEditor = SProxy :: SProxy "petrinetEditor" | ||
| _diagramEditor = SProxy :: SProxy "diagramEditor" | ||
| _bricks = SProxy :: SProxy "bricks" |
There was a problem hiding this comment.
Likewise, _kdmoncat, or _kdmoncatBricks or something?
| @@ -40,6 +41,19 @@ fromDiagram { width, pixels, names } = fromEdges (_ - 1) name edges | |||
| edges = concat $ zipWith (zipWith (\src tgt -> { src, tgt })) rows (drop 1 rows) | |||
| name id = names !! (id - 1) # fromMaybe "?" | |||
|
|
|||
| type Op r = { label :: String, pos :: Vec3 Int | r } | |||
There was a problem hiding this comment.
-
This (more or less) duplicates Operator from
halogen-diagram-editor. Should we work with that one somehow instead of redefining it here? -
Let's add a newline after the definition plz, in keeping with the rest of this codebase. 🙏
| @@ -40,6 +41,19 @@ fromDiagram { width, pixels, names } = fromEdges (_ - 1) name edges | |||
| edges = concat $ zipWith (zipWith (\src tgt -> { src, tgt })) rows (drop 1 rows) | |||
| name id = names !! (id - 1) # fromMaybe "?" | |||
|
|
|||
| type Op r = { label :: String, pos :: Vec3 Int | r } | |||
| fromOps :: ∀ r. Array (Op r) -> DiagramV2 | |||
| fromOps ops = fromEdges identity ((ops !! _) >>> maybe "" _.label) edges | |||
There was a problem hiding this comment.
The 'Op(s)' name is a holdover from the Elm code. it's used there internally in places, but:
- The type itself is called
Operator, written out in full. - This name should change, see also nomenclature document.
- Especially outside of
halogen-diagram-editor, let's try to be a bit explicit;Operator, perhaps even a fully qualified. for local variable names, i guess it's ok to useopuntil we decide on a better name, as long as some nearby type indicates that it meansOperator.
| where | ||
| edges = ops # foldMapWithIndex \src { pos : srcPos } -> | ||
| ops # foldMapWithIndex \tgt { pos : tgtPos } -> | ||
| if _y tgtPos == _y srcPos + 1 then let |
There was a problem hiding this comment.
Introduce a helper along the lines of isUnderneath (or whatever it is that this does)?
| tgtStart = _x tgtPos | ||
| srcEnd = srcStart + _z srcPos | ||
| tgtEnd = tgtStart + _z tgtPos | ||
| in if srcStart < tgtEnd && tgtStart < srcEnd then [{ src, tgt }] else [] else [] |
There was a problem hiding this comment.
Can we rewrite this as where clauses?
stbx-lang/src/Language/Statebox/Wiring/Generator/DiagramV2.purs
Outdated
Show resolved
Hide resolved
|
Superseded by #296. |
Fixes #257