added commandline options for disabling ODE

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

Changelog

@@ -2,6 +2,7 @@ Version 0.2.2 - UNRELEASED
  * fixed broken commandline parameter "--template"
  * added workaround for ODE collision detection, that is broken under specific circumstances
  * fixed "division by zero" error in non-ODE mode
+ * allow to disable ODE via commandline option
 
 Version 0.2.1 - 2010-03-09
  * fixed code that depended on GTK 2.16 (instead of 2.12)

pycam.py

 #!/usr/bin/python
 
+from pycam.Gui.common import override_ode_availability
 from optparse import OptionParser
 import sys
 
@@ -24,6 +25,8 @@ if __name__ == "__main__":
     parser.add_option("", "--template", dest="config_template",
             default=None, action="store", type="string",
             help="enable a specific processing settings template - e.g. 'Rough', 'Semi-finish' or 'Finish' (requires the GTK interface)")
+    parser.add_option("", "--disable-ode", dest="ode_disabled",
+            default=False, action="store_true", help="disable experimental ODE collision detection")
     (options, args) = parser.parse_args()
 
     if len(args) > 0:
@@ -64,7 +67,10 @@ if __name__ == "__main__":
     if gui_class is None:
         print >> sys.stderr, "Neither the GTK nor the Tk interface is available. Please install the corresponding packages!"
         sys.exit(1)
-    else:
+
+    if options.ode_disabled:
+        override_ode_availability(False)
+
     if outputfile:
         gui = gui_class(no_dialog=True)
     else:

pycam/Gui/common.py

@@ -19,6 +19,9 @@ MODEL_TRANSFORMATIONS = {
     "y_swap_z": ((1, 0, 0, 0), (0, 0, 1, 0), (0, 1, 0, 0)),
 }
 
+_ode_override_state = None
+
+
 def keep_gl_mode(func):
     def wrapper(*args, **kwargs):
         prev_mode = GL.glGetIntegerv(GL.GL_MATRIX_MODE)
@@ -198,12 +201,20 @@ def generate_physics(settings, cutter, physics=None):
     return physics
 
 def is_ode_available():
+    global _ode_override_state
+    if not _ode_override_state is None:
+        return _ode_override_state
+    else:
         try:
             import ode
             return True
         except ImportError:
             return False
 
+def override_ode_availability(state):
+    global _ode_override_state
+    _ode_override_state = state
+
 
 class ToolPathList(list):