chiark / gitweb /
Move SF into its own directory, to seperate SF and Cura. Rename newui to gui.
authordaid <daid303@gmail.com>
Tue, 27 Mar 2012 15:20:30 +0000 (17:20 +0200)
committerdaid <daid303@gmail.com>
Tue, 27 Mar 2012 15:20:30 +0000 (17:20 +0200)
223 files changed:
Cura/cura.py
Cura/cura_sf/fabmetheus_utilities/__init__.py [moved from Cura/fabmetheus_utilities/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/archive.py [moved from Cura/fabmetheus_utilities/archive.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/euclidean.py [moved from Cura/fabmetheus_utilities/euclidean.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/__init__.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/alphabetize.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/alphabetize.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/fabmetheus_interpret.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/csv.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/gts.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/obj.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/slc.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/stl.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/interpret_plugins/svg.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/prepare.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/prepare.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/fabmetheus_tools/wikifier.py [moved from Cura/fabmetheus_utilities/fabmetheus_tools/wikifier.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/gcodec.py [moved from Cura/fabmetheus_utilities/gcodec.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/__init__.py [moved from Cura/fabmetheus_utilities/geometry/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/__init__.py [moved from Cura/fabmetheus_utilities/geometry/creation/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/_drill.py [moved from Cura/fabmetheus_utilities/geometry/creation/_drill.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/_svg.py [moved from Cura/fabmetheus_utilities/geometry/creation/_svg.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/circle.py [moved from Cura/fabmetheus_utilities/geometry/creation/circle.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/concatenate.py [moved from Cura/fabmetheus_utilities/geometry/creation/concatenate.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/extrude.py [moved from Cura/fabmetheus_utilities/geometry/creation/extrude.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/gear.py [moved from Cura/fabmetheus_utilities/geometry/creation/gear.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/grid.py [moved from Cura/fabmetheus_utilities/geometry/creation/grid.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/heightmap.py [moved from Cura/fabmetheus_utilities/geometry/creation/heightmap.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/lathe.py [moved from Cura/fabmetheus_utilities/geometry/creation/lathe.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/line.py [moved from Cura/fabmetheus_utilities/geometry/creation/line.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py [moved from Cura/fabmetheus_utilities/geometry/creation/linear_bearing_cage.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/lineation.py [moved from Cura/fabmetheus_utilities/geometry/creation/lineation.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/mechaslab.py [moved from Cura/fabmetheus_utilities/geometry/creation/mechaslab.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/peg.py [moved from Cura/fabmetheus_utilities/geometry/creation/peg.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/polygon.py [moved from Cura/fabmetheus_utilities/geometry/creation/polygon.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/shaft.py [moved from Cura/fabmetheus_utilities/geometry/creation/shaft.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/solid.py [moved from Cura/fabmetheus_utilities/geometry/creation/solid.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/sponge_slice.py [moved from Cura/fabmetheus_utilities/geometry/creation/sponge_slice.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/square.py [moved from Cura/fabmetheus_utilities/geometry/creation/square.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/teardrop.py [moved from Cura/fabmetheus_utilities/geometry/creation/teardrop.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/creation/text.py [moved from Cura/fabmetheus_utilities/geometry/creation/text.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/__init__.py [moved from Cura/fabmetheus_utilities/geometry/geometry_tools/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/dictionary.py [moved from Cura/fabmetheus_utilities/geometry/geometry_tools/dictionary.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/face.py [moved from Cura/fabmetheus_utilities/geometry/geometry_tools/face.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path.py [moved from Cura/fabmetheus_utilities/geometry/geometry_tools/path.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py [moved from Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py [moved from Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/arc.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py [moved from Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/cubic.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py [moved from Cura/fabmetheus_utilities/geometry/geometry_tools/path_elements/quadratic.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_tools/vertex.py [moved from Cura/fabmetheus_utilities/geometry/geometry_tools/vertex.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/__init__.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/boolean_geometry.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/boolean_solid.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/creation.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/document.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_elements/setting.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/dictionary_attribute.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/list_attribute.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_enumerables/string_attribute.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/_math.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/euclid.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/measure.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/evaluate_fundamentals/print.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/example.csv [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/example.csv with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/geometry_utilities/matrix.py [moved from Cura/fabmetheus_utilities/geometry/geometry_utilities/matrix.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_matrix/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_matrix/_scale.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_matrix/rotate.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/transform.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_matrix/transform.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_matrix/translate.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_matrix/translate.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/__init__.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_meta/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_array.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_meta/_array.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_carve.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_meta/_carve.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/_copy.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_meta/_copy.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_meta/disjoin.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/import.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_meta/import.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_meta/write.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_meta/write.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/__init__.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_paths/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/bevel.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_paths/bevel.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/convex.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_paths/convex.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/outline.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_paths/outline.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/overhang.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_paths/overhang.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/round.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_paths/round.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/segment.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_paths/segment.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_paths/wedge.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_paths/wedge.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_shapes/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_shapes/_bottom.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_shapes/_inset.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_shapes/_outset.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/equation.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_shapes/equation.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/flip.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_shapes/flip.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py [moved from Cura/fabmetheus_utilities/geometry/manipulation_shapes/mirror.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/solids/__init__.py [moved from Cura/fabmetheus_utilities/geometry/solids/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/solids/cube.py [moved from Cura/fabmetheus_utilities/geometry/solids/cube.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/solids/cylinder.py [moved from Cura/fabmetheus_utilities/geometry/solids/cylinder.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/solids/difference.py [moved from Cura/fabmetheus_utilities/geometry/solids/difference.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/solids/group.py [moved from Cura/fabmetheus_utilities/geometry/solids/group.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/solids/intersection.py [moved from Cura/fabmetheus_utilities/geometry/solids/intersection.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/solids/sphere.py [moved from Cura/fabmetheus_utilities/geometry/solids/sphere.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/solids/triangle_mesh.py [moved from Cura/fabmetheus_utilities/geometry/solids/triangle_mesh.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/solids/union.py [moved from Cura/fabmetheus_utilities/geometry/solids/union.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/__init__.py [moved from Cura/fabmetheus_utilities/geometry/statements/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/_print.py [moved from Cura/fabmetheus_utilities/geometry/statements/_print.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/class.py [moved from Cura/fabmetheus_utilities/geometry/statements/class.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/elif.py [moved from Cura/fabmetheus_utilities/geometry/statements/elif.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/else.py [moved from Cura/fabmetheus_utilities/geometry/statements/else.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/for.py [moved from Cura/fabmetheus_utilities/geometry/statements/for.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/function.py [moved from Cura/fabmetheus_utilities/geometry/statements/function.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/if.py [moved from Cura/fabmetheus_utilities/geometry/statements/if.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/return.py [moved from Cura/fabmetheus_utilities/geometry/statements/return.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/statement.py [moved from Cura/fabmetheus_utilities/geometry/statements/statement.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry/statements/while.py [moved from Cura/fabmetheus_utilities/geometry/statements/while.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry_plugins/__init__.py [moved from Cura/fabmetheus_utilities/geometry_plugins/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry_plugins/creation/__init__.py [moved from Cura/fabmetheus_utilities/geometry_plugins/creation/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py [moved from Cura/fabmetheus_utilities/geometry_plugins/manipulation_matrix/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py [moved from Cura/fabmetheus_utilities/geometry_plugins/manipulation_meta/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py [moved from Cura/fabmetheus_utilities/geometry_plugins/manipulation_paths/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py [moved from Cura/fabmetheus_utilities/geometry_plugins/manipulation_shapes/__init__.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/intercircle.py [moved from Cura/fabmetheus_utilities/intercircle.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/settings.py [moved from Cura/fabmetheus_utilities/settings.py with 99% similarity]
Cura/cura_sf/fabmetheus_utilities/svg_reader.py [moved from Cura/fabmetheus_utilities/svg_reader.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/svg_writer.py [moved from Cura/fabmetheus_utilities/svg_writer.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/templates/canvas_template.svg [moved from Cura/fabmetheus_utilities/templates/canvas_template.svg with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/templates/layer_template.svg [moved from Cura/fabmetheus_utilities/templates/layer_template.svg with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/vector3.py [moved from Cura/fabmetheus_utilities/vector3.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/vector3index.py [moved from Cura/fabmetheus_utilities/vector3index.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/version.txt [moved from Cura/fabmetheus_utilities/version.txt with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/xml_simple_reader.py [moved from Cura/fabmetheus_utilities/xml_simple_reader.py with 100% similarity]
Cura/cura_sf/fabmetheus_utilities/xml_simple_writer.py [moved from Cura/fabmetheus_utilities/xml_simple_writer.py with 100% similarity]
Cura/cura_sf/skeinforge_application/__init__.py [moved from Cura/skeinforge_application/__init__.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/__init__.py [moved from Cura/skeinforge_application/skeinforge_plugins/__init__.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze.py [moved from Cura/skeinforge_application/skeinforge_plugins/analyze.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py [moved from Cura/skeinforge_application/skeinforge_plugins/analyze_plugins/__init__.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/__init__.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/alteration.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/bottom.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/carve.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/chamber.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/chop.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/cleave.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/clip.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/coil.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/comb.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/cool.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/dimension.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/drill.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/dwindle.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/__init__.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/binary_16_byte.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_step.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/gcode_time_segment.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/__init__.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/export_plugins/static_plugins/gcode_small.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/feed.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/fill.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/fillet.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/flow.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/home.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/home.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/hop.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/inset.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/jitter.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/joris.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/lash.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/lift.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/limit.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/mill.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/multiply.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/oozebane.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/outset.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/preface.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/raft.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/scale.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/skin.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/skirt.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/smooth.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/speed.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/splodge.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/stretch.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/temperature.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/tower.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/unpause.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/whittle.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/widen.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py [moved from Cura/skeinforge_application/skeinforge_plugins/craft_plugins/wipe.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/help.py [moved from Cura/skeinforge_application/skeinforge_plugins/help.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta.py [moved from Cura/skeinforge_application/skeinforge_plugins/meta.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py [moved from Cura/skeinforge_application/skeinforge_plugins/meta_plugins/__init__.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/description.py [moved from Cura/skeinforge_application/skeinforge_plugins/meta_plugins/description.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py [moved from Cura/skeinforge_application/skeinforge_plugins/meta_plugins/polyfile.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile.py [moved from Cura/skeinforge_application/skeinforge_plugins/profile.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py [moved from Cura/skeinforge_application/skeinforge_plugins/profile_plugins/__init__.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py [moved from Cura/skeinforge_application/skeinforge_plugins/profile_plugins/cutting.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py [moved from Cura/skeinforge_application/skeinforge_plugins/profile_plugins/extrusion.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py [moved from Cura/skeinforge_application/skeinforge_plugins/profile_plugins/milling.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py [moved from Cura/skeinforge_application/skeinforge_plugins/profile_plugins/winding.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_utilities/__init__.py [moved from Cura/skeinforge_application/skeinforge_utilities/__init__.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py [moved from Cura/skeinforge_application/skeinforge_utilities/skeinforge_analyze.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_craft.py [moved from Cura/skeinforge_application/skeinforge_utilities/skeinforge_craft.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_help.py [moved from Cura/skeinforge_application/skeinforge_utilities/skeinforge_help.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_meta.py [moved from Cura/skeinforge_application/skeinforge_utilities/skeinforge_meta.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py [moved from Cura/skeinforge_application/skeinforge_utilities/skeinforge_polyfile.py with 100% similarity]
Cura/cura_sf/skeinforge_application/skeinforge_utilities/skeinforge_profile.py [moved from Cura/skeinforge_application/skeinforge_utilities/skeinforge_profile.py with 100% similarity]
Cura/gui/__init__.py [moved from Cura/newui/__init__.py with 100% similarity]
Cura/gui/advancedConfig.py [moved from Cura/newui/advancedConfig.py with 96% similarity]
Cura/gui/alterationPanel.py [moved from Cura/newui/alterationPanel.py with 95% similarity]
Cura/gui/configBase.py [moved from Cura/newui/configBase.py with 99% similarity]
Cura/gui/configWizard.py [moved from Cura/newui/configWizard.py with 97% similarity]
Cura/gui/gcodeInterpreter.py [moved from Cura/newui/gcodeInterpreter.py with 99% similarity]
Cura/gui/machineCom.py [moved from Cura/newui/machineCom.py with 99% similarity]
Cura/gui/mainWindow.py [moved from Cura/newui/mainWindow.py with 97% similarity]
Cura/gui/preferencesDialog.py [moved from Cura/newui/preferencesDialog.py with 93% similarity]
Cura/gui/preview3d.py [moved from Cura/newui/preview3d.py with 96% similarity]
Cura/gui/printWindow.py [moved from Cura/newui/printWindow.py with 100% similarity]
Cura/gui/profile.py [moved from Cura/newui/profile.py with 100% similarity]
Cura/gui/sliceProgessPanel.py [moved from Cura/newui/sliceProgessPanel.py with 98% similarity]
Cura/gui/sliceRun.py [moved from Cura/newui/sliceRun.py with 95% similarity]
Cura/gui/util3d.py [moved from Cura/newui/util3d.py with 100% similarity]
Cura/gui/validators.py [moved from Cura/newui/validators.py with 99% similarity]

index b968a941c4d72665399d1271dba558c3b7f5e376..3633e41aa7415f7e348c33290d084b5715550b21 100644 (file)
@@ -14,9 +14,9 @@ import __init__
 
 import sys
 import platform
-
 from optparse import OptionParser
-from newui import sliceRun
+
+from gui import sliceRun
 
 __author__ = 'Daid'
 __credits__ = """
@@ -49,7 +49,7 @@ def main():
        if len( args ) > 0:
                sliceRun.runSlice(args)
        else:
-               from newui import mainWindow
+               from gui import mainWindow
                mainWindow.main()
 
 if __name__ == '__main__':
similarity index 99%
rename from Cura/fabmetheus_utilities/settings.py
rename to Cura/cura_sf/fabmetheus_utilities/settings.py
index 567b5a8c55a0a71118c6279743341a39402b5e80..626bb04cee60e2671e0ee472f4a243e68dd3ec5f 100644 (file)
@@ -10,7 +10,7 @@ import __init__
 import os, sys
 import types, math
 
-from newui import profile
+from gui import profile
 from fabmetheus_utilities import archive
 
 def DEFSET(setting):
similarity index 100%
rename from Cura/newui/__init__.py
rename to Cura/gui/__init__.py
similarity index 96%
rename from Cura/newui/advancedConfig.py
rename to Cura/gui/advancedConfig.py
index 97852fe1bf1da92864a83e30728dfdc1b37a0111..4f9a0c9b82bc9b7486c3e5897c9d43c29bddec7a 100644 (file)
@@ -4,11 +4,11 @@ import __init__
 import wx, os, platform, types
 import ConfigParser
 
-from newui import configBase
-from newui import preview3d
-from newui import sliceProgessPanel
-from newui import alterationPanel
-from newui import validators
+from gui import configBase
+from gui import preview3d
+from gui import sliceProgessPanel
+from gui import alterationPanel
+from gui import validators
 
 class advancedConfigWindow(configBase.configWindowBase):
        "Advanced configuration window"
similarity index 95%
rename from Cura/newui/alterationPanel.py
rename to Cura/gui/alterationPanel.py
index c25a1dd209f3c7dffaba1c50aabb8648611a76e8..cd99b62520f9fa09ddceb2abdca4d94e71f08ef9 100644 (file)
@@ -1,7 +1,7 @@
 import wx\r
 import sys,math,threading,os\r
 \r
-from newui import profile\r
+from gui import profile\r
 \r
 class alterationPanel(wx.Panel):\r
        def __init__(self, parent):\r
similarity index 99%
rename from Cura/newui/configBase.py
rename to Cura/gui/configBase.py
index 265a687dfa4a2bb2a9e98d890500ab484e9e3dd3..4b87473ab0a95c963078b646904ace30cf182fc3 100644 (file)
@@ -3,8 +3,8 @@ import __init__
 
 import wx, os, sys, platform, types
 
-from newui import validators
-from newui import profile
+from gui import validators
+from gui import profile
 
 def main():
        app = wx.App(False)
similarity index 97%
rename from Cura/newui/configWizard.py
rename to Cura/gui/configWizard.py
index 97b3f5b09f52c59ae13c7f8639e792d529420a67..8d72d39e0b088c5bdd6151271ff251855f9fdb81 100644 (file)
@@ -4,8 +4,8 @@ import __init__
 import wx, os, platform, types, webbrowser, threading, time, re\r
 import wx.wizard\r
 \r
-from newui import machineCom\r
-from newui import profile\r
+from gui import machineCom\r
+from gui import profile\r
 \r
 class InfoPage(wx.wizard.WizardPageSimple):\r
        def __init__(self, parent, title):\r
similarity index 99%
rename from Cura/newui/gcodeInterpreter.py
rename to Cura/gui/gcodeInterpreter.py
index 334d475683b75621f20d5084dce384c44632579c..2b775507a67c78bc50bd1edafc9614b3d1ec5e05 100644 (file)
@@ -7,7 +7,7 @@ import threading
 import re
 import os
 
-from newui import util3d
+from gui import util3d
 
 class gcodePath():
        def __init__(self, newType, pathType, layerNr, startPoint):
similarity index 99%
rename from Cura/newui/machineCom.py
rename to Cura/gui/machineCom.py
index f4dfee66d20c61d949c727996a123c168615d19a..bdf0d458f3c8e78f2f208384c52f6256e9596558 100644 (file)
@@ -9,7 +9,7 @@ from avr_isp import stk500v2
 from avr_isp import ispBase
 from avr_isp import intelHex
 
-from newui import profile
+from gui import profile
 
 try:
        import _winreg
similarity index 97%
rename from Cura/newui/mainWindow.py
rename to Cura/gui/mainWindow.py
index d87c38445a864c0990c6012e6ededde18b7fbb47..7d33a323d6b59136bdfc91ee2a2e88a9f81eb66d 100644 (file)
@@ -3,17 +3,17 @@ import __init__
 
 import wx, os, platform, types, webbrowser
 
-from newui import configBase
-from newui import advancedConfig
-from newui import preview3d
-from newui import sliceProgessPanel
-from newui import alterationPanel
-from newui import validators
-from newui import preferencesDialog
-from newui import configWizard
-from newui import machineCom
-from newui import profile
-from newui import printWindow
+from gui import configBase
+from gui import advancedConfig
+from gui import preview3d
+from gui import sliceProgessPanel
+from gui import alterationPanel
+from gui import validators
+from gui import preferencesDialog
+from gui import configWizard
+from gui import machineCom
+from gui import profile
+from gui import printWindow
 
 def main():
        app = wx.App(False)
similarity index 93%
rename from Cura/newui/preferencesDialog.py
rename to Cura/gui/preferencesDialog.py
index 0cf19c72ac2986fa7e5394f065d3bf560e39d9bc..564a583c5728457373c0943e2897165ed742a21b 100644 (file)
@@ -4,9 +4,9 @@ import __init__
 import wx, os, platform, types\r
 import ConfigParser\r
 \r
-from newui import configBase\r
-from newui import validators\r
-from newui import machineCom\r
+from gui import configBase\r
+from gui import validators\r
+from gui import machineCom\r
 \r
 class preferencesDialog(configBase.configWindowBase):\r
        def __init__(self, parent):\r
similarity index 96%
rename from Cura/newui/preview3d.py
rename to Cura/gui/preview3d.py
index e9421df80b3d2d83047f86a0db56a23963c0b201..ce857722f3697d1b9f45d1ab2ae8c37f6948d019 100644 (file)
@@ -17,9 +17,9 @@ except:
        print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"\r
        hasOpenGLlibs = False\r
 \r
-from newui import profile\r
-from newui import gcodeInterpreter\r
-from newui import util3d\r
+from gui import profile\r
+from gui import gcodeInterpreter\r
+from gui import util3d\r
 \r
 from fabmetheus_utilities.fabmetheus_tools import fabmetheus_interpret\r
 from fabmetheus_utilities.vector3 import Vector3\r
similarity index 100%
rename from Cura/newui/profile.py
rename to Cura/gui/profile.py
similarity index 98%
rename from Cura/newui/sliceProgessPanel.py
rename to Cura/gui/sliceProgessPanel.py
index 3c3537c0c6482d704e23aa70fd770fa226c6b858..4fda1ea1cd7f48ddcab7a00054f7b4b2c3c7e80d 100644 (file)
@@ -8,7 +8,7 @@ import threading
 import subprocess
 import time
 
-from newui import sliceRun
+from gui import sliceRun
 
 class sliceProgessPanel(wx.Panel):
        def __init__(self, mainWindow, parent, filename):
@@ -115,6 +115,7 @@ class WorkerThread(threading.Thread):
                self.start()
 
        def run(self):
+               print sliceRun.getSliceCommand(self.filename)
                p = subprocess.Popen(sliceRun.getSliceCommand(self.filename), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
                line = p.stdout.readline()
                maxValue = 1
similarity index 95%
rename from Cura/newui/sliceRun.py
rename to Cura/gui/sliceRun.py
index d81f4aa1fa4d484e507167145ceb1c18195654cf..5a32fbe2fa2d1c27777fb95b9d4322c7bd04d55b 100644 (file)
@@ -2,8 +2,8 @@ from __future__ import absolute_import
 
 import platform, os, subprocess, sys
 
-from skeinforge_application.skeinforge_utilities import skeinforge_craft
-from newui import profile
+from cura_sf.skeinforge_application.skeinforge_utilities import skeinforge_craft
+from gui import profile
 
 def getPyPyExe():
        "Return the path to the pypy executable if we can find it. Else return False"
@@ -116,5 +116,5 @@ def getSliceCommand(filename):
                pypyExe = getPyPyExe()
                if pypyExe == False:
                        pypyExe = sys.executable
-               return [pypyExe, os.path.join(sys.path[0], os.path.split(sys.argv[0])[1]), filename]
+               return [pypyExe, os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", os.path.split(sys.argv[0])[1])), filename]
 
similarity index 100%
rename from Cura/newui/util3d.py
rename to Cura/gui/util3d.py
similarity index 99%
rename from Cura/newui/validators.py
rename to Cura/gui/validators.py
index 6352debd94ff7d88289523dcbb7908fe0b65c8f9..55e02547fceb3087a8a3b27a592f81dfff315cbf 100644 (file)
@@ -4,7 +4,7 @@ import __init__
 import types
 import math
 
-from newui import profile
+from gui import profile
 
 SUCCESS = 0
 WARNING = 1