supleed2/ELEC60015-HLP-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC60015-HLP-CW.git synced 2024-11-10 02:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix autoroute

Browse source
This commit is contained in:
Philip Puk 2022-03-26 13:48:19 +00:00
parent 781a47236d
commit 512e770e2f
1 changed files with 15 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/Renderer/DrawBlock/BusWire.fs
View file

@ -428,7 +428,6 @@ let initialWireVerticesFromPorts
// E // E
if (endX - startX >= Wire.stickLength) if (endX - startX >= Wire.stickLength)
&& (endY - startY >= Wire.stickLength) then && (endY - startY >= Wire.stickLength) then
[ [
{X = startX; Y = startY}; {X = startX; Y = startY};
{X = startX + Wire.stickLength; Y = startY}; {X = startX + Wire.stickLength; Y = startY};
@ -441,40 +440,31 @@ let initialWireVerticesFromPorts
], ],
true // Left-to-right true // Left-to-right
//fix issue by wrapping wire input port and not through for 1st quadrant //fix issue by wrapping wire input port and not through for 1st quadrant
else if (endX - startX < Wire.stickLength) else if (abs(endX - startX) < 3.0*Wire.stickLength)
&& (endY - startY >= 2.5 * Wire.stickLength) then && (endY - startY < 3.0 * Wire.stickLength) then
[ [
{X = startX; Y = startY}; {X = startX; Y = startY};
{X = startX + Wire.stickLength; Y = startY}; {X = startX + Wire.stickLength; Y = startY};
{X = startX + Wire.stickLength; Y = (startY + endY)/2.0}; {X = endX + Wire.stickLength*4.5; Y = startY};
{X = endX; Y = (startY + endY)/2.0}; {X = endX + Wire.stickLength*4.5; Y = endY - Wire.stickLength};
{X = endX; Y = endY - Wire.stickLength}; {X = endX; Y = endY - Wire.stickLength};
{X = endX; Y = endY - Wire.stickLength}; {X = endX; Y = endY - Wire.stickLength};
{X = endX; Y = endY - Wire.stickLength}; {X = endX; Y = endY - Wire.stickLength};
{X = endX; Y = endY} {X = endX; Y = endY}
], ],
false // not Left-to-right false // not Left-to-right
// Otherwise, if either X or Y delta is smaller than the stick length,
// add some creative meandering
//
// + ---- +
// | |
// | + - S
// + - +
// |
// E
else else
[ [
{X = startX; Y = startY}; {X = startX; Y = startY};
{X = startX + Wire.stickLength; Y = startY}; {X = startX + Wire.stickLength; Y = startY};
{X = startX + Wire.stickLength; Y = startY - 1.5 * Wire.stickLength}; {X = startX + Wire.stickLength; Y = startY};
{X = (startX + endX) / 2.0; Y = startY - 1.5 * Wire.stickLength}; {X = startX + Wire.stickLength; Y = endY - Wire.stickLength};
{X = (startX + endX) / 2.0; Y = endY - Wire.stickLength}; {X = endX; Y = endY - Wire.stickLength};
{X = endX; Y = endY - Wire.stickLength}; {X = endX; Y = endY - Wire.stickLength};
{X = endX; Y = endY - Wire.stickLength}; {X = endX; Y = endY - Wire.stickLength};
{X = endX; Y = endY} {X = endX; Y = endY}
], ],
false // Not left-to-right false
// Sameside -> the two ports are facing in the same direction // Sameside -> the two ports are facing in the same direction
elif routetype = Sameside then elif routetype = Sameside then
@ -489,7 +479,6 @@ let initialWireVerticesFromPorts
// + - + + - + // + - + + - +
if abs (endX - startX) >= Wire.stickLength * 2.0 if abs (endX - startX) >= Wire.stickLength * 2.0
&& endY >= startY then && endY >= startY then
[ [
{X = startX; Y = startY}; {X = startX; Y = startY};
{X = startX ; Y = startY - Wire.stickLength}; {X = startX ; Y = startY - Wire.stickLength};
@ -535,8 +524,8 @@ let initialWireVerticesFromPorts
{X = startX; Y = startY}; {X = startX; Y = startY};
{X = startX ; Y = startY - Wire.stickLength}; {X = startX ; Y = startY - Wire.stickLength};
{X = startX ; Y = startY - Wire.stickLength}; {X = startX ; Y = startY - Wire.stickLength};
{X = startX + Wire.stickLength * 2.0 ; Y = startY - Wire.stickLength}; {X = startX + Wire.stickLength * 4.5 ; Y = startY - Wire.stickLength};
{X = startX + Wire.stickLength * 2.0 ; Y = endY - Wire.stickLength}; {X = startX + Wire.stickLength * 4.5 ; Y = endY - Wire.stickLength};
{X = endX; Y = endY - Wire.stickLength}; {X = endX; Y = endY - Wire.stickLength};
{X = endX; Y = endY - Wire.stickLength}; {X = endX; Y = endY - Wire.stickLength};
{X = endX; Y = endY} {X = endX; Y = endY}
@ -587,7 +576,7 @@ let convertVerticesToASegs connId (isLeftToRight: bool) routetype rotation (yref
| true -> | true ->
[Horizontal;Horizontal;Horizontal;Horizontal;Vertical;Vertical;Vertical] [Horizontal;Horizontal;Horizontal;Horizontal;Vertical;Vertical;Vertical]
| false -> | false ->
[Horizontal;Vertical;Horizontal;Vertical;Horizontal;Horizontal;Vertical] [Horizontal;Horizontal;Vertical;Horizontal;Vertical;Horizontal;Vertical]
let draggable index = let draggable index =
match routetype with match routetype with
@ -671,12 +660,6 @@ let convertVerticesToASegs connId (isLeftToRight: bool) routetype rotation (yref
|> List.skip 1 |> List.skip 1
|> List.map (fun resSeg_start-> riSegToASeg (fst resSeg_start)) |> List.map (fun resSeg_start-> riSegToASeg (fst resSeg_start))
// TODO: native RISeg implementation
// let convertVerticesToRISegs connId (isLeftToRight: bool) (verticesList: XYPos list) : RISeg list =
// convertVerticesToASegs connId isLeftToRight verticesList
// |> List.map aSegToRISeg
/// Convert a (possibly legacy) issie Connection stored as a list of vertices to Absolute Segments
/// Convert a (possibly legacy) issie Connection stored as a list of vertices to Absolute Segments /// Convert a (possibly legacy) issie Connection stored as a list of vertices to Absolute Segments
let issieVerticesToASegs connId (verticesList: list<float*float>) : ASeg list = let issieVerticesToASegs connId (verticesList: list<float*float>) : ASeg list =
let XYPosList = let XYPosList =
@ -700,12 +683,6 @@ let issieVerticesToASegs connId (verticesList: list<float*float>) : ASeg list =
printfn "Converting unknown" printfn "Converting unknown"
makeNewSegmentsFromPorts XYPosList makeNewSegmentsFromPorts XYPosList
// TODO: native RISeg implementation
/// Convert a (possibly legacy) issie Connection stored as a list of vertices to Rotation Invariant Segments
let issieVerticesToRISegs connId (verticesList: (float * float) list) : RISeg list =
issieVerticesToASegs connId verticesList
|> List.map aSegToRISeg
//----------------------interface to Issie-----------------------// //----------------------interface to Issie-----------------------//
// Section of functions that offer an interface between our implementation and Issie // Section of functions that offer an interface between our implementation and Issie
@ -811,7 +788,7 @@ let makeInitialASegList (hostId: ConnectionId)
| Symbol.Top, Symbol.Bottom -> Oppositeside, NegX, false | Symbol.Top, Symbol.Bottom -> Oppositeside, NegX, false
| Symbol.Top, Symbol.Left -> Rightangle, NegX, false | Symbol.Top, Symbol.Left -> Rightangle, NegX, false
| Symbol.Right, Symbol.Top -> Rightangle, PosY, false //TODO: WRONG - stick coming out of output+input wrong direction | Symbol.Right, Symbol.Top -> Rightangle, PosY, false
| Symbol.Right, Symbol.Right -> Sameside, PosX, false | Symbol.Right, Symbol.Right -> Sameside, PosX, false
| Symbol.Right, Symbol.Bottom -> Rightangle,NegY, true | Symbol.Right, Symbol.Bottom -> Rightangle,NegY, true
| Symbol.Right, Symbol.Left -> Oppositeside, PosY, false | Symbol.Right, Symbol.Left -> Oppositeside, PosY, false
@ -823,7 +800,7 @@ let makeInitialASegList (hostId: ConnectionId)
| Symbol.Left, Symbol.Top -> Rightangle, PosY, true | Symbol.Left, Symbol.Top -> Rightangle, PosY, true
| Symbol.Left, Symbol.Right -> Oppositeside, NegY, false | Symbol.Left, Symbol.Right -> Oppositeside, NegY, false
| Symbol.Left, Symbol.Bottom -> Rightangle, NegY, false //TODO: WRONG - stick coming out of output+input wrong direction | Symbol.Left, Symbol.Bottom -> Rightangle, NegY, false
| Symbol.Left, Symbol.Left -> Sameside, NegX, false | Symbol.Left, Symbol.Left -> Sameside, NegX, false
// Get the adjusted input port position, applying any rotations and // Get the adjusted input port position, applying any rotations and
@ -836,12 +813,6 @@ let makeInitialASegList (hostId: ConnectionId)
relativePos + outputPortPos relativePos + outputPortPos
(*
printfn $"outputPortPos:{outputPortPos}, inputPortPos':{inputPortPos'}, inputPortPos:{inputPortPos}"
printfn $"inputPortOri:{inputPortOri}, outputPortOri:{outputPortOri}"
printfn $"routetype:{routetype}, rotation:{rotation}, yreflect:{yreflect}"
*)
let (xyPairs: list<XYPos>), (isLeftToRight: bool) = let (xyPairs: list<XYPos>), (isLeftToRight: bool) =
initialWireVerticesFromPorts outputPortPos inputPortPos' routetype initialWireVerticesFromPorts outputPortPos inputPortPos' routetype
@ -855,12 +826,6 @@ let makeInitialASegList (hostId: ConnectionId)
outputPortPos outputPortPos
xyPairs xyPairs
// TODO: native RISeg implementation
// Initial list of rotation invariant segments based on positions of ports to be connected
// let makeInitialRISegList (hostId: ConnectionId) (portCoords: XYPos * XYPos) : RISeg list =
// makeInitialASegList hostId portCoords
// |> List.map aSegToRISeg
/// Render given Rotation Invariant Segment using colour and width properties given /// Render given Rotation Invariant Segment using colour and width properties given
/// Takes in 2 connecting segments to add rounded corners if appropriate /// Takes in 2 connecting segments to add rounded corners if appropriate
let renderRISegAndCorner (colour: string) (width: string) (segments: RISeg * RISeg * RISeg) : ReactElement = let renderRISegAndCorner (colour: string) (width: string) (segments: RISeg * RISeg * RISeg) : ReactElement =
@ -1375,9 +1340,6 @@ let getSafeDistanceForMove
let xJoined (segment: ASeg) (point: XYPos): bool = let xJoined (segment: ASeg) (point: XYPos): bool =
abs (segment.Start.X - point.X) > 0.0001 abs (segment.Start.X - point.X) > 0.0001
printfn $"controlSegOri:{controlSegOri},Index:{testSegment.Index};minDistX:{minimumDistanceX};maxDistX:{maximumDistanceX}"
printfn $"Seg0.Start:{firstSegment.Start};Seg0.End:{firstSegment.End};Seg6.Start:{lastSegment.Start};Seg6.End:{lastSegment.End}"
// I haven't spent the time to understand this match case, but it works. // I haven't spent the time to understand this match case, but it works.
// I assume finds how much a wire section _can_ move given its position in // I assume finds how much a wire section _can_ move given its position in
// that wire. // that wire.
@ -1482,8 +1444,6 @@ let moveSegment (segment: ASeg) (distance:float) (model:Model) =
let startSegment, endSegment = wire.Segments[0], wire.Segments[6] let startSegment, endSegment = wire.Segments[0], wire.Segments[6]
getSafeDistanceForMove segment startSegment endSegment distance getSafeDistanceForMove segment startSegment endSegment distance
printfn $"distance:{distance};moveDistance:{moveDistance}"
// Get new values for the current segment, the end of the last one, and // Get new values for the current segment, the end of the last one, and
// the start of the next one // the start of the next one
let newLastEnd, newCurrentStart, newCurrentEnd, newNextStart = let newLastEnd, newCurrentStart, newCurrentEnd, newNextStart =