Small fixes in ApertureMacro and updated docs.

doc/source/app.rst

@@ -1,26 +1,16 @@
 FlatCAM Application
 ===================
 
-Options
-~~~~~~~
-
-There are **Application Defaults**, **Project Options** and **Object Options** in FlatCAM.
-
-**Application Defaults** are stored in ``app.defaults``. This gets populated (updated) from the ``defaults.json`` file upon startup. These can be edited from the Options tab, where each widget calls ``app.on_options_update()`` if a change is detected. This function iterates over the keys of ``app.defaults`` and reads the GUI elements whose name is ``type + "_app_" key``. Therefore, for an option to be recognized, it must be added to ``defaults.json`` in the first place. When saving, done in ``app.on_file_savedefaults()``, the file is updated, not overwritten.
-
-**Project Options** inherit all options from Application Defaults upon startup. They can be changed thereafter from the UI or by opening a project, which contain previously saved Project Options. These are store in ``app.options`` and can be written and read from the Options tab in the same way as with Application defaults.
-
-**Object Options** for each object are inherited from Project Options upon creation of each new object. They can be modified independently from the Project's options thereafter through the UI, where the widget containing the option is identified by name: ``type + kind + "_" + option``. They are stored in ``object.options``. They are saved along the Project options when saving the project.
-
-The syntax of UI widget names contain a ``type``, which identifies what *type of widget* it is and how its value is supposed to be fetched, and a ``kind``, which refer to what *kind of FlatCAM Object* it is for.
-
-API
-~~~
-
 .. automodule:: FlatCAM
 
+App
+~~~
+
 .. autoclass:: App
     :members:
 
+PlotCanvas
+~~~~~~~~~~
+
 .. autoclass:: PlotCanvas
     :members:

doc/source/camlib.rst

@@ -3,14 +3,32 @@ Camlib
 
 .. automodule:: camlib
 
+Geometry
+~~~~~~~~
+
 .. autoclass:: Geometry
     :members:
 
+Gerber
+~~~~~~
+
 .. autoclass:: Gerber(Geometry)
     :members:
 
-.. autoclass:: Excellon
+ApertureMacro
+~~~~~~~~~~~~~
+
+.. autoclass:: ApertureMacro
     :members:
 
-.. autoclass:: CNCjob
+Excellon
+~~~~~~~~
+
+.. autoclass:: Excellon(Geometry)
+    :members:
+
+CNCJob
+~~~~~~
+
+.. autoclass:: CNCjob(Geometry)
     :members:

doc/source/devman.rst

@@ -0,0 +1,15 @@
+FlatCAM Developer Manual
+========================
+
+Options
+~~~~~~~
+
+There are **Application Defaults**, **Project Options** and **Object Options** in FlatCAM.
+
+**Application Defaults** are stored in ``app.defaults``. This gets populated (updated) from the ``defaults.json`` file upon startup. These can be edited from the Options tab, where each widget calls ``app.on_options_update()`` if a change is detected. This function iterates over the keys of ``app.defaults`` and reads the GUI elements whose name is ``type + "_app_" key``. Therefore, for an option to be recognized, it must be added to ``defaults.json`` in the first place. When saving, done in ``app.on_file_savedefaults()``, the file is updated, not overwritten.
+
+**Project Options** inherit all options from Application Defaults upon startup. They can be changed thereafter from the UI or by opening a project, which contain previously saved Project Options. These are store in ``app.options`` and can be written and read from the Options tab in the same way as with Application defaults.
+
+**Object Options** for each object are inherited from Project Options upon creation of each new object. They can be modified independently from the Project's options thereafter through the UI, where the widget containing the option is identified by name: ``type + kind + "_" + option``. They are stored in ``object.options``. They are saved along the Project options when saving the project.
+
+The syntax of UI widget names contain a ``type``, which identifies what *type of widget* it is and how its value is supposed to be fetched, and a ``kind``, which refer to what *kind of FlatCAM Object* it is for.

doc/source/flatcamobj.rst

@@ -3,17 +3,32 @@ FlatCAM Objects
 
 .. automodule:: FlatCAM
 
+FlatCAMObj
+~~~~~~~~~~
+
 .. autoclass:: FlatCAMObj
     :members:
 
+FlatCAMGerber
+~~~~~~~~~~~~~
+
 .. autoclass:: FlatCAMGerber
     :members:
 
+FlatCAMExcellon
+~~~~~~~~~~~~~~~
+
 .. autoclass:: FlatCAMExcellon
     :members:
 
+FlatCAMCNCjob
+~~~~~~~~~~~~~
+
 .. autoclass:: FlatCAMCNCjob
     :members:
 
+FlatCAMGeometry
+~~~~~~~~~~~~~~~
+
 .. autoclass:: FlatCAMGeometry
     :members:

doc/source/index.rst

@@ -16,6 +16,7 @@ Contents:
    camlib
    flatcamobj
    app
+   devman