From 5a4d61ee8fd4c8cd0fa69f1902ccfc89274e9142 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Mon, 11 Mar 2019 12:28:44 +0200 Subject: [PATCH] - grouped all parsers files in flatcamParsers folder --- FlatCAMEditor.py | 2 +- README.md | 1 + camlib.py | 21 +++---------------- ParseDXF.py => flatcamParsers/ParseDXF.py | 14 +++---------- .../ParseDXF_Spline.py | 0 ParseFont.py => flatcamParsers/ParseFont.py | 0 ParseSVG.py => flatcamParsers/ParseSVG.py | 12 ++++------- flatcamParsers/__init__.py | 0 8 files changed, 12 insertions(+), 38 deletions(-) rename ParseDXF.py => flatcamParsers/ParseDXF.py (98%) rename ParseDXF_Spline.py => flatcamParsers/ParseDXF_Spline.py (100%) rename ParseFont.py => flatcamParsers/ParseFont.py (100%) rename ParseSVG.py => flatcamParsers/ParseSVG.py (98%) create mode 100644 flatcamParsers/__init__.py diff --git a/FlatCAMEditor.py b/FlatCAMEditor.py index 3c23418f..83458158 100644 --- a/FlatCAMEditor.py +++ b/FlatCAMEditor.py @@ -26,7 +26,7 @@ from numpy import arctan2, Inf, array, sqrt, sign, dot from rtree import index as rtindex from flatcamGUI.GUIElements import OptionalInputSection, FCCheckBox, FCEntry, FCComboBox, FCTextAreaRich, \ FCTable, FCDoubleSpinner, FCButton, EvalEntry2, FCInputDialog -from ParseFont import * +from flatcamParsers.ParseFont import * import gettext import FlatCAMTranslation as fcTranslate diff --git a/README.md b/README.md index 0b8e142c..1ed5f8b3 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ CAD program, and create G-Code for Isolation routing. - in Properties tool now the Gerber apertures show the number of polygons in 'solid_geometry' instead of listing the objects - added a visual cue in Menu -> Edit about the entries to enter the Editor and to Save & Exit Editor. When one is enabled the other is disabled. - grouped all the UI files in flatcamGUI folder +- grouped all parsers files in flatcamParsers folder 10.03.2019 diff --git a/camlib.py b/camlib.py index 6f1a1e69..e4959db9 100644 --- a/camlib.py +++ b/camlib.py @@ -12,18 +12,13 @@ from io import StringIO from numpy import arctan2, Inf, array, sqrt, pi, ceil, sin, cos, dot, float32, \ transpose from numpy.linalg import solve, norm -import re -import sys import traceback from decimal import Decimal -import collections - from rtree import index as rtindex # See: http://toblerity.org/shapely/manual.html -from shapely.geometry import Polygon, LineString, Point, LinearRing, MultiLineString -from shapely.geometry import MultiPoint, MultiPolygon +from shapely.geometry import Polygon from shapely.geometry import box as shply_box from shapely.ops import cascaded_union, unary_union import shapely.affinity as affinity @@ -31,32 +26,22 @@ from shapely.wkt import loads as sloads from shapely.wkt import dumps as sdumps from shapely.geometry.base import BaseGeometry from shapely.geometry import shape -from shapely import speedups from collections import Iterable -import numpy as np import rasterio from rasterio.features import shapes -from copy import deepcopy - # TODO: Commented for FlatCAM packaging with cx_freeze -from xml.dom.minidom import parseString as parse_xml_string - # from scipy.spatial import KDTree, Delaunay -from ParseSVG import * -from ParseDXF import * +from flatcamParsers.ParseSVG import * +from flatcamParsers.ParseDXF import * import logging -import os # import pprint import platform -import FlatCAMApp - -import math if platform.architecture()[0] == '64bit': from ortools.constraint_solver import pywrapcp diff --git a/ParseDXF.py b/flatcamParsers/ParseDXF.py similarity index 98% rename from ParseDXF.py rename to flatcamParsers/ParseDXF.py index c5208f8f..327a4d9b 100644 --- a/ParseDXF.py +++ b/flatcamParsers/ParseDXF.py @@ -6,21 +6,13 @@ # MIT Licence # ############################################################ -import re -import itertools -import math -import ezdxf - -from shapely.geometry import LinearRing, LineString, Point, Polygon -from shapely.affinity import translate, rotate, scale, skew, affine_transform -import numpy +from shapely.geometry import LineString import logging log = logging.getLogger('base2') -import FlatCAMApp -from ParseFont import * -from ParseDXF_Spline import * +from flatcamParsers.ParseFont import * +from flatcamParsers.ParseDXF_Spline import * def distance(pt1, pt2): diff --git a/ParseDXF_Spline.py b/flatcamParsers/ParseDXF_Spline.py similarity index 100% rename from ParseDXF_Spline.py rename to flatcamParsers/ParseDXF_Spline.py diff --git a/ParseFont.py b/flatcamParsers/ParseFont.py similarity index 100% rename from ParseFont.py rename to flatcamParsers/ParseFont.py diff --git a/ParseSVG.py b/flatcamParsers/ParseSVG.py similarity index 98% rename from ParseSVG.py rename to flatcamParsers/ParseSVG.py index c2ad5010..14237a65 100644 --- a/ParseSVG.py +++ b/flatcamParsers/ParseSVG.py @@ -20,17 +20,13 @@ ############################################################ # import xml.etree.ElementTree as ET -from lxml import etree as ET -import re -import itertools -from svg.path import Path, Line, Arc, CubicBezier, QuadraticBezier, parse_path +from svg.path import Line, Arc, CubicBezier, QuadraticBezier, parse_path from svg.path.path import Move -from shapely.geometry import LinearRing, LineString, Point, Polygon -from shapely.affinity import translate, rotate, scale, skew, affine_transform +from shapely.geometry import LineString +from shapely.affinity import skew, affine_transform import numpy as np -import logging -from ParseFont import * +from flatcamParsers.ParseFont import * log = logging.getLogger('base2') diff --git a/flatcamParsers/__init__.py b/flatcamParsers/__init__.py new file mode 100644 index 00000000..e69de29b