- Geometry object - work in upgrade of the data structure

defaults.py

@@ -297,56 +297,56 @@ class FlatCAMDefaults:
         "geometry_plot": True,
         "geometry_multicolored": False,
         "geometry_circle_steps": 64,
-        "geometry_cnctooldia": "2.4",
         "geometry_merge_fuse_tools": True,
         "geometry_plot_line": "#FF0000",
-        "geometry_optimization_type": 'R',
-        "geometry_search_time": 3,
 
         # Geometry Options
-        "geometry_cutz": -2.4,
-        "geometry_vtipdia": 0.1,
-        "geometry_vtipangle": 30,
-        "geometry_multidepth": False,
-        "geometry_depthperpass": 0.8,
-        "geometry_travelz": 2,
-
-        "geometry_toolchange": False,
-        "geometry_toolchangez": 15.0,
-        "geometry_endz": 15.0,
-        "geometry_endxy": None,
-
-        "geometry_feedrate": 120,
-        "geometry_feedrate_z": 60,
-        "geometry_spindlespeed": 0,
-        "geometry_dwell": False,
-        "geometry_dwelltime": 1,
-        "geometry_ppname_g": 'default',
-
-        # Geometry Advanced Options
-        "geometry_toolchangexy": "0.0, 0.0",
-        "geometry_startz": None,
-        "geometry_feedrate_rapid": 1500,
-        "geometry_extracut": False,
-        "geometry_extracut_length": 0.1,
-        "geometry_z_pdepth": -0.02,
-        "geometry_f_plunge": False,
-        "geometry_spindledir": 'CW',
-        "geometry_feedrate_probe": 75,
         "geometry_segx": 0.0,
         "geometry_segy": 0.0,
-        "geometry_area_exclusion": False,
-        "geometry_area_shape": "polygon",
-        "geometry_area_strategy": "over",
-        "geometry_area_overz": 1.0,
-        "geometry_polish": False,
-        "geometry_polish_dia": 10.0,
-        "geometry_polish_pressure": -1.0,
-        "geometry_polish_travelz": 2.0,
-        "geometry_polish_margin": 0.0,
-        "geometry_polish_overlap": 5,
-        "geometry_polish_method": 0,
+
+        # Geometry Options
+        "tools_mill_tooldia": "2.4",
+        "tools_mill_cutz": -2.4,
+        "tools_mill_vtipdia": 0.1,
+        "tools_mill_vtipangle": 30,
+        "tools_mill_multidepth": False,
+        "tools_mill_depthperpass": 0.8,
+        "tools_mill_travelz": 2,
+
+        "tools_mill_toolchange": False,
+        "tools_mill_toolchangez": 15.0,
+        "tools_mill_endz": 15.0,
+        "tools_mill_endxy": None,
+
+        "tools_mill_feedrate": 120,
+        "tools_mill_feedrate_z": 60,
+        "tools_mill_spindlespeed": 0,
+        "tools_mill_dwell": False,
+        "tools_mill_dwelltime": 1,
+        "tools_mill_ppname_g": 'default',
+
+        # Geometry Advanced Options
+        "tools_mill_toolchangexy": "0.0, 0.0",
+        "tools_mill_startz": None,
+        "tools_mill_feedrate_rapid": 1500,
+        "tools_mill_extracut": False,
+        "tools_mill_extracut_length": 0.1,
+        "tools_mill_z_pdepth": -0.02,
+        "tools_mill_f_plunge": False,
+        "tools_mill_spindledir": 'CW',
+        "tools_mill_feedrate_probe": 75,
+
+        "tools_mill_area_exclusion": False,
+        "tools_mill_area_shape": "polygon",
+        "tools_mill_area_strategy": "over",
+        "tools_mill_area_overz": 1.0,
+        "tools_mill_polish": False,
+        "tools_mill_polish_margin": 0.0,
+        "tools_mill_polish_overlap": 5,
+        "tools_mill_polish_method": 0,
         "tools_mill_milling_type": 'both',
+        "tools_mill_optimization_type": 'R',
+        "tools_mill_search_time": 3,
 
         # Geometry Editor
         "geometry_editor_sel_limit": 30,