use only the local part of the hostname for the worker's id

fixed typos


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

src/pycam/Gui/Project.py

@@ -223,9 +223,12 @@ class ProjectGui:
                 ("HelpTaskSetup", self.show_help, "TaskSetup", None),
                 ("HelpGCodeExport", self.show_help, "GCodeExport", None),
                 ("HelpSimulation", self.show_help, "Simulation", None),
-                ("HelpCommandLine", self.show_help, "CommandLine", None),
+                ("HelpServerMode", self.show_help, "ServerMode", None),
+                # TODO: write a general wiki page about the commandline usage (not just examples)
+                ("HelpCommandLine", self.show_help, "CommandlineExamples", None),
                 ("HelpHotkeys", self.show_help, "KeyboardShortcuts", None),
-                ("ProjectWebsite", self.show_help, "http://sourceforge.net/projects/pycam", None),
+                ("ProjectWebsite", self.show_help, "http://pycam.sourceforge.net", None),
+                ("DevelopmentBlog", self.show_help, "http://fab.senselab.org/pycam", None),
                 ("Forum", self.show_help, "http://sourceforge.net/projects/pycam/forums", None),
                 ("BugTracker", self.show_help, "http://sourceforge.net/tracker/?group_id=237831&atid=1104176", None),
                 ("FeatureRequest", self.show_help, "http://sourceforge.net/tracker/?group_id=237831&atid=1104179", None)):

src/pycam/PathGenerators/EngraveCutter.py

@@ -44,7 +44,7 @@ class EngraveCutter:
             for model in self.models[1:]:
                 self.combined_model += model
         else:
-            self.combined_models = []
+            self.combined_model = []
         self.contour_model = contour_model
         self.pa_push = path_processor
         # We use a separated path processor for the last "drop" layer.

src/pycam/Toolpath/Generator.py

@@ -289,7 +289,7 @@ def generate_toolpath(model, tool_settings=None,
             dz = step_down
         else:
             dz = maxz - minz
-        toolpath = generator.GenerateToolPath(minz, maxz, stepping, dz,
+        toolpath = generator.GenerateToolPath(minz, maxz, step_width, dz,
                 callback)
     elif path_generator == "ContourFollow":
         if step_down > 0:

src/pycam/Utils/threading.py

@@ -221,7 +221,8 @@ def _spawn_daemon(manager, number_of_processes, worker_uuid_list):
     log.debug("Spawner daemon started with %d processes" % number_of_processes)
     log.debug("Registering %d worker threads: %s" \
             % (len(worker_uuid_list), worker_uuid_list))
-    hostname = platform.node()
+    # use only the hostname (for brevity) - no domain part
+    hostname = platform.node().split(".", 1)[0]
     try:
         while not __closing.get():
             if not tasks.empty():