From 94c8489d0f84d978081d29ea934296979dc0221c Mon Sep 17 00:00:00 2001 From: Jose Luis Cercos Pita Date: Fri, 27 Jul 2012 10:27:21 +0200 Subject: [PATCH] Fixed Part module import error --- src/Mod/Ship/Instance.py | 3 ++- src/Mod/Ship/SimInstance.py | 3 ++- src/Mod/Ship/TankInstance.py | 3 ++- src/Mod/Ship/shipAreasCurve/Plot.py | 3 +-- src/Mod/Ship/shipAreasCurve/Preview.py | 2 +- src/Mod/Ship/shipCreateShip/Preview.py | 2 +- src/Mod/Ship/shipHydrostatics/Plot.py | 3 ++- src/Mod/Ship/shipHydrostatics/Tools.py | 3 ++- src/Mod/Ship/shipOutlineDraw/Plot.py | 3 ++- src/Mod/Ship/shipOutlineDraw/Preview.py | 3 ++- src/Mod/Ship/simRun/Simulation.py | 3 ++- src/Mod/Ship/tankCreateTank/TaskPanel.py | 1 + src/Mod/Ship/tankGZ/Plot.py | 4 ++-- src/Mod/Ship/tankWeights/Preview.py | 2 +- 14 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/Mod/Ship/Instance.py b/src/Mod/Ship/Instance.py index ca601ddaa..40fd10992 100644 --- a/src/Mod/Ship/Instance.py +++ b/src/Mod/Ship/Instance.py @@ -30,7 +30,8 @@ from pivy import coin # FreeCAD import FreeCAD,FreeCADGui -from FreeCAD import Part, Base, Vector +from FreeCAD import Base, Vector +import Part # Ship design module from shipUtils import Paths, Translator, Math diff --git a/src/Mod/Ship/SimInstance.py b/src/Mod/Ship/SimInstance.py index 193c54823..3d047e3a1 100644 --- a/src/Mod/Ship/SimInstance.py +++ b/src/Mod/Ship/SimInstance.py @@ -31,7 +31,8 @@ from pivy import coin # FreeCAD import FreeCAD,FreeCADGui -from FreeCAD import Part, Base, Vector +from FreeCAD import Base, Vector +import Part # Ship design module from shipUtils import Paths, Translator, Math diff --git a/src/Mod/Ship/TankInstance.py b/src/Mod/Ship/TankInstance.py index e35b7f520..48a126971 100644 --- a/src/Mod/Ship/TankInstance.py +++ b/src/Mod/Ship/TankInstance.py @@ -29,7 +29,8 @@ from pivy import coin # FreeCAD import FreeCAD,FreeCADGui -from FreeCAD import Part, Base, Vector +from FreeCAD import Base, Vector +import Part # Ship design module from shipUtils import Paths, Translator, Math diff --git a/src/Mod/Ship/shipAreasCurve/Plot.py b/src/Mod/Ship/shipAreasCurve/Plot.py index 6e0fdb536..61b1f3a20 100644 --- a/src/Mod/Ship/shipAreasCurve/Plot.py +++ b/src/Mod/Ship/shipAreasCurve/Plot.py @@ -24,8 +24,7 @@ import os # FreeCAD modules import FreeCAD,FreeCADGui -from FreeCAD import Part, Base -from FreeCAD import Image, ImageGui +from FreeCAD import Base, Image, ImageGui # FreeCADShip modules from shipUtils import Paths, Translator diff --git a/src/Mod/Ship/shipAreasCurve/Preview.py b/src/Mod/Ship/shipAreasCurve/Preview.py index 8f2d7eba1..6af80580d 100644 --- a/src/Mod/Ship/shipAreasCurve/Preview.py +++ b/src/Mod/Ship/shipAreasCurve/Preview.py @@ -24,7 +24,7 @@ # FreeCAD modules import FreeCAD,FreeCADGui from FreeCAD import Base -from FreeCAD import Part +import Part # FreeCADShip modules from shipUtils import Paths, Translator diff --git a/src/Mod/Ship/shipCreateShip/Preview.py b/src/Mod/Ship/shipCreateShip/Preview.py index b4d9e39b9..72f601432 100644 --- a/src/Mod/Ship/shipCreateShip/Preview.py +++ b/src/Mod/Ship/shipCreateShip/Preview.py @@ -24,7 +24,7 @@ # FreeCAD modules import FreeCAD,FreeCADGui from FreeCAD import Base -from FreeCAD import Part +import Part # FreeCADShip modules from shipUtils import Paths, Translator diff --git a/src/Mod/Ship/shipHydrostatics/Plot.py b/src/Mod/Ship/shipHydrostatics/Plot.py index d953b5ddf..011b45c74 100644 --- a/src/Mod/Ship/shipHydrostatics/Plot.py +++ b/src/Mod/Ship/shipHydrostatics/Plot.py @@ -25,8 +25,9 @@ import os import math # FreeCAD modules import FreeCAD,FreeCADGui -from FreeCAD import Part, Base, Vector +from FreeCAD import Base, Vector from FreeCAD import Image, ImageGui +import Part # FreeCADShip modules from shipUtils import Paths, Translator import Tools diff --git a/src/Mod/Ship/shipHydrostatics/Tools.py b/src/Mod/Ship/shipHydrostatics/Tools.py index d329fc07c..a42c9b774 100644 --- a/src/Mod/Ship/shipHydrostatics/Tools.py +++ b/src/Mod/Ship/shipHydrostatics/Tools.py @@ -23,7 +23,8 @@ import math # FreeCAD modules -from FreeCAD import Vector, Part +from FreeCAD import Vector +import Part import FreeCAD as App import FreeCADGui as Gui # Module diff --git a/src/Mod/Ship/shipOutlineDraw/Plot.py b/src/Mod/Ship/shipOutlineDraw/Plot.py index 7d21b2fbc..682c15678 100644 --- a/src/Mod/Ship/shipOutlineDraw/Plot.py +++ b/src/Mod/Ship/shipOutlineDraw/Plot.py @@ -23,7 +23,8 @@ # FreeCAD modules import FreeCAD,FreeCADGui -from FreeCAD import Base, Part, Vector +from FreeCAD import Base, Vector +import Part # FreeCADShip modules from shipUtils import Paths, Translator from surfUtils import Geometry diff --git a/src/Mod/Ship/shipOutlineDraw/Preview.py b/src/Mod/Ship/shipOutlineDraw/Preview.py index 2b323b47e..a1ccb2012 100644 --- a/src/Mod/Ship/shipOutlineDraw/Preview.py +++ b/src/Mod/Ship/shipOutlineDraw/Preview.py @@ -23,7 +23,8 @@ # FreeCAD modules import FreeCAD,FreeCADGui -from FreeCAD import Base, Part, Vector +from FreeCAD import Base, Vector +import Part # FreeCADShip modules from shipUtils import Paths, Translator diff --git a/src/Mod/Ship/simRun/Simulation.py b/src/Mod/Ship/simRun/Simulation.py index 0767342cb..32b570757 100644 --- a/src/Mod/Ship/simRun/Simulation.py +++ b/src/Mod/Ship/simRun/Simulation.py @@ -31,7 +31,8 @@ import numpy as np # FreeCAD import FreeCAD,FreeCADGui -from FreeCAD import Part, Base, Vector +from FreeCAD import Base, Vector +import Part # Ship design module from shipUtils import Paths, Translator, Math diff --git a/src/Mod/Ship/tankCreateTank/TaskPanel.py b/src/Mod/Ship/tankCreateTank/TaskPanel.py index 4eddbd03e..15305ca90 100644 --- a/src/Mod/Ship/tankCreateTank/TaskPanel.py +++ b/src/Mod/Ship/tankCreateTank/TaskPanel.py @@ -24,6 +24,7 @@ # FreeCAD modules import FreeCAD as App import FreeCADGui as Gui +import Part # Qt library from PyQt4 import QtGui,QtCore # Module diff --git a/src/Mod/Ship/tankGZ/Plot.py b/src/Mod/Ship/tankGZ/Plot.py index 1ce11d344..09db5345b 100644 --- a/src/Mod/Ship/tankGZ/Plot.py +++ b/src/Mod/Ship/tankGZ/Plot.py @@ -24,8 +24,8 @@ import os # FreeCAD modules import FreeCAD,FreeCADGui -from FreeCAD import Part, Base -from FreeCAD import Image, ImageGui +from FreeCAD import Base, Image, ImageGui +import Part # FreeCADShip modules from shipUtils import Paths, Translator diff --git a/src/Mod/Ship/tankWeights/Preview.py b/src/Mod/Ship/tankWeights/Preview.py index 571155bb9..23bb7fae6 100644 --- a/src/Mod/Ship/tankWeights/Preview.py +++ b/src/Mod/Ship/tankWeights/Preview.py @@ -24,7 +24,7 @@ # FreeCAD modules import FreeCAD,FreeCADGui from FreeCAD import Base -from FreeCAD import Part +import Part # FreeCADShip modules from shipUtils import Paths, Translator