minor fixes

documentation updates


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

INSTALL.TXT

@@ -66,6 +66,7 @@ Afterwards you can remove the new package repository again.
 Users of Python 2.5 with multiple CPU cores may want to install the package
 "python-processing". This enables multi-threading for Python before v2.6.
 
+
 MacOS
 -----
 

Makefile

@@ -4,7 +4,7 @@
 # use something like "VERSION=0.2 make" to override the VERSION on the command line
 VERSION ?= $(shell sed -n "s/^.*[\t ]*VERSION[\t ]*=[\t ]*[\"']\([^\"']*\)[\"'].*/\1/gp" src/pycam/__init__.py)
 SVN_REPO_BASE ?= $(shell svn info --xml 2>/dev/null | grep "^<url>" | cut -f 2 -d ">" | cut -f 1 -d "<")
-SVK_REPO_BASE ?= $(shell LANG= svk info | grep "^Depot Path:" | cut -f 3- -d " ")
+SVK_REPO_BASE ?= $(shell LANG= svk info 2>/dev/null| grep "^Depot Path:" | cut -f 3- -d " ")
 REPO_TAGS ?= https://pycam.svn.sourceforge.net/svnroot/pycam/tags
 RELEASE_PREFIX ?= pycam-
 ARCHIVE_DIR_RELATIVE ?= release-archives
@@ -40,7 +40,7 @@ svn_export: clean
 	fi
 
 create_archive_dir:
-	mkdir -p "$(ARCHIVE_DIR)"
+	@mkdir -p "$(ARCHIVE_DIR)"
 
 zip: create_archive_dir man svn_export
 	cd "$(EXPORT_DIR)"; $(PYTHON_EXE) setup.py sdist --format zip --dist-dir "$(ARCHIVE_DIR)"

README.TXT

@@ -3,36 +3,8 @@ pycam : Python CAM
 
 Toolpath Generation for 3-Axis CNC machining
 
-
-Features:
-
-    * Cutters:
-      ** Spherical Cutter
-      ** Cylindrical Cutter
-      ** Toroidal Cutter
-
-    * Path Generators:
-      ** DropCutter
-      ** PushCutter
-
-    * Path Processors:
-      ** Linear
-      ** ZigZag
-      ** Polygon
-      ** Contour        (aka. waterline)
-
-    * Importers:
-      ** STL
-      ** DXF (only lines)
-      ** SVG (paths for engravings)
-
-    * Exporters:
-      ** STL
-      ** GCODE
-      ** EMC2 tool defintion (tbl)
-
-    * Visualization:
-      ** OpenGL
+Read the wiki for details:
+    http://sourceforge.net/apps/mediawiki/pycam/index.php?title=User_Manual
 
 
 RUNNING:
@@ -62,27 +34,11 @@ USAGE:
       and the ZigZag PostProcessor in "x" or "y" mode
 
 
-TODO / OPEN ISSUES:
-    see http://sourceforge.net/apps/mediawiki/pycam/index.php?title=TODO
-
-
-FEATURE REQUESTS:
-
-    * climbing / conventional cutting paths
-
-    * diagonal paths
-
-    * start at arbitrary corner
 
 
 KNOWN BUGS:
 
-    * The ODE collision detection sometimes fails at the corners of a
-      model.
-      http://sourceforge.net/tracker/?func=detail&aid=2973876&group_id=24884&atid=382799
-
-    * Bugs in the sourceforge bug tracker:
-      http://sourceforge.net/tracker/?group_id=237831&atid=1104176
+    http://sourceforge.net/tracker/?group_id=237831&atid=1104176
 
 
 CONTRIBUTORS:
@@ -90,7 +46,9 @@ CONTRIBUTORS:
     * Lode Leroy: initiated the project; developed the toolpath generation,
       collision detection, geometry, Tk interface, ...
 
-    * Lars Kruse: developed the GTK interface; added ODE support
+    * Lars Kruse: GTK interface and many features
+
+    * Paul: GCode stepping precision
 
     * Arthur Magill: distutils packaging
 

pycam_win32_postinstall.py

@@ -54,14 +54,12 @@ PYTHON_DOC_DIR = os.path.join(SHARE_DIR, "doc")
 ICON_FILE = os.path.join(SHARE_DIR, "pycam.ico")
 
 # add some more doc files
-DOC_FILES = [
-        ("LICENSE.TXT", "License"),
-        ("README.TXT", "Readme")]
+DOC_FILES = [("LICENSE.TXT", "License"),]
 WEB_LINKS = [
         (r"http://sourceforge.net/projects/pycam/", "Project's Website"),
         (r"http://sourceforge.net/tracker/?group_id=237831&atid=1104176", "Report a Bug"),
         (r"http://sourceforge.net/projects/pycam/forums", "Forum Discussions"),
-        (r"http://sourceforge.net/apps/mediawiki/pycam/", "Wiki Documentation")]
+        (r"http://sourceforge.net/apps/mediawiki/pycam/index.php?title=User_Manual", "User Manual")]
 
 MENU_ITEMS = map(lambda v: (os.path.join(PYTHON_DOC_DIR, v[0]), v[1]), DOC_FILES)
 MENU_ITEMS.extend(WEB_LINKS)

setup.cfg

@@ -7,7 +7,6 @@ packager = Lars Kruse <devel@sumpfralle.de>
 doc_files = Changelog
     README.TXT
     INSTALL.TXT
-    technical_details.txt
     LICENSE.TXT
     COPYING.TXT
     doc/

setup.py

@@ -31,13 +31,14 @@ import sys
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 from pycam import VERSION
 
+
 setup(
     name="pycam",
     version=VERSION,
     license="GPL v3",
     description="Open Source CAM - Toolpath Generation for 3-Axis CNC machining",
-    author="Lode Leroy",
-    #author_email="",
+    author="Lars Kruse",
+    author_email="devel@sumpfralle.de",
     provides=["pycam"],
     requires=["ode", "gtk", "gtk.gtkgl", "OpenGL"],
     url="http://sourceforge.net/projects/pycam",
@@ -52,45 +53,42 @@ Basically you will need Python, GTK and OpenGL.
     classifiers=[
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
-        "Development Status :: 3 - Alpha",
+        "Development Status :: Development Status :: 4 - Beta",
         "License :: OSI Approved :: GNU General Public License (GPL)",
         "Topic :: Scientific/Engineering",
         "Environment :: Win32 (MS Windows)",
-        "Environment :: X11 Applications",
+        "Environment :: X11 Applications :: GTK",
         "Intended Audience :: Manufacturing",
         "Operating System :: Microsoft :: Windows",
+        "Operating System :: MacOS :: MacOS X",
         "Operating System :: POSIX",
     ],
     package_dir={'': 'src'},
     packages=[
         "pycam",
         "pycam.Cutters",
-        "pycam.Geometry",
-        "pycam.Importers",
-        "pycam.PathProcessors",
-        "pycam.Utils",
         "pycam.Exporters",
+        "pycam.Geometry",
         "pycam.Gui",
+        "pycam.Importers",
         "pycam.PathGenerators",
+        "pycam.PathProcessors",
+        "pycam.Physics",
         "pycam.Simulation",
         "pycam.Toolpath",
-        "pycam.Physics",
+        "pycam.Utils",
     ],
     scripts = ['pycam', 'pycam_win32_postinstall.py'],
     data_files=[("share/pycam/doc", [
             "COPYING.TXT",
-            "technical_details.txt",
             "INSTALL.TXT",
             "LICENSE.TXT",
             "README.TXT",
             "Changelog",
             "release_info.txt"]),
-        ("share/pycam/ui", [
-            os.path.join("share", "ui", "pycam-project.ui"),
-            os.path.join("share", "ui", "menubar.xml"),
-            os.path.join("share", "ui", "logo_gui.png"),
-            ]),
-        ("share/pycam", [os.path.join("share", "pycam.ico")]),
+        ("share/pycam/ui", glob.glob(os.path.join("share", "ui", "*"))),
+        ("share/pycam/fonts", glob.glob(os.path.join("share", "fonts", "*"))),
+        ("share/pycam", [os.path.join("share", "pycam.ico"), os.path.join("share", "misc", "DXF.gpl")]),
         ("share/pycam/samples", glob.glob(os.path.join("samples", "*"))),
     ],
 )

share/ui/pycam-project.ui

@@ -1082,12 +1082,12 @@ caused by careless DXF/SVG exporting programs.</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -8483,7 +8483,6 @@ Please read the description of the Server Mode (linked below) to understand the
   </object>
   <object class="GtkAction" id="HelpServerMode">
     <property name="label">Server Mode</property>
-    <property name="stock_id">gtk-help</property>
   </object>
   <object class="GtkDialog" id="FontDialog">
     <property name="border_width">5</property>

src/pycam/Gui/Project.py

@@ -1099,8 +1099,8 @@ class ProjectGui:
             recent_files_menu.set_local_only(False)
             # most recent files to the top
             recent_files_menu.set_sort_type(gtk.RECENT_SORT_MRU)
-            # show only five files
-            recent_files_menu.set_limit(5)
+            # show only ten files
+            recent_files_menu.set_limit(10)
             uimanager.get_widget("/MenuBar/FileMenu/OpenRecentModelMenu").set_submenu(recent_files_menu)
             recent_files_menu.connect("item-activated",
                     self.load_recent_model_file)
@@ -3510,6 +3510,7 @@ class ProjectGui:
                     self.toolpath)
             if not index is None:
                 self.crop_toolpath(self.toolpath[index])
+                self.update_toolpath_table()
         elif action == "grid":
             index = self._treeview_get_active_index(self.toolpath_table,
                     self.toolpath)

src/pycam/__init__.py

@@ -23,5 +23,5 @@ along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 __all__ = ["Cutters", "Exporters", "Geometry", "Gui", "Importers",
         "PathGenerators", "PathProcessors", "Utils"]
 
-VERSION = "0.4.1-svn"
+VERSION = "0.5"