From 07234001ad5f48e079486df7dc1657b0a790f87e Mon Sep 17 00:00:00 2001
From: JT <john@localhost.localdomain>
Date: Fri, 30 Oct 2015 17:18:21 -0500
Subject: [PATCH] more updates, still borked

Signed-off-by: JT <john@localhost.localdomain>
---
 dxf2gcode.go        |  8 +++----
 dxfutil/dxf_util.go | 52 +++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/dxf2gcode.go b/dxf2gcode.go
index a6da56f..fe77d73 100644
--- a/dxf2gcode.go
+++ b/dxf2gcode.go
@@ -33,20 +33,20 @@ func main() {
 	entities := dxfutil.GetEntities(lines)
 	for _, e := range entities {
 		fmt.Printf("%2d %4s G10 %8s G11 %8s G20 %8s G21 %8s G50 %9s G51 %9s\n",
-		e.N, e.G0, e.G10, e.G11, e.G20, e.G21, e.G50, e.G51)
+		e.Test, e.G0, e.G10, e.G11, e.G20, e.G21, e.G50, e.G51)
 	}
 	entities = dxfutil.GetEndPoints(entities)
 
 	for _, e := range entities {
 		fmt.Printf("%2d %4s Xs %9f Xe %9f Ys %9f Ye %9f\n",
-		e.N, e.G0, e.Xs, e.Xe, e.Ys, e.Ye)
+		e.Test, e.G0, e.Xs, e.Xe, e.Ys, e.Ye)
 	}
 
-	entities = dxfutil.GetIndex(entities)
+	entities = dxfutil.GetOrder(entities)
 
 	for _, e := range entities {
 		fmt.Printf("%2d %2d %4s Xs %9f Xe %9f Ys %9f Ye %9f\n",
-		e.N, e.Index, e.G0, e.Xs, e.Xe, e.Ys, e.Ye)
+		e.Test, e.Index, e.G0, e.Xs, e.Xe, e.Ys, e.Ye)
 	}
 
 	dxfutil.GenGcode(entities, iniMap["SAVEAS"])
diff --git a/dxfutil/dxf_util.go b/dxfutil/dxf_util.go
index 69a6053..2df8223 100644
--- a/dxfutil/dxf_util.go
+++ b/dxfutil/dxf_util.go
@@ -12,7 +12,7 @@ import (
 )
 
 type Ent struct {
-	N, Index int
+	Test, Index int
 	G0, G, G8, G10, G11, G20, G21, G30, G31, G40, G50, G51 string
 	Xs, Xe, Ys, Ye, Zs, Ze float64
 }
@@ -106,7 +106,7 @@ func GetEntities(list []string) ([]Ent){
 			case "  0":
 				if len(e) > 0 {count++}
 				e = append(e, Ent{})
-				e[count].N = count
+				e[count].Test = count
 				e[count].G0 = list[i]
 			case "  8":
 				e[count].G8 = list[i]
@@ -169,7 +169,50 @@ func GetEndPoints (e []Ent) ([]Ent){
 	return e
 }
 
-func GetIndex(e []Ent) ([]Ent) {
+func GetOrder(e []Ent) ([]Ent) {
+	// search for a match for e[0] then search for a match to what matched e[0]
+	// this way I can say where to start... sounds good to me now to make it work
+	c := 0
+	x := 0
+	Search:
+	for range e {
+		x++
+		for i := range e {
+			if c != i && floatCompare(e[c].Xe, e[i].Xs) && floatCompare(e[c].Ye, e[i].Ys) {
+				fmt.Printf("ccw c%2d matched i%2d\n", c, i)
+				e[i].Index = x
+				c = i
+				switch e[i].G0 {
+				case "ARC":
+					e[i].G = "3"
+				case "LINE":
+					e[i].G = "1"
+				}
+				continue Search
+			}
+		}
+		for i := range e {
+			if c != i && floatCompare(e[c].Xe, e[i].Xe) && floatCompare(e[c].Ye, e[i].Ye) {
+				// swap start/end, e[i].Index = x, c = i
+				fmt.Printf("cw c%2d matched i%2d\n", c, i)
+				// swap end points and angles
+				e[i].Xe, e[i].Xs = e[i].Xs, e[i].Xe
+				e[i].Ye, e[i].Ys = e[i].Ys, e[i].Ye
+				e[i].G50, e[i].G51 = e[i].G51, e[i].G50
+				e[i].Index = x
+				c = i
+				switch e[i].G0 {
+				case "ARC":
+					e[i].G = "2"
+				case "LINE":
+					e[i].G = "1"
+				}
+				continue Search
+			}
+		}
+	}
+	fmt.Println("GetOrder Done")
+ /*
 	test := e
 	m := 0
 	Searching:
@@ -215,7 +258,8 @@ func GetIndex(e []Ent) ([]Ent) {
 		}
 		fmt.Println("no match for",key)
 	}
+	*/
 	sort.Sort(ByIndex(e))
-	fmt.Println("GetIndex Done")
+
 	return e
 }