mirror of
https://github.com/supleed2/ELEC60015-HLP-CW.git
synced 2024-11-10 02:05:48 +00:00
fix a rightangle weird case
This commit is contained in:
parent
dac0f1bdcc
commit
c43910e438
|
@ -317,7 +317,7 @@ let pp segs (model: Model)=
|
|||
|> String.concat ";"
|
||||
|
||||
let ppRISeg riseg=
|
||||
printfn $"Index:{riseg.Index},Dir:{riseg.Dir},Length:{riseg.Length}"
|
||||
printfn $"Index:{riseg.Index},Dir:{riseg.Dir},Length:{riseg.Length},Draggable:{riseg.Draggable}"
|
||||
riseg
|
||||
|
||||
//-------------------------------Implementation code----------------------------//
|
||||
|
@ -382,7 +382,7 @@ let initialWireVerticesFromPorts (startPort:XYPos) (endPort:XYPos) (routetype:ro
|
|||
{X = endX; Y = endY}
|
||||
], false // not left to right
|
||||
|Rightangle ->
|
||||
if (endX-startX >= Wire.stickLength) && (endY-startY>=Wire.stickLength) then
|
||||
if (abs(endX-startX) >= Wire.stickLength) && (abs(endY-startY)>=Wire.stickLength) then
|
||||
[
|
||||
{X = startX; Y = startY};
|
||||
{X = startX + Wire.stickLength; Y = startY};
|
||||
|
@ -490,13 +490,12 @@ let convertVerticesToASegs connId (isLeftToRight: bool) routetype rotation (yref
|
|||
| _ -> true
|
||||
| Sameside->
|
||||
match index with
|
||||
| 2 -> true
|
||||
| 3 | 4 -> not isLeftToRight
|
||||
| _ -> false
|
||||
| 0 | 6 -> false
|
||||
| _ -> true
|
||||
| Rightangle->
|
||||
match index with
|
||||
| 3 | 4 -> not isLeftToRight
|
||||
| _ -> false
|
||||
| 0 | 6 -> false
|
||||
| _ -> true
|
||||
|
||||
let flipdir=
|
||||
function | Horizontal -> Vertical
|
||||
|
|
Loading…
Reference in a new issue