diff --git a/networks/geometry/Polyline.py b/networks/geometry/Polyline.py index 8a47d64..e77f3e2 100644 --- a/networks/geometry/Polyline.py +++ b/networks/geometry/Polyline.py @@ -63,11 +63,9 @@ class Polyline: self.get_segments() self.total_line_output = [] - # for i in range(1, self.length_polyline-1): - # self.total_line_output.extend(self.segments[i].segment()) - # self.total_line_output.extend(self.arcs[i]) - self.total_line_output.extend(self.segments[1].segment()) - self.total_line_output.extend(self.arcs[2]) + for i in range(1, self.length_polyline-1): + self.total_line_output.extend(self.segments[i].segment()) + self.total_line_output.extend(self.arcs[i]) def __repr__(self): return str(self.alpha_radii) @@ -113,10 +111,8 @@ class Polyline: self.acrs_intersections[i][0]) - Point2D.to_arrays(self.centers[i]))) double_point_b = Point2D.from_arrays(Point2D.to_arrays(self.acrs_intersections[i][2]) + 5 * (Point2D.to_arrays( self.acrs_intersections[i][2]) - Point2D.to_arrays(self.centers[i]))) - input("---") + for j in range(len(points)): - print(points[j], i, j, len(points)) - print(len(self.arcs[i]), len(self.arcs[i-1])) if points[j].is_in_triangle(double_point_a, self.centers[i], double_point_b): self.arcs[i].append(points[j]) return self.arcs diff --git a/networks/roads_2/Roads.py b/networks/roads_2/Roads.py index 7d5eacd..da70e72 100644 --- a/networks/roads_2/Roads.py +++ b/networks/roads_2/Roads.py @@ -1,13 +1,12 @@ import json from typing import List from networks.geometry.Polyline import Polyline -from networks.geometry.Segment2D import Segment2D -from networks.geometry.Segment3D import Segment3D + from networks.geometry.Point3D import Point3D from networks.geometry.Point2D import Point2D from networks.geometry.Circle import Circle from Enums import LINE_THICKNESS_MODE -from gdpc import Block, Editor, geometry +from gdpc import Block, Editor class Road: diff --git a/output_image.png b/output_image.png index 9ce53c8..596dfb9 100644 Binary files a/output_image.png and b/output_image.png differ