Commit 6f6bdeac authored by sumpfralle's avatar sumpfralle

forgot to commit the change in the startup script in the previous changeset...

forgot to commit the change in the startup script in the previous changeset (fixes a weird namespace issue)
updated the Changelog


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@730 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent 85c63cb1
Version 0.3.1 - UNRELEASED Version 0.3.1 - UNRELEASED
* added automatic support grid positioning for contour models * use multiple threads for some toolpath strategies
* added an improved contour toolpath strategy (ContourFollow) * added an improved contour toolpath strategy (ContourFollow)
* see http://fab.senselab.org/node/43 * see http://fab.senselab.org/node/43
* added options for conventional/climb milling * added options for conventional/climb milling
* added automatic support grid positioning for contour models
* allow to reverse the direction of a 2D contour model * allow to reverse the direction of a 2D contour model
* added optional "orthogonal" view (instead of perspective) * beautification of the process name (via python-setproctitle)
* added a "recent files" item to the file menu * Usability:
* added the transparency (alpha) component to all configurable colors * added optional "orthogonal" view (instead of perspective)
* added a "recent files" item to the file menu
* added the transparency (alpha) component to all configurable colors
* pre-select output filenames of "Save as" dialogs based on the name of the model file
Version 0.3.0 - 2010-08-16 Version 0.3.0 - 2010-08-16
* added support for importing contour paths from SVG files (requires Inkscape and pstoedit) * added support for importing contour paths from SVG files (requires Inkscape and pstoedit)
......
...@@ -22,10 +22,11 @@ You should have received a copy of the GNU General Public License ...@@ -22,10 +22,11 @@ You should have received a copy of the GNU General Public License
along with PyCAM. If not, see <http://www.gnu.org/licenses/>. along with PyCAM. If not, see <http://www.gnu.org/licenses/>.
""" """
from optparse import OptionParser # extend the PYTHONPATH to include the "src" directory
import sys import sys
import os import os
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
from pycam.Physics.ode_physics import override_ode_availability from pycam.Physics.ode_physics import override_ode_availability
import pycam.Gui.common as GuiCommon import pycam.Gui.common as GuiCommon
import pycam.Gui.Settings import pycam.Gui.Settings
...@@ -37,6 +38,9 @@ import pycam.Toolpath.Generator ...@@ -37,6 +38,9 @@ import pycam.Toolpath.Generator
from pycam.Toolpath import Bounds, Toolpath from pycam.Toolpath import Bounds, Toolpath
from pycam import VERSION from pycam import VERSION
import pycam.Utils.log import pycam.Utils.log
from optparse import OptionParser
# setproctitle is (optionally) imported later
#import setproctitle
import logging import logging
import time import time
...@@ -132,7 +136,7 @@ def get_output_handler(destination): ...@@ -132,7 +136,7 @@ def get_output_handler(destination):
closer = handler.close closer = handler.close
return (handler, closer) return (handler, closer)
def execute(opts, args): def execute(opts, args, pycam):
# try to change the process name # try to change the process name
try: try:
import setproctitle import setproctitle
...@@ -569,7 +573,9 @@ if __name__ == "__main__": ...@@ -569,7 +573,9 @@ if __name__ == "__main__":
if opts.profile_destination: if opts.profile_destination:
import cProfile import cProfile
cProfile.run('execute(opts, args)', opts.profile_destination) cProfile.run('execute(opts, args, pycam)', opts.profile_destination)
else: else:
execute(opts, args) # We need to add the parameter "pycam" to avoid weeeeird namespace
# issues. Any idea how to fix this?
execute(opts, args, pycam)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment