diff options
| author | Thomas Fitzsimmons <fitzsim@fitzsim.org> | 2009-11-18 01:40:51 -0800 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2010-12-16 00:17:44 -0600 |
| commit | cbb568d9a0189a6e3f5597d4ad4d74c78c4df08f (patch) | |
| tree | a2a40e2b89a70ca9aebddb5e007ec499eaac7f45 | |
| parent | fa7295366f36bfa5a310111f308de08ddb475314 (diff) | |
| download | nanoengineer-theirix-cbb568d9a0189a6e3f5597d4ad4d74c78c4df08f.tar.gz nanoengineer-theirix-cbb568d9a0189a6e3f5597d4ad4d74c78c4df08f.zip | |
Applying contributed patches (see below)
src/commands/Plot/PlotTool.py - changed gnuplot path
src/ne1_ui/prefs/Preferences.py - mdrun/mcpp changes
cad/src/operations/ops_files.py - changed babel path
cad/src/utilities/prefs_constants.py - enabled gromacs
| -rwxr-xr-x | cad/src/commands/Plot/PlotTool.py | 2 | ||||
| -rw-r--r-- | cad/src/ne1_ui/prefs/Preferences.py | 4 | ||||
| -rwxr-xr-x | cad/src/operations/ops_files.py | 2 | ||||
| -rwxr-xr-x | cad/src/utilities/prefs_constants.py | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cad/src/commands/Plot/PlotTool.py b/cad/src/commands/Plot/PlotTool.py index 610534743..23ff40e45 100755 --- a/cad/src/commands/Plot/PlotTool.py +++ b/cad/src/commands/Plot/PlotTool.py @@ -262,7 +262,7 @@ class PlotTool(QWidget, Ui_PlotToolDialog): if sys.platform == 'win32': program = os.path.normpath(filePath + '/../bin/wgnuplot.exe') else: - program = os.path.normpath(filePath + '/../bin/gnuplot') + program = os.path.normpath('/usr/bin/gnuplot') # Set environment variables to make gnuplot use a specific AquaTerm on # Mac. Originally "Huaicai 3/18", fixed by Brian Helfrich May 23, 2007. diff --git a/cad/src/ne1_ui/prefs/Preferences.py b/cad/src/ne1_ui/prefs/Preferences.py index be65e4f37..9d7955620 100644 --- a/cad/src/ne1_ui/prefs/Preferences.py +++ b/cad/src/ne1_ui/prefs/Preferences.py @@ -2912,7 +2912,7 @@ class Preferences(QDialog, Ui_PreferencesDialog): env.prefs[gromacs_path_prefs_key] = get_default_plugin_path( \ "C:\\GROMACS_3.3.3\\bin\\mdrun.exe", \ "/Applications/GROMACS_3.3.3/bin/mdrun", - "/usr/local/GROMCAS_3.3.3/bin/mdrun") + "/usr/bin/g_mdrun") self.gromacs_path_lineedit.setText(env.prefs[gromacs_path_prefs_key]) @@ -2965,7 +2965,7 @@ class Preferences(QDialog, Ui_PreferencesDialog): env.prefs[cpp_path_prefs_key] = get_default_plugin_path( \ "C:\\GROMACS_3.3.3\\MCPP\\bin\\mcpp.exe", \ "/Applications/GROMACS_3.3.3/mcpp/bin/mcpp", \ - "/usr/local/GROMACS_3.3.3/mcpp/bin/mcpp") + "/usr/bin/cpp") self.cpp_path_lineedit.setText(env.prefs[cpp_path_prefs_key]) diff --git a/cad/src/operations/ops_files.py b/cad/src/operations/ops_files.py index 83a5a8cd0..009b75586 100755 --- a/cad/src/operations/ops_files.py +++ b/cad/src/operations/ops_files.py @@ -674,7 +674,7 @@ class fileSlotsMixin: #bruce 050907 moved these methods out of class MWsemantics if sys.platform == 'win32': program = os.path.normpath(filePath + '/../bin/babel.exe') else: - program = os.path.normpath(filePath + '/../bin/babel') + program = os.path.normpath('/usr/bin/babel') if not os.path.exists(program): print "Babel program not found here: ", program diff --git a/cad/src/utilities/prefs_constants.py b/cad/src/utilities/prefs_constants.py index 2450c1576..5ce82456e 100755 --- a/cad/src/utilities/prefs_constants.py +++ b/cad/src/utilities/prefs_constants.py @@ -1004,7 +1004,7 @@ prefs_table = ( ('gamess_exe_path', 'string', gmspath_prefs_key, "" ), ('gamess_enabled', 'boolean', gamess_enabled_prefs_key, False ), ('gromacs_exe_path', 'string', gromacs_path_prefs_key, "" ), - ('gromacs_enabled', 'boolean', gromacs_enabled_prefs_key, False ), + ('gromacs_enabled', 'boolean', gromacs_enabled_prefs_key, True ), #Urmi 20080709: since this is not in the pref dialog as yet, we'll hard code # for testing purposes ('rosetta_exe_path', 'string', rosetta_path_prefs_key, "" ), @@ -1013,7 +1013,7 @@ prefs_table = ( ('rosetta_database_enabled', 'boolean', rosetta_database_enabled_prefs_key, False ), ('rosetta_backrub_enabled', 'boolean', rosetta_backrub_enabled_prefs_key, False ), ('cpp_exe_path', 'string', cpp_path_prefs_key, "" ), - ('cpp_enabled', 'boolean', cpp_enabled_prefs_key, False ), + ('cpp_enabled', 'boolean', cpp_enabled_prefs_key, True ), ('nv1_exe_path', 'string', nv1_path_prefs_key, "" ), ('nv1_enabled', 'boolean', nv1_enabled_prefs_key, False ), |