diff --git a/app/Icons.hs b/app/Icons.hs index 168c8dd..4562d23 100644 --- a/app/Icons.hs +++ b/app/Icons.hs @@ -9,7 +9,7 @@ module Icons nameDiagram, connectPorts, connectIconToPort, - connectIconToIcon, + connectIcons, textBox, enclosure, lambdaRegion, @@ -45,7 +45,7 @@ connectPorts icon0 port0 icon1 port1 = connectIconToPort icon0 icon1 port1 = connectOutside' arrowOptions icon0 (icon1 .> port1) -connectIconToIcon = +connectIcons = connectOutside' arrowOptions -- | Draw the icon with circles where the ports are @@ -114,7 +114,7 @@ coloredTextBox textColor boxColor t = + (textBoxFontSize * 0.2) -- ENCLOSING REGION -- -enclosure dia = dia <> boundingRect (dia # frame 0.5) # lc red # lwG defaultLineWidth +enclosure dia = dia <> boundingRect (dia # frame 0.5) # lc white # lwG defaultLineWidth -- LAMBDA ICON -- -- Don't use === here to put the port under the text box since mempty will stay diff --git a/app/Main.hs b/app/Main.hs index 294058f..ded6c39 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -25,6 +25,7 @@ ex8 = enclosure ex6 ex9 = lambdaRegion 3 ex6 # nameDiagram "lam0" ex10 = ex9 # connectPorts ("lam0" .> "A") (PortName 1) "lam0" (PortName 0) # connectPorts ("lam0" .> "B") (PortName 1) "lam0" (PortName 2) +ex11 = connectIcons "lam0" "y" $ ex10 === vrule 2 === textBox "y" # named "y" main :: IO () -main = mainWith (ex10 # bgFrame 0.1 black) +main = mainWith (ex11 # bgFrame 0.1 black)