Fixed ToolBitLibrary json format

FreeCAD · Nov 29, 2019 · cb8c847 · cb8c847
1 parent fd629df
commit cb8c847
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 16 deletions.
diff --git a/src/Mod/Path/PathScripts/PathToolBitLibraryGui.py b/src/Mod/Path/PathScripts/PathToolBitLibraryGui.py
@@ -216,8 +216,9 @@ def libraryLoad(self, path):
         if path:
             with open(path) as fp:
                 library = json.load(fp)
-            for nr in library['tools']:
-                bit = PathToolBit.findBit(library['tools'][nr])
+            for toolBit in library['tools']:
+                nr  = toolBit['nr']
+                bit = PathToolBit.findBit(toolBit['path'])
                 if bit:
                     PathLog.track(bit)
                     tool = PathToolBit.Declaration(bit)
@@ -236,13 +237,13 @@ def libraryNew(self):
 
     def librarySave(self):
         library = {}
-        tools = {}
+        tools = []
         library['version'] = 1
         library['tools'] = tools
         for row in range(self.model.rowCount()):
             toolNr   = self.model.data(self.model.index(row, 0), PySide.QtCore.Qt.EditRole)
             toolPath = self.model.data(self.model.index(row, 0), _PathRole)
-            tools[toolNr] = toolPath
+            tools.append({'nr': toolNr, 'path': toolPath})
 
         with open(self.path, 'w') as fp:
             json.dump(library, fp, sort_keys=True, indent=2)

diff --git a/src/Mod/Path/Tools/Library/endmills.fctl b/src/Mod/Path/Tools/Library/endmills.fctl
@@ -1,14 +1,41 @@
 {
-  "tools": {
-    "1": "t1",
-    "2": "t2",
-    "3": "t3",
-    "4": "t4",
-    "5": "t5",
-    "6": "t6",
-    "7": "t7",
-    "8": "t8",
-    "9": "t9"
-  },
+  "tools": [
+    {
+      "nr": 1,
+      "path": "/media/sdb/projects/FreeCAD/dev/FreeCAD/src/Mod/Path/Tools/Bit/t1.fctb"
+    },
+    {
+      "nr": 2,
+      "path": "/media/sdb/projects/FreeCAD/dev/FreeCAD/src/Mod/Path/Tools/Bit/t2.fctb"
+    },
+    {
+      "nr": 3,
+      "path": "/media/sdb/projects/FreeCAD/dev/FreeCAD/src/Mod/Path/Tools/Bit/t3.fctb"
+    },
+    {
+      "nr": 4,
+      "path": "/media/sdb/projects/FreeCAD/dev/FreeCAD/src/Mod/Path/Tools/Bit/t4.fctb"
+    },
+    {
+      "nr": 5,
+      "path": "/media/sdb/projects/FreeCAD/dev/FreeCAD/src/Mod/Path/Tools/Bit/t5.fctb"
+    },
+    {
+      "nr": 6,
+      "path": "/media/sdb/projects/FreeCAD/dev/FreeCAD/src/Mod/Path/Tools/Bit/t6.fctb"
+    },
+    {
+      "nr": 7,
+      "path": "/media/sdb/projects/FreeCAD/dev/FreeCAD/src/Mod/Path/Tools/Bit/t7.fctb"
+    },
+    {
+      "nr": 8,
+      "path": "/media/sdb/projects/FreeCAD/dev/FreeCAD/src/Mod/Path/Tools/Bit/t8.fctb"
+    },
+    {
+      "nr": 9,
+      "path": "/media/sdb/projects/FreeCAD/dev/FreeCAD/src/Mod/Path/Tools/Bit/t9.fctb"
+    }
+  ],
   "version": 1
-}
+}