CAM: move DetachedDocumentObject into a dedicated module for better reuse

src/Mod/CAM/CAMTests/TestPathToolBitPropertyEditorWidget.py

@@ -32,7 +32,7 @@ from Path.Tool.ui.property import (
     EnumPropertyEditorWidget,
     LabelPropertyEditorWidget,
 )
-from Path.Tool.toolbit.docobject import DetachedDocumentObject
+from Path.Tool.docobject import DetachedDocumentObject
 
 
 class TestPropertyEditorFactory(unittest.TestCase):

src/Mod/CAM/CAMTests/TestPathToolDocumentObjectEditorWidget.py

@@ -34,8 +34,8 @@ from Path.Tool.ui.property import (
     EnumPropertyEditorWidget,
     LabelPropertyEditorWidget,
 )
+from Path.Tool.docobject import DetachedDocumentObject
 from Path.Tool.ui.docobject import DocumentObjectEditorWidget, _get_label_text
-from Path.Tool.toolbit.docobject import DetachedDocumentObject
 
 
 class TestDocumentObjectEditorWidget(unittest.TestCase):

src/Mod/CAM/CMakeLists.txt

@@ -142,20 +142,28 @@ SET(PathPythonToolsAssetsUi_SRCS
     Path/Tool/assets/ui/util.py
 )
 
+SET(PathPythonToolsDocObject_SRCS
+    Path/Tool/docobject/__init__.py
+)
+
+SET(PathPythonToolsDocObjectModels_SRCS
+    Path/Tool/docobject/models/__init__.py
+    Path/Tool/docobject/models/docobject.py
+)
+
+SET(PathPythonToolsDocObjectUi_SRCS
+    Path/Tool/docobject/ui/__init__.py
+    Path/Tool/docobject/ui/docobject.py
+    Path/Tool/docobject/ui/property.py
+)
+
 SET(PathPythonToolsGui_SRCS
     Path/Tool/Gui/__init__.py
     Path/Tool/Gui/Controller.py
 )
 
-SET(PathPythonToolsUi_SRCS
-    Path/Tool/ui/__init__.py
-    Path/Tool/ui/docobject.py
-    Path/Tool/ui/property.py
-)
-
 SET(PathPythonToolsToolBit_SRCS
     Path/Tool/toolbit/__init__.py
-    Path/Tool/toolbit/docobject.py
     Path/Tool/toolbit/util.py
 )
 
@@ -598,8 +606,10 @@ SET(all_files
     ${PathPythonToolsAssets_SRCS}
     ${PathPythonToolsAssetsStore_SRCS}
     ${PathPythonToolsAssetsUi_SRCS}
+    ${PathPythonToolsDocObject_SRCS}
+    ${PathPythonToolsDocObjectModels_SRCS}
+    ${PathPythonToolsDocObjectUi_SRCS}
     ${PathPythonToolsGui_SRCS}
-    ${PathPythonToolsUi_SRCS}
     ${PathPythonToolsShape_SRCS}
     ${PathPythonToolsShapeModels_SRCS}
     ${PathPythonToolsShapeUi_SRCS}
@@ -772,9 +782,23 @@ INSTALL(
 
 INSTALL(
     FILES
-        ${PathPythonToolsUi_SRCS}
+        ${PathPythonToolsDocObject_SRCS}
     DESTINATION
-        Mod/CAM/Path/Tool/ui
+        Mod/CAM/Path/Tool/docobject
+)
+
+INSTALL(
+    FILES
+        ${PathPythonToolsDocObjectModels_SRCS}
+    DESTINATION
+        Mod/CAM/Path/Tool/docobject/models
+)
+
+INSTALL(
+    FILES
+        ${PathPythonToolsDocObjectUi_SRCS}
+    DESTINATION
+        Mod/CAM/Path/Tool/docobject/ui
 )
 
 INSTALL(

src/Mod/CAM/Path/Tool/docobject/__init__.py

@@ -0,0 +1,3 @@
+from .models.docobject import DetachedDocumentObject
+
+__all__ = ["DetachedDocumentObject"]

src/Mod/CAM/Path/Tool/docobject/ui/__init__.py

@@ -0,0 +1,3 @@
+from .docobject import DocumentObjectEditorWidget
+
+__all__ = ["DocumentObjectEditorWidget"]

src/Mod/CAM/Path/Tool/toolbit/models/base.py

@@ -33,10 +33,10 @@ from lazy_loader.lazy_loader import LazyLoader
 from typing import Any, List, Optional, Tuple, Type, Union, Mapping, cast
 from PySide.QtCore import QT_TRANSLATE_NOOP
 from Path.Base.Generator import toolchange
-from ...assets import Asset
+from ...docobject import DetachedDocumentObject
+from ...assets.asset import Asset
 from ...camassets import cam_assets
 from ...shape import ToolBitShape, ToolBitShapeCustom, ToolBitShapeIcon
-from ..docobject import DetachedDocumentObject
 from ..util import to_json, format_value
 
 

src/Mod/CAM/Path/Tool/toolbit/ui/editor.py

@@ -22,13 +22,12 @@
 
 """Widget for editing a ToolBit object."""
 
-from functools import partial
 import FreeCAD
 import FreeCADGui
 from PySide import QtGui, QtCore
-from ..models.base import ToolBit
 from ...shape.ui.shapewidget import ShapeWidget
-from ...ui.docobject import DocumentObjectEditorWidget
+from ...docobject.ui import DocumentObjectEditorWidget
+from ..models.base import ToolBit
 
 
 class ToolBitPropertiesWidget(QtGui.QWidget):