some commandline interface improvements

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@599 bbaffbd6-741e-11dd-a85d-61de82d9cad9

debian/rules

@@ -18,7 +18,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+# clean the manpage
+clean:
+	make -C man clean
+
+# build the manpage
+build:
+	make -C man
+
 # install the .desktop file
-install/pycam::
+install:
 	cp -v desktop/pycam.desktop `pwd`/debian/pycam/usr/share/applications/
 

src/pycam/Gui/Project.py

@@ -233,7 +233,7 @@ class ProjectGui:
         self.log_model = self.gui.get_object("LogWindowList")
         # set defaults
         self.model = None
-        self.toolpath = pycam.Toolpath.ToolPathList()
+        self.toolpath = pycam.Toolpath.ToolpathList()
         self.cutter = None
         self.tool_list = []
         self.process_list = []

src/pycam/Gui/Settings.py

@@ -725,6 +725,9 @@ class ToolpathSettings:
                                 + "(%s -> %s): %s" % (section, key, value_raw))
                 config_dict[key] = value
 
+    def __str__(self):
+        return self.get_string()
+
     def get_string(self):
         result = []
         for config_dict, section in ((self.bounds, "Bounds"),

src/pycam/Toolpath/Generator.py

@@ -113,7 +113,7 @@ def generate_toolpath(model, tool_settings=None,
     @type calculation_backend: str | None
     @value calculation_backend: any member of the CALCULATION_BACKENDS set
         The default is the triangular collision detection.
-    @rtype: pycam.Toolpath.ToolPath | str
+    @rtype: pycam.Toolpath.Toolpath | str
     @return: the resulting toolpath object or an error string in case of invalid
         arguments
     """

src/pycam/Toolpath/__init__.py

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-__all__ = ["simplify_toolpath", "ToolPathList", "ToolPath", "Generator"]
+__all__ = ["simplify_toolpath", "ToolpathList", "Toolpath", "Generator"]
 
 from pycam.Geometry.Point import Point
 from pycam.Geometry.utils import number
@@ -58,13 +58,13 @@ def simplify_toolpath(path):
             index += 1
 
 
-class ToolPathList(list):
+class ToolpathList(list):
 
     def add_toolpath(self, toolpath, name, toolpath_settings):
-        self.append(ToolPath(toolpath, name, toolpath_settings))
+        self.append(Toolpath(toolpath, name, toolpath_settings))
 
 
-class ToolPath:
+class Toolpath(object):
 
     def __init__(self, toolpath, name, toolpath_settings):
         self.toolpath = toolpath