Feature/task 5 implement import functi #17
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 10 commits
November 14, 2019 10:24
- Fixed naming in the dialogs - Switched command positions in InitGui - Added file open dialog with JSON filter to import command --- Task #5: Implement Import Functionality
Use the JsonImporter in the CommandImport --- Task #5: Implement Import Functionality
- Add full import function in JsonImporter - Use that function in CommandImport - Add test function for full import - Add test fixture json file --- Task #5: Implement Import Functionality
- Add JsonProductAssembly call - Add json product tests --- Task #5: Implement Import Functionality
Also: - Add test data in test_json_data - Add test case with that data in test_json_product_assembly - Update test_full_import --- Task #5: Implement Import Functionality
Importing twice should result in the same output as importing once. json_importer: Create FreeCAD filename from JSON filename test_json_importer: Add testcase for importing twice json_product: - Add function to compare AJsonProducts - Only create a part if it doesn't exist already - Clear the placement when reimporting --- Task #5: Implement Import Functionality
Add a simple solution in json_product_child to propagate values from parent to children and also test this behavior. The current method results in children only having an absolute position (and rotation) instead of a relative one to their parent. This should be reconsidered with usability and the export functionality in mind. --- Task #5: Implement Import Functionality
Because of CRUD assume that a change from Virtual Satellite side has always newer information, so we can simply clear the first imported file and use the newer file. For that: - Add a function to clear a file in active_document - Call that function in full_import - Get FreeCAD document from ProductRoot instead of filename (so different versions can easily be saved in different files) - Add new test fixture --- Task #5: Implement Import Functionality
- Add a module directory in FreeCAD Appdata: - Create directory in Init - Provide it with Environment - Use it in CommandImport - Update documentation and Log Messages - Update part update in json_product: Now deletes and recreates existing parts --- Task #5: Implement Import Functionality
Also add the Mod directory --- Task #5: Implement Import Functionality
PhilMFischer
requested changes
Nov 27, 2019
| if filename != '': | ||
| FreeCAD.Console.PrintMessage(f"Selected file '{filename}'\n") | ||
|
|
||
| json_importer = JsonImporter(Environment.get_appdata_module_path() + os.sep) |
There was a problem hiding this comment.
Why do we have to hand over this appdata_module_path?
--- Task #5: Implement Import Functionality
Add: - test_create_part_product_subassembly_with_root_part - test_create_part_product_assembly_and_subassembly_with_root_part - test_create_part_product_assembly_with_root_part_with_traverser (empty test) --- Task #5: Implement Import Functionality
--- Task #5: Implement Import Functionality
- Add first test cases - Add the test class to TestVirtualSatelliteApp - Update traverser - Update product assembly test --- Task #5: Implement Import Functionality
--- Task #5: Implement Import Functionality
Try to use the traverser in the importer and reactivating the full_import test case showed problems with assemblies having the same name and uuid as their part. To further investigate that, test cases were added in the traverser. --- Task #5: Implement Import Functionality
These solve the problem of having a part and an assembly with the same name and uuid. - Add the identifiers to json_definitions - Update the names in part and product files and corresponding test files --- Task #5: Implement Import Functionality
--- Task #5: Implement Import Functionality
--- Task #5: Implement Import Functionality
--- Task #5: Implement Import Functionality
PhilMFischer
approved these changes
Dec 4, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add import functionality:
CRUD will be tested later in #18
Closes #5