fixed all imports of pycam.Geometry

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@506 bbaffbd6-741e-11dd-a85d-61de82d9cad9

src/pycam/Cutters/CylindricalCutter.py

@@ -23,7 +23,6 @@ along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 
 from pycam.Geometry.utils import INFINITE
 from pycam.Geometry.Point import Point
-#from pycam.Geometry.utils import *
 from pycam.Geometry.intersection import intersect_circle_plane, \
         intersect_circle_point, intersect_circle_line, \
         intersect_cylinder_point, intersect_cylinder_line

src/pycam/Geometry/__init__.py

@@ -25,13 +25,6 @@ __all__ = ["utils", "Line", "Model", "Path", "Plane", "Point", "Triangle",
            "PolygonExtractor", "TriangleKdtree", "intersection", "kdtree",
            "Matrix"]
 
-#from pycam.Geometry.Point import Point
-#from pycam.Geometry.Line import Line
-#from pycam.Geometry.Triangle import Triangle
-#from pycam.Geometry.Path import Path
-#from pycam.Geometry.Plane import Plane
-#from pycam.Geometry.PolygonExtractor import PolygonExtractor
-
 
 class TransformableContainer(object):
     """ a base class for geometrical objects containing other elements

src/pycam/Importers/DXFImporter.py

@@ -20,7 +20,8 @@ You should have received a copy of the GNU General Public License
 along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from pycam.Geometry import Point, Line
+from pycam.Geometry.Point import Point
+from pycam.Geometry.Line import Line
 import pycam.Geometry.Model
 import pycam.Utils.log
 

src/pycam/Importers/TestModel.py

@@ -20,9 +20,12 @@ You should have received a copy of the GNU General Public License
 along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from pycam.Geometry import Triangle, Line, Point
+from pycam.Geometry.Triangle import Triangle
+from pycam.Geometry.Line import Line
+from pycam.Geometry.Point import Point
 from pycam.Geometry.Model import Model
 
+
 def get_test_model():
     points = []
     points.append(Point(-2, 1, 4))

src/pycam/PathProcessors/PathAccumulator.py

@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License
 along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from pycam.Geometry import Path
+from pycam.Geometry.Path import Path
 
 def _check_colinearity(p1, p2, p3):
     v1 = p2.sub(p1)

src/pycam/PathProcessors/PolygonCutter.py

@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License
 along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from pycam.Geometry import Path
+from pycam.Geometry.Path import Path
 from pycam.Geometry.PolygonExtractor import PolygonExtractor
 
 

src/pycam/PathProcessors/SimpleCutter.py

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from pycam.Geometry import Path
+from pycam.Geometry.Path import Path
 
 class SimpleCutter:
     def __init__(self):

src/pycam/PathProcessors/ZigZagCutter.py

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from pycam.Geometry import Path
+from pycam.Geometry.Path import Path
 
 class ZigZagCutter:
     def __init__(self):

src/pycam/Toolpath/SupportGrid.py

@@ -20,7 +20,10 @@ You should have received a copy of the GNU General Public License
 along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from pycam.Geometry import Point, Line, Triangle, Model
+from pycam.Geometry.Point import Point
+from pycam.Geometry.Line import Line
+from pycam.Geometry.Triangle import Triangle
+from pycam.Geometry.Model import Model
 
 
 def _add_cuboid_to_model(minx, maxx, miny, maxy, minz, maxz):