Skip to content

Commit

Permalink
Change package for json spread sheet - (Task #5)
Browse files Browse the repository at this point in the history
- the json spread sheet is generic to json io

---
Task #5: Implement Import Functionality
  • Loading branch information
PhilMFischer committed Aug 16, 2019
1 parent f9c2731 commit afb1259
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ encoding//freecad/active_document.py=utf-8
encoding//json_io/__init__.py=utf-8
encoding//json_io/json_definitions.py=utf-8
encoding//json_io/json_importer.py=utf-8
encoding//json_io/json_spread_sheet.py=utf-8
encoding//json_io/parts/__init__.py=utf-8
encoding//json_io/parts/json_part.py=utf-8
encoding//json_io/parts/json_part_box.py=utf-8
Expand All @@ -17,7 +18,6 @@ encoding//json_io/parts/json_part_cylinder.py=utf-8
encoding//json_io/parts/json_part_factory.py=utf-8
encoding//json_io/parts/json_part_geometry.py=utf-8
encoding//json_io/parts/json_part_sphere.py=utf-8
encoding//json_io/parts/json_spread_sheet.py=utf-8
encoding//json_io/products/__init__.py=utf-8
encoding//json_io/products/json_product.py=utf-8
encoding//module/__init__.py=utf-8
Expand All @@ -34,9 +34,9 @@ encoding//test/json_io/parts/test_json_part_cylinder.py=utf-8
encoding//test/json_io/parts/test_json_part_factory.py=utf-8
encoding//test/json_io/parts/test_json_part_geometry.py=utf-8
encoding//test/json_io/parts/test_json_part_sphere.py=utf-8
encoding//test/json_io/parts/test_json_spread_sheet.py=utf-8
encoding//test/json_io/products/test_json_product.py=utf-8
encoding//test/json_io/test_json_importer.py=utf-8
encoding//test/json_io/test_json_spread_sheet.py=utf-8
encoding//test/test_setup.py=utf-8
encoding/<project>=UTF-8
encoding/Init.py=utf-8
Expand Down
4 changes: 2 additions & 2 deletions TestVirtualSatelliteApp.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
#

from test.json_io.test_json_importer import TestJsonImporter # NOQA
from test.json_io.products.test_json_product import TestJsonProduct # NOQA
from test.json_io.parts.test_json_spread_sheet import TestJsonSpreadSheet # NOQA
from test.json_io.test_json_spread_sheet import TestJsonSpreadSheet # NOQA
from test.json_io.parts.test_json_part import TestJsonPart # NOQA
from test.json_io.parts.test_json_part_box import TestJsonPartBox # NOQA
from test.json_io.parts.test_json_part_cone import TestJsonPartCone # NOQA
from test.json_io.parts.test_json_part_cylinder import TestJsonPartCylinder # NOQA
from test.json_io.parts.test_json_part_sphere import TestJsonPartSphere # NOQA
from test.json_io.parts.test_json_part_geometry import TestJsonPartGeometry # NOQA
from test.json_io.parts.test_json_part_factory import TestJsonPartFactory # NOQA
from test.json_io.products.test_json_product import TestJsonProduct # NOQA
from test.freecad.test_actice_document import TestActiveDocument # NOQA
File renamed without changes.
2 changes: 1 addition & 1 deletion json_io/parts/json_part.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from json_io.json_definitions import JSON_ELEMENT_NAME, JSON_ELEMENT_SHAPE,\
JSON_ELEMENT_UUID, JSON_ELEMENT_LENGTH_X, JSON_ELEMENT_LENGTH_Y,\
JSON_ELEMENT_LENGTH_Z, JSON_ELEMENT_RADIUS, JSON_ELEMENT_COLOR
from json_io.parts.json_spread_sheet import JsonSpreadSheet
from json_io.json_spread_sheet import JsonSpreadSheet


M_TO_MM = 1000
Expand Down
2 changes: 1 addition & 1 deletion json_io/products/json_product.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
JSON_ELEMENT_POS_Z, JSON_ELEMENT_ROT_X, JSON_ELEMENT_ROT_Y,\
JSON_ELEMENT_ROT_Z, JSON_ELEMENT_PART_UUID, JSON_ELEMENT_PART_NAME
import math
from json_io.parts.json_spread_sheet import JsonSpreadSheet
from json_io.json_spread_sheet import JsonSpreadSheet


M_TO_MM = 1000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import FreeCADGui
from freecad.active_document import ActiveDocument
from test.test_setup import AWorkingDirectoryTest
from json_io.parts.json_spread_sheet import JsonSpreadSheet, FREECAD_PART_SHEET_NAME
from json_io.json_spread_sheet import JsonSpreadSheet, FREECAD_PART_SHEET_NAME
import json
from json_io.parts.json_part import AJsonPart

Expand Down

0 comments on commit afb1259

Please sign in to comment.