summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Sims <mark@nanorex.com>2008-12-12 19:39:44 +0000
committerMark Sims <mark@nanorex.com>2008-12-12 19:39:44 +0000
commit197def2819390c12a7e1c1c53bd6fbbca53449af (patch)
tree9cee2ad6566c35a00cb147634aab07bc485d766c
parent01f0bf7d883316ad35341972bb5963dbe73b0498 (diff)
downloadnanoengineer-197def2819390c12a7e1c1c53bd6fbbca53449af.tar.gz
nanoengineer-197def2819390c12a7e1c1c53bd6fbbca53449af.zip
Removed the debug pref "Enable model and simulate protein flyout?". This flyout is now the default.
Diffstat
-rwxr-xr-xcad/src/ne1_ui/MWsemantics.py12
-rw-r--r--cad/src/protein/commands/CompareProteins/CompareProteins_Command.py11
-rw-r--r--cad/src/protein/commands/EditResidues/EditResidues_Command.py11
-rw-r--r--cad/src/protein/commands/EditResidues/EditResidues_PropertyManager.py7
-rw-r--r--cad/src/protein/commands/EditRotamers/EditRotamers_Command.py12
-rw-r--r--cad/src/protein/commands/EditRotamers/EditRotamers_PropertyManager.py14
-rw-r--r--cad/src/protein/commands/FixedBBProteinSim/FixedBBProteinSim_Command.py7
-rw-r--r--cad/src/protein/commands/InsertPeptide/InsertPeptide_EditCommand.py12
-rw-r--r--cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py7
-rw-r--r--cad/src/protein/model/Protein.py8
-rw-r--r--cad/src/simulation/ROSETTA/runRosetta.py7
-rw-r--r--cad/src/utilities/GlobalPreferences.py6
12 files changed, 21 insertions, 93 deletions
diff --git a/cad/src/ne1_ui/MWsemantics.py b/cad/src/ne1_ui/MWsemantics.py
index e2f006ca1..590e0b831 100755
--- a/cad/src/ne1_ui/MWsemantics.py
+++ b/cad/src/ne1_ui/MWsemantics.py
@@ -1622,19 +1622,9 @@ class MWsemantics(QMainWindow,
Activates the Protein toolbar.
"""
commandSequencer = self.commandSequencer
- from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
- if MODEL_AND_SIMULATE_PROTEINS:
- commandSequencer.userEnterCommand('MODEL_AND_SIMULATE_PROTEIN')
- #assert commandSequencer.currentCommand.commandName == 'MODEL_AND_SIMULATE_PROTEIN'
- #commandSequencer.currentCommand.runCommand()
- else:
- commandSequencer.userEnterCommand('BUILD_PROTEIN')
- assert commandSequencer.currentCommand.commandName == 'BUILD_PROTEIN'
- commandSequencer.currentCommand.runCommand()
+ commandSequencer.userEnterCommand('MODEL_AND_SIMULATE_PROTEIN')
return
-
-
def insertPeptide(self, isChecked = False):
"""
Invokes the peptide command (INSERT_PEPTIDE)
diff --git a/cad/src/protein/commands/CompareProteins/CompareProteins_Command.py b/cad/src/protein/commands/CompareProteins/CompareProteins_Command.py
index b23b511b3..fbfd4f70e 100644
--- a/cad/src/protein/commands/CompareProteins/CompareProteins_Command.py
+++ b/cad/src/protein/commands/CompareProteins/CompareProteins_Command.py
@@ -10,7 +10,6 @@ from commands.SelectChunks.SelectChunks_GraphicsMode import SelectChunks_Graphic
from command_support.EditCommand import EditCommand
from utilities.constants import red
from protein.commands.CompareProteins.CompareProteins_PropertyManager import CompareProteins_PropertyManager
-from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
# == GraphicsMode part
_superclass_for_GM = SelectChunks_GraphicsMode
@@ -37,10 +36,7 @@ class CompareProteins_Command(EditCommand):
featurename = "Compare Proteins"
from utilities.constants import CL_SUBCOMMAND
command_level = CL_SUBCOMMAND
- command_parent = 'BUILD_PROTEIN'
-
- if MODEL_AND_SIMULATE_PROTEINS:
- command_parent = 'MODEL_AND_SIMULATE_PROTEIN'
+ command_parent = 'MODEL_AND_SIMULATE_PROTEIN'
command_should_resume_prevMode = True
command_has_its_own_PM = True
@@ -53,10 +49,7 @@ class CompareProteins_Command(EditCommand):
@see: self.command_update_flyout()
"""
flyoutActionToCheck = 'compareProteinsAction'
- if MODEL_AND_SIMULATE_PROTEINS:
- parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
- else:
- parentCommandName = None
+ parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
return flyoutActionToCheck, parentCommandName
diff --git a/cad/src/protein/commands/EditResidues/EditResidues_Command.py b/cad/src/protein/commands/EditResidues/EditResidues_Command.py
index 0a0e38045..fb285c9e4 100644
--- a/cad/src/protein/commands/EditResidues/EditResidues_Command.py
+++ b/cad/src/protein/commands/EditResidues/EditResidues_Command.py
@@ -10,7 +10,6 @@ from commands.SelectChunks.SelectChunks_GraphicsMode import SelectChunks_Graphic
from command_support.EditCommand import EditCommand
from utilities.constants import red
from protein.commands.EditResidues.EditResidues_PropertyManager import EditResidues_PropertyManager
-from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
# == GraphicsMode part
_superclass_for_GM = SelectChunks_GraphicsMode
@@ -37,9 +36,7 @@ class EditResidues_Command(EditCommand):
featurename = "Edit Residues"
from utilities.constants import CL_SUBCOMMAND
command_level = CL_SUBCOMMAND
- command_parent = 'BUILD_PROTEIN'
- if MODEL_AND_SIMULATE_PROTEINS:
- command_parent = 'MODEL_AND_SIMULATE_PROTEIN'
+ command_parent = 'MODEL_AND_SIMULATE_PROTEIN'
command_should_resume_prevMode = True
command_has_its_own_PM = True
@@ -52,11 +49,7 @@ class EditResidues_Command(EditCommand):
@see: self.command_update_flyout()
"""
flyoutActionToCheck = 'editResiduesAction'
- if MODEL_AND_SIMULATE_PROTEINS:
- parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
- else:
- parentCommandName = None
-
+ parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
return flyoutActionToCheck, parentCommandName
diff --git a/cad/src/protein/commands/EditResidues/EditResidues_PropertyManager.py b/cad/src/protein/commands/EditResidues/EditResidues_PropertyManager.py
index c25dd2b2d..ab2770c12 100644
--- a/cad/src/protein/commands/EditResidues/EditResidues_PropertyManager.py
+++ b/cad/src/protein/commands/EditResidues/EditResidues_PropertyManager.py
@@ -207,11 +207,8 @@ class EditResidues_PropertyManager(Command_PropertyManager):
#"current protein" in this mode.
self.current_protein = ""
- from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
- if MODEL_AND_SIMULATE_PROTEINS:
- previousCommand = self.command.find_parent_command_named('MODEL_AND_SIMULATE_PROTEIN')
- else:
- previousCommand = self.command.find_parent_command_named('BUILD_PROTEIN')
+ previousCommand = self.command.find_parent_command_named('MODEL_AND_SIMULATE_PROTEIN')
+
if previousCommand:
#Urmi 20080728: get the protein currently selected in the combo box
self.current_protein = previousCommand.propMgr.get_current_protein_chunk_name()
diff --git a/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py b/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py
index 1cb06b40b..c455e6fde 100644
--- a/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py
+++ b/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py
@@ -10,7 +10,6 @@ from commands.SelectChunks.SelectChunks_GraphicsMode import SelectChunks_Graphic
from command_support.EditCommand import EditCommand
from utilities.constants import red
from protein.commands.EditRotamers.EditRotamers_PropertyManager import EditRotamers_PropertyManager
-from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
# == GraphicsMode part
_superclass_for_GM = SelectChunks_GraphicsMode
@@ -37,10 +36,7 @@ class EditRotamers_Command(EditCommand):
featurename = "Edit Rotamers"
from utilities.constants import CL_SUBCOMMAND
command_level = CL_SUBCOMMAND
- command_parent = 'BUILD_PROTEIN'
-
- if MODEL_AND_SIMULATE_PROTEINS:
- command_parent = 'MODEL_AND_SIMULATE_PROTEIN'
+ command_parent = 'MODEL_AND_SIMULATE_PROTEIN'
command_should_resume_prevMode = True
command_has_its_own_PM = True
@@ -53,10 +49,8 @@ class EditRotamers_Command(EditCommand):
@see: self.command_update_flyout()
"""
flyoutActionToCheck = 'editRotamersAction'
- if MODEL_AND_SIMULATE_PROTEINS:
- parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
- else:
- parentCommandName = None
+ parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
+
return flyoutActionToCheck, parentCommandName
def keep_empty_group(self, group):
diff --git a/cad/src/protein/commands/EditRotamers/EditRotamers_PropertyManager.py b/cad/src/protein/commands/EditRotamers/EditRotamers_PropertyManager.py
index c33859385..a4a197113 100644
--- a/cad/src/protein/commands/EditRotamers/EditRotamers_PropertyManager.py
+++ b/cad/src/protein/commands/EditRotamers/EditRotamers_PropertyManager.py
@@ -137,11 +137,8 @@ class EditRotamers_PropertyManager(Command_PropertyManager):
#Urmi 20080728: Update the residue combo box with amino acids for the
#currently selected protein in build protein mode
self.current_protein = ""
- from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
- if MODEL_AND_SIMULATE_PROTEINS:
- previousCommand = self.command.find_parent_command_named('MODEL_AND_SIMULATE_PROTEIN')
- else:
- previousCommand = self.command.find_parent_command_named('BUILD_PROTEIN')
+ previousCommand = self.command.find_parent_command_named('MODEL_AND_SIMULATE_PROTEIN')
+
if previousCommand:
self.current_protein = previousCommand.propMgr.get_current_protein_chunk_name()
else:
@@ -218,11 +215,8 @@ class EditRotamers_PropertyManager(Command_PropertyManager):
self.current_protein = ""
#Urmi 20080728: fill up the combo box with amino acids belonging to the
# current protein in build protein mode
- from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
- if MODEL_AND_SIMULATE_PROTEINS:
- previousCommand = self.command.find_parent_command_named('MODEL_AND_SIMULATE_PROTEIN')
- else:
- previousCommand = self.command.find_parent_command_named('BUILD_PROTEIN')
+ previousCommand = self.command.find_parent_command_named('MODEL_AND_SIMULATE_PROTEIN')
+
if previousCommand:
self.current_protein = previousCommand.propMgr.get_current_protein_chunk_name()
else:
diff --git a/cad/src/protein/commands/FixedBBProteinSim/FixedBBProteinSim_Command.py b/cad/src/protein/commands/FixedBBProteinSim/FixedBBProteinSim_Command.py
index 4ebc45d5d..32219a4a1 100644
--- a/cad/src/protein/commands/FixedBBProteinSim/FixedBBProteinSim_Command.py
+++ b/cad/src/protein/commands/FixedBBProteinSim/FixedBBProteinSim_Command.py
@@ -10,7 +10,6 @@ from commands.SelectChunks.SelectChunks_GraphicsMode import SelectChunks_Graphic
from command_support.EditCommand import EditCommand
from utilities.constants import red
from protein.commands.FixedBBProteinSim.FixedBBProteinSim_PropertyManager import FixedBBProteinSim_PropertyManager
-from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
# == GraphicsMode part
_superclass_for_GM = SelectChunks_GraphicsMode
@@ -51,11 +50,7 @@ class FixedBBProteinSim_Command(EditCommand):
@see: self.command_update_flyout()
"""
flyoutActionToCheck = 'rosetta_fixedbb_design_Action'
- if MODEL_AND_SIMULATE_PROTEINS:
- parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
- else:
- parentCommandName = None
-
+ parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
return flyoutActionToCheck, parentCommandName
def keep_empty_group(self, group):
diff --git a/cad/src/protein/commands/InsertPeptide/InsertPeptide_EditCommand.py b/cad/src/protein/commands/InsertPeptide/InsertPeptide_EditCommand.py
index e3ca96d59..931a0db78 100644
--- a/cad/src/protein/commands/InsertPeptide/InsertPeptide_EditCommand.py
+++ b/cad/src/protein/commands/InsertPeptide/InsertPeptide_EditCommand.py
@@ -16,7 +16,6 @@ from protein.commands.InsertPeptide.PeptideGenerator import PeptideGenerator
from utilities.constants import gensym
from commands.SelectChunks.SelectChunks_GraphicsMode import SelectChunks_GraphicsMode
from protein.temporary_commands.PeptideLineMode import PeptideLine_GM
-from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
from utilities.debug import print_compact_stack, print_compact_traceback
import foundation.env as env
@@ -40,10 +39,7 @@ class InsertPeptide_EditCommand(EditCommand):
featurename = "Insert Peptide"
from utilities.constants import CL_SUBCOMMAND
command_level = CL_SUBCOMMAND
- command_parent = 'BUILD_PROTEIN'
-
- if MODEL_AND_SIMULATE_PROTEINS:
- command_parent = 'MODEL_AND_SIMULATE_PROTEIN'
+ command_parent = 'MODEL_AND_SIMULATE_PROTEIN'
create_name_from_prefix = True
@@ -102,11 +98,7 @@ class InsertPeptide_EditCommand(EditCommand):
@see: self.command_update_flyout()
"""
flyoutActionToCheck = 'buildPeptideAction'
- if MODEL_AND_SIMULATE_PROTEINS:
- parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
- else:
- parentCommandName = None
-
+ parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
return flyoutActionToCheck, parentCommandName
def keep_empty_group(self, group):
diff --git a/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py b/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py
index 8eeb6be52..18e03b927 100644
--- a/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py
+++ b/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py
@@ -10,7 +10,6 @@ from commands.SelectChunks.SelectChunks_GraphicsMode import SelectChunks_Graphic
from command_support.EditCommand import EditCommand
from utilities.constants import red
from protein.commands.ProteinDisplayStyle.ProteinDisplayStyle_PropertyManager import ProteinDisplayStyle_PropertyManager
-from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
# == GraphicsMode part
@@ -54,11 +53,7 @@ class ProteinDisplayStyle_Command(EditCommand):
@see: self.command_update_flyout()
"""
flyoutActionToCheck = 'displayProteinStyleAction'
- if MODEL_AND_SIMULATE_PROTEINS:
- parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
- else:
- parentCommandName = None
-
+ parentCommandName = 'MODEL_AND_SIMULATE_PROTEIN'
return flyoutActionToCheck, parentCommandName
def keep_empty_group(self, group):
diff --git a/cad/src/protein/model/Protein.py b/cad/src/protein/model/Protein.py
index ebb4c07e9..f3b82c195 100644
--- a/cad/src/protein/model/Protein.py
+++ b/cad/src/protein/model/Protein.py
@@ -625,13 +625,7 @@ class Protein:
the actual model. Maybe we'll take care of that when we move to the
new model
"""
- from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
- if MODEL_AND_SIMULATE_PROTEINS:
- win.commandSequencer.userEnterCommand('MODEL_AND_SIMULATE_PROTEIN')
- else:
- win.commandSequencer.userEnterCommand('BUILD_PROTEIN')
- assert win.commandSequencer.currentCommand.commandName == 'BUILD_PROTEIN'
- win.commandSequencer.currentCommand.runCommand()
+ win.commandSequencer.userEnterCommand('MODEL_AND_SIMULATE_PROTEIN')
return
pass # end of class Protein
diff --git a/cad/src/simulation/ROSETTA/runRosetta.py b/cad/src/simulation/ROSETTA/runRosetta.py
index 260828054..ce63a1686 100644
--- a/cad/src/simulation/ROSETTA/runRosetta.py
+++ b/cad/src/simulation/ROSETTA/runRosetta.py
@@ -1107,11 +1107,8 @@ class RosettaRunner:
@type outProtein: L{Chunk}
"""
- from utilities.GlobalPreferences import MODEL_AND_SIMULATE_PROTEINS
- if MODEL_AND_SIMULATE_PROTEINS:
- command = self.win.commandSequencer.find_innermost_command_named('MODEL_AND_SIMULATE_PROTEIN')
- else:
- command = self.win.commandSequencer.find_innermost_command_named('BUILD_PROTEIN')
+ command = self.win.commandSequencer.find_innermost_command_named('MODEL_AND_SIMULATE_PROTEIN')
+
if command:
command.propMgr.structureComboBox.addItem(outProtein.name)
command.propMgr.protein_name_list.append(outProtein.name)
diff --git a/cad/src/utilities/GlobalPreferences.py b/cad/src/utilities/GlobalPreferences.py
index 9faba2acd..15af97cfd 100644
--- a/cad/src/utilities/GlobalPreferences.py
+++ b/cad/src/utilities/GlobalPreferences.py
@@ -471,12 +471,6 @@ ENABLE_PROTEINS = debug_pref("Enable Proteins? (next session)",
prefs_key = "v1.2/Enable Proteins?"
)
-MODEL_AND_SIMULATE_PROTEINS = debug_pref("Enable model and simulate protein flyout? (next session)",
- Choice_boolean_True,
- non_debug = True,
- prefs_key = "v1.2/Enable model and simulate protein flyout?"
- )
-
# ==
def _debug_pref_keep_signals_always_connected(): #Ninad 2008-08-13
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-04 08:09:18 +0000