summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNinad Sathaye <ninad@nanorex.com>2008-09-30 17:30:40 +0000
committerNinad Sathaye <ninad@nanorex.com>2008-09-30 17:30:40 +0000
commitb0928e00d47d9932e84458f01d481d5009357ec6 (patch)
tree8829e4864c60b1faba5cf7ac4365991e20adf1d6
parentbcb7d5a55152894671098c7ad41ec5dbb9033a3f (diff)
downloadnanoengineer-theirix-b0928e00d47d9932e84458f01d481d5009357ec6.tar.gz
nanoengineer-theirix-b0928e00d47d9932e84458f01d481d5009357ec6.zip
removed command_can_be_suspended command class flag
-rw-r--r--cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py3
-rw-r--r--cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py2
-rw-r--r--cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py3
-rwxr-xr-xcad/src/command_support/Command.py10
-rw-r--r--cad/src/commands/BuildAtoms/AtomsTool_Command.py1
-rw-r--r--cad/src/commands/BuildAtoms/BondTool_Command.py11
-rw-r--r--cad/src/commands/ColorScheme/ColorScheme_Command.py3
-rw-r--r--cad/src/commands/LightingScheme/LightingScheme_Command.py2
-rwxr-xr-xcad/src/commands/Move/Move_Command.py1
-rw-r--r--cad/src/commands/Paste/PasteFromClipboard_Command.py5
-rwxr-xr-xcad/src/commands/PlaneProperties/Plane_EditCommand.py5
-rw-r--r--cad/src/commands/QuteMol/QuteMol_Command.py1
-rwxr-xr-xcad/src/commands/Rotate/RotateChunks_Command.py1
-rw-r--r--cad/src/commands/StereoProperties/StereoProperties_Command.py2
-rwxr-xr-xcad/src/commands/Translate/TranslateChunks_Command.py1
-rw-r--r--cad/src/dna/command_support/BreakOrJoinStrands_Command.py1
-rw-r--r--cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py3
-rw-r--r--cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py3
-rw-r--r--cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_Command.py1
-rw-r--r--cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py3
-rw-r--r--cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py3
-rw-r--r--cad/src/dna/commands/MakeCrossovers/MakeCrossovers_Command.py2
-rw-r--r--cad/src/dna/commands/OrderDna/OrderDna_Command.py1
-rw-r--r--cad/src/protein/commands/BackrubProteinSim/BackrubProteinSim_Command.py2
-rw-r--r--cad/src/protein/commands/BuildPeptide/Peptide_EditCommand.py1
-rw-r--r--cad/src/protein/commands/BuildProtein/BuildProtein_EditCommand.py1
-rw-r--r--cad/src/protein/commands/EditResidues/EditResidues_Command.py1
-rw-r--r--cad/src/protein/commands/EditRotamers/EditRotamers_Command.py1
-rw-r--r--cad/src/protein/commands/FixedBBProteinSim/FixedBBProteinSim_Command.py2
-rw-r--r--cad/src/protein/commands/ModelAndSimulateProtein/ModelAndSimulateProtein_Command.py1
-rw-r--r--cad/src/protein/commands/ModelAndSimulateProtein/ModelProtein_Command.py1
-rw-r--r--cad/src/protein/commands/ModelAndSimulateProtein/SimulateProtein_Command.py1
-rw-r--r--cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py1
-rwxr-xr-xcad/src/prototype/test_commands.py1
-rw-r--r--cad/src/temporary_commands/LineMode/Line_Command.py1
-rw-r--r--cad/src/temporary_commands/TemporaryCommand.py1
36 files changed, 11 insertions, 72 deletions
diff --git a/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py b/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py
index 39c1fc3c7..d8dbb1562 100644
--- a/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py
+++ b/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py
@@ -65,8 +65,7 @@ class BuildNanotube_EditCommand(EditCommand):
command_should_resume_prevMode = False
command_has_its_own_PM = True
- command_can_be_suspended = True
-
+
# Generators for DNA, nanotubes and graphene have their MT name
# generated (in GeneratorBaseClass) from the prefix.
create_name_from_prefix = True
diff --git a/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py b/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py
index 94cfe8fd2..e8bdaaf9f 100644
--- a/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py
+++ b/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py
@@ -75,8 +75,6 @@ class InsertNanotube_EditCommand(EditCommand):
command_should_resume_prevMode = True
command_has_its_own_PM = True
- command_can_be_suspended = False
-
# Generators for DNA, nanotubes and graphene have their MT name
# generated (in GeneratorBaseClass) from the prefix.
create_name_from_prefix = True
diff --git a/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py b/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py
index a43069567..624c0ebd2 100644
--- a/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py
+++ b/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py
@@ -110,8 +110,7 @@ class NanotubeSegment_EditCommand(State_preMixin, EditCommand):
command_should_resume_prevMode = True
command_has_its_own_PM = True
- command_can_be_suspended = False
-
+
create_name_from_prefix = True
call_makeMenus_for_each_event = True
diff --git a/cad/src/command_support/Command.py b/cad/src/command_support/Command.py
index 6f141b2eb..b0449e671 100755
--- a/cad/src/command_support/Command.py
+++ b/cad/src/command_support/Command.py
@@ -81,14 +81,7 @@ class anyCommand(baseCommand, StateMixin):
# if they need one. [in command_enter_PM (after refactoring) or __init__]
propMgr = None
- # note: the following 2 command_ attributes may be ignored or revised
- # after the current command stack refactoring is complete [070830]:
-
- command_can_be_suspended = False
- # Boolean; whether this command can be suspended while temporary commands run,
- # to be resumed when they finish. Should be True for most real commands
- # (so is True in basicCommand) but is often False for other temporary commands.
- # [bruce 071011]
+
command_should_resume_prevMode = False
# Boolean; whether this command, when exiting, should resume the prior command
@@ -321,7 +314,6 @@ class basicCommand(anyCommand):
__abstract_command_class = True
- command_can_be_suspended = True # good default value for most commands [bruce 071011]
PM_class = None
#Command subclasses can override this class constant with the appropriate
diff --git a/cad/src/commands/BuildAtoms/AtomsTool_Command.py b/cad/src/commands/BuildAtoms/AtomsTool_Command.py
index c63db9e14..9068529b6 100644
--- a/cad/src/commands/BuildAtoms/AtomsTool_Command.py
+++ b/cad/src/commands/BuildAtoms/AtomsTool_Command.py
@@ -35,7 +35,6 @@ class AtomsTool_Command(BuildAtoms_Command):
featurename = 'Build Atoms Mode/AtomsTool'
commandName = 'ATOMS_TOOL'
- command_can_be_suspended = True
command_should_resume_prevMode = False
command_has_its_own_PM = False
diff --git a/cad/src/commands/BuildAtoms/BondTool_Command.py b/cad/src/commands/BuildAtoms/BondTool_Command.py
index 2688e2be8..55985c098 100644
--- a/cad/src/commands/BuildAtoms/BondTool_Command.py
+++ b/cad/src/commands/BuildAtoms/BondTool_Command.py
@@ -47,7 +47,6 @@ class BondTool_Command(BuildAtoms_Command):
featurename = 'Build Atoms Mode/BondTool'
commandName = 'BOND_TOOL'
- command_can_be_suspended = True
command_should_resume_prevMode = False
command_has_its_own_PM = False
@@ -186,8 +185,7 @@ class SingleBondTool(BondTool_Command):
featurename = 'Build Atoms Mode/SingleBondTool'
commandName = 'SINGLE_BOND_TOOL'
-
- command_can_be_suspended = False
+
command_should_resume_prevMode = True
def getBondType(self):
@@ -202,8 +200,7 @@ class SingleBondTool(BondTool_Command):
class DoubleBondTool(BondTool_Command):
featurename = 'Build Atoms Mode/DoubleBondTool'
commandName = 'DOUBLE_BOND_TOOL'
-
- command_can_be_suspended = False
+
command_should_resume_prevMode = True
def getBondType(self):
@@ -219,7 +216,6 @@ class TripleBondTool(BondTool_Command):
featurename = 'Build Atoms Mode/TripleBondTool'
commandName = 'TRIPLE_BOND_TOOL'
- command_can_be_suspended = False
command_should_resume_prevMode = True
def getBondType(self):
@@ -235,7 +231,6 @@ class AromaticBondTool(BondTool_Command):
featurename = 'Build Atoms Mode/AromaticBondTool'
commandName = 'AROMATIC_BOND_TOOL'
- command_can_be_suspended = False
command_should_resume_prevMode = True
def getBondType(self):
@@ -251,7 +246,6 @@ class GraphiticBondTool(BondTool_Command):
featurename = 'Build Atoms Mode/GraphiticBondTool'
commandName = 'GRAPHITIC_BOND_TOOL'
- command_can_be_suspended = False
command_should_resume_prevMode = True
def getBondType(self):
@@ -268,7 +262,6 @@ class DeleteBondTool(BondTool_Command):
featurename = 'Build Atoms Mode/DeleteBondTool'
commandName = 'DELETE_BOND_TOOL'
- command_can_be_suspended = False
command_should_resume_prevMode = True
def _apply_bondTool_on_selected_atoms(self):
diff --git a/cad/src/commands/ColorScheme/ColorScheme_Command.py b/cad/src/commands/ColorScheme/ColorScheme_Command.py
index 1ae79aa4e..cda774675 100644
--- a/cad/src/commands/ColorScheme/ColorScheme_Command.py
+++ b/cad/src/commands/ColorScheme/ColorScheme_Command.py
@@ -41,8 +41,7 @@ class ColorScheme_Command(EditCommand):
GraphicsMode_class = ColorScheme_GraphicsMode
PM_class = ColorScheme_PropertyManager
-
- command_can_be_suspended = False
+
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/commands/LightingScheme/LightingScheme_Command.py b/cad/src/commands/LightingScheme/LightingScheme_Command.py
index 23422f2f7..980821648 100644
--- a/cad/src/commands/LightingScheme/LightingScheme_Command.py
+++ b/cad/src/commands/LightingScheme/LightingScheme_Command.py
@@ -42,7 +42,5 @@ class LightingScheme_Command(EditCommand):
PM_class = LightingScheme_PropertyManager
-
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/commands/Move/Move_Command.py b/cad/src/commands/Move/Move_Command.py
index 900f6c1ef..a7f38c45e 100755
--- a/cad/src/commands/Move/Move_Command.py
+++ b/cad/src/commands/Move/Move_Command.py
@@ -60,7 +60,6 @@ class Move_Command(SelectChunks_Command):
pw = None
- command_can_be_suspended = True
command_should_resume_prevMode = False
command_has_its_own_PM = True
diff --git a/cad/src/commands/Paste/PasteFromClipboard_Command.py b/cad/src/commands/Paste/PasteFromClipboard_Command.py
index 14ef379cc..1ad6d4ff8 100644
--- a/cad/src/commands/Paste/PasteFromClipboard_Command.py
+++ b/cad/src/commands/Paste/PasteFromClipboard_Command.py
@@ -54,10 +54,7 @@ class PasteFromClipboard_Command(BuildAtoms_Command):
from utilities.constants import CL_EDIT_GENERIC
command_level = CL_EDIT_GENERIC
- command_can_be_suspended = True #bruce 071011,
- #GUESS ### REVIEW whether correct when
- #entering Zoom/Pan/Rotate
-
+
#Don't resume previous mode (buggy if set to True) [ninad circa 080102]
command_should_resume_prevMode = False
diff --git a/cad/src/commands/PlaneProperties/Plane_EditCommand.py b/cad/src/commands/PlaneProperties/Plane_EditCommand.py
index dc8cd152e..f102c34cc 100755
--- a/cad/src/commands/PlaneProperties/Plane_EditCommand.py
+++ b/cad/src/commands/PlaneProperties/Plane_EditCommand.py
@@ -58,11 +58,6 @@ class Plane_EditCommand(EditCommand):
create_name_from_prefix = False
#See Command.anyCommand for details about the following flags
- #command_can_be_suspended = False mitigates bug similar to bug 2699
- #(atleast it removes the property manager) . Actual fix will be cleanup of
- #command/command sequencer and inscreasing the command stack depth
- #-- Ninad 2008-04-15
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
# When <command_should_resume_prevMode> and <command_has_its_own_PM>
diff --git a/cad/src/commands/QuteMol/QuteMol_Command.py b/cad/src/commands/QuteMol/QuteMol_Command.py
index 9f3ceee03..fa7824659 100644
--- a/cad/src/commands/QuteMol/QuteMol_Command.py
+++ b/cad/src/commands/QuteMol/QuteMol_Command.py
@@ -27,7 +27,6 @@ class QuteMol_Command(SelectChunks_Command):
PM_class = QuteMolPropertyManager
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/commands/Rotate/RotateChunks_Command.py b/cad/src/commands/Rotate/RotateChunks_Command.py
index ac345efd7..d34537530 100755
--- a/cad/src/commands/Rotate/RotateChunks_Command.py
+++ b/cad/src/commands/Rotate/RotateChunks_Command.py
@@ -25,7 +25,6 @@ class RotateChunks_Command(Move_Command):
from utilities.constants import CL_EDIT_GENERIC
command_level = CL_EDIT_GENERIC
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = False
diff --git a/cad/src/commands/StereoProperties/StereoProperties_Command.py b/cad/src/commands/StereoProperties/StereoProperties_Command.py
index 50f847ef3..0b8a65692 100644
--- a/cad/src/commands/StereoProperties/StereoProperties_Command.py
+++ b/cad/src/commands/StereoProperties/StereoProperties_Command.py
@@ -36,8 +36,6 @@ class StereoProperties_Command(SelectChunks_Command):
from utilities.constants import CL_GLOBAL_PROPERTIES
command_level = CL_GLOBAL_PROPERTIES
-
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/commands/Translate/TranslateChunks_Command.py b/cad/src/commands/Translate/TranslateChunks_Command.py
index 65ebe56a4..be57a318e 100755
--- a/cad/src/commands/Translate/TranslateChunks_Command.py
+++ b/cad/src/commands/Translate/TranslateChunks_Command.py
@@ -27,7 +27,6 @@ class TranslateChunks_Command(Move_Command):
from utilities.constants import CL_EDIT_GENERIC
command_level = CL_EDIT_GENERIC
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = False
GraphicsMode_class = TranslateChunks_GraphicsMode
diff --git a/cad/src/dna/command_support/BreakOrJoinStrands_Command.py b/cad/src/dna/command_support/BreakOrJoinStrands_Command.py
index 4dbc821e7..30b33cd1f 100644
--- a/cad/src/dna/command_support/BreakOrJoinStrands_Command.py
+++ b/cad/src/dna/command_support/BreakOrJoinStrands_Command.py
@@ -34,7 +34,6 @@ class BreakOrJoinStrands_Command(BuildAtoms_Command):
command_parent = 'BUILD_DNA'
__abstract_command_class = True #bruce 080905
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py b/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py
index e3471e6c5..9e4a6d13b 100644
--- a/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py
+++ b/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py
@@ -64,8 +64,7 @@ class BuildDna_EditCommand(EditCommand):
command_should_resume_prevMode = False
command_has_its_own_PM = True
- command_can_be_suspended = True
-
+
# Generators for DNA, nanotubes and graphene have their MT name
# generated (in GeneratorBaseClass) from the prefix.
create_name_from_prefix = True
diff --git a/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py b/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py
index 5f0f882ae..372970be4 100644
--- a/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py
+++ b/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py
@@ -93,8 +93,7 @@ class DnaDuplex_EditCommand(EditCommand):
command_should_resume_prevMode = True
command_has_its_own_PM = True
- command_can_be_suspended = False
-
+
# Generators for DNA, nanotubes and graphene have their MT name
# generated (in GeneratorBaseClass) from the prefix.
create_name_from_prefix = True
diff --git a/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_Command.py b/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_Command.py
index a7629e273..38651febc 100644
--- a/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_Command.py
+++ b/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_Command.py
@@ -48,7 +48,6 @@ class DnaDisplayStyle_Command(EditCommand):
from utilities.constants import CL_GLOBAL_PROPERTIES
command_level = CL_GLOBAL_PROPERTIES
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py b/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py
index 764f48dc2..ff83d9b38 100644
--- a/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py
+++ b/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py
@@ -124,8 +124,7 @@ class DnaSegment_EditCommand(State_preMixin, EditCommand):
command_should_resume_prevMode = True
command_has_its_own_PM = True
- command_can_be_suspended = False
-
+
# Generators for DNA, nanotubes and graphene have their MT name
# generated (in GeneratorBaseClass) from the prefix.
create_name_from_prefix = True
diff --git a/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py b/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py
index 6a276ea6e..c9ac39ef3 100644
--- a/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py
+++ b/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py
@@ -95,8 +95,7 @@ class DnaStrand_EditCommand(State_preMixin, EditCommand):
command_should_resume_prevMode = True
command_has_its_own_PM = True
- command_can_be_suspended = False
-
+
# Generators for DNA, nanotubes and graphene have their MT name
# generated (in GeneratorBaseClass) from the prefix.
create_name_from_prefix = True
diff --git a/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_Command.py b/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_Command.py
index e9b08d6f9..349709dfa 100644
--- a/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_Command.py
+++ b/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_Command.py
@@ -51,8 +51,6 @@ class MakeCrossovers_Command(SelectChunks_Command,
command_level = CL_SUBCOMMAND
command_parent = 'BUILD_DNA'
-
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/dna/commands/OrderDna/OrderDna_Command.py b/cad/src/dna/commands/OrderDna/OrderDna_Command.py
index 36a33ff1f..3bc5da0a7 100644
--- a/cad/src/dna/commands/OrderDna/OrderDna_Command.py
+++ b/cad/src/dna/commands/OrderDna/OrderDna_Command.py
@@ -47,7 +47,6 @@ class OrderDna_Command(EditCommand):
PM_class = OrderDna_PropertyManager
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/protein/commands/BackrubProteinSim/BackrubProteinSim_Command.py b/cad/src/protein/commands/BackrubProteinSim/BackrubProteinSim_Command.py
index 28d47d3f1..282e150b9 100644
--- a/cad/src/protein/commands/BackrubProteinSim/BackrubProteinSim_Command.py
+++ b/cad/src/protein/commands/BackrubProteinSim/BackrubProteinSim_Command.py
@@ -48,8 +48,6 @@ class BackrubProteinSim_Command(EditCommand):
command_parent = 'SIMULATE_PROTEIN'
-
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/protein/commands/BuildPeptide/Peptide_EditCommand.py b/cad/src/protein/commands/BuildPeptide/Peptide_EditCommand.py
index fee55b872..658f01efc 100644
--- a/cad/src/protein/commands/BuildPeptide/Peptide_EditCommand.py
+++ b/cad/src/protein/commands/BuildPeptide/Peptide_EditCommand.py
@@ -55,7 +55,6 @@ class Peptide_EditCommand(EditCommand):
structGenerator = PeptideGenerator()
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/protein/commands/BuildProtein/BuildProtein_EditCommand.py b/cad/src/protein/commands/BuildProtein/BuildProtein_EditCommand.py
index cf32d1616..6c45617f6 100644
--- a/cad/src/protein/commands/BuildProtein/BuildProtein_EditCommand.py
+++ b/cad/src/protein/commands/BuildProtein/BuildProtein_EditCommand.py
@@ -37,7 +37,6 @@ class BuildProtein_EditCommand(EditCommand):
command_level = CL_ENVIRONMENT_PROVIDING
command_should_resume_prevMode = False
command_has_its_own_PM = True
- command_can_be_suspended = True
create_name_from_prefix = True
call_makeMenus_for_each_event = True
diff --git a/cad/src/protein/commands/EditResidues/EditResidues_Command.py b/cad/src/protein/commands/EditResidues/EditResidues_Command.py
index 71bb8a829..0a0e38045 100644
--- a/cad/src/protein/commands/EditResidues/EditResidues_Command.py
+++ b/cad/src/protein/commands/EditResidues/EditResidues_Command.py
@@ -41,7 +41,6 @@ class EditResidues_Command(EditCommand):
if MODEL_AND_SIMULATE_PROTEINS:
command_parent = 'MODEL_AND_SIMULATE_PROTEIN'
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py b/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py
index 369580a34..1cb06b40b 100644
--- a/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py
+++ b/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py
@@ -42,7 +42,6 @@ class EditRotamers_Command(EditCommand):
if MODEL_AND_SIMULATE_PROTEINS:
command_parent = 'MODEL_AND_SIMULATE_PROTEIN'
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/protein/commands/FixedBBProteinSim/FixedBBProteinSim_Command.py b/cad/src/protein/commands/FixedBBProteinSim/FixedBBProteinSim_Command.py
index 19c288c7f..4ebc45d5d 100644
--- a/cad/src/protein/commands/FixedBBProteinSim/FixedBBProteinSim_Command.py
+++ b/cad/src/protein/commands/FixedBBProteinSim/FixedBBProteinSim_Command.py
@@ -40,8 +40,6 @@ class FixedBBProteinSim_Command(EditCommand):
command_level = CL_SUBCOMMAND
command_parent = 'SIMULATE_PROTEIN'
-
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/protein/commands/ModelAndSimulateProtein/ModelAndSimulateProtein_Command.py b/cad/src/protein/commands/ModelAndSimulateProtein/ModelAndSimulateProtein_Command.py
index 166241f8b..07ce3cd0e 100644
--- a/cad/src/protein/commands/ModelAndSimulateProtein/ModelAndSimulateProtein_Command.py
+++ b/cad/src/protein/commands/ModelAndSimulateProtein/ModelAndSimulateProtein_Command.py
@@ -34,7 +34,6 @@ class ModelAndSimulateProtein_Command(EditCommand):
command_level = CL_ENVIRONMENT_PROVIDING
command_should_resume_prevMode = False
command_has_its_own_PM = True
- command_can_be_suspended = True
create_name_from_prefix = True
call_makeMenus_for_each_event = True
diff --git a/cad/src/protein/commands/ModelAndSimulateProtein/ModelProtein_Command.py b/cad/src/protein/commands/ModelAndSimulateProtein/ModelProtein_Command.py
index 9dbe031c8..8bde23e53 100644
--- a/cad/src/protein/commands/ModelAndSimulateProtein/ModelProtein_Command.py
+++ b/cad/src/protein/commands/ModelAndSimulateProtein/ModelProtein_Command.py
@@ -20,7 +20,6 @@ class ModelProtein_Command(ModelAndSimulateProtein_Command):
featurename = 'Model and Simulate Protein Mode/Model Protein'
commandName = 'MODEL_PROTEIN'
- command_can_be_suspended = False
command_should_resume_prevMode = True
#Urmi 20080806: We may want it to have its own PM
command_has_its_own_PM = False
diff --git a/cad/src/protein/commands/ModelAndSimulateProtein/SimulateProtein_Command.py b/cad/src/protein/commands/ModelAndSimulateProtein/SimulateProtein_Command.py
index 9b40b91f1..8858f6590 100644
--- a/cad/src/protein/commands/ModelAndSimulateProtein/SimulateProtein_Command.py
+++ b/cad/src/protein/commands/ModelAndSimulateProtein/SimulateProtein_Command.py
@@ -19,7 +19,6 @@ class SimulateProtein_Command(ModelAndSimulateProtein_Command):
featurename = 'Model and Simulate Protein Mode/Simulate Protein'
commandName = 'SIMULATE_PROTEIN'
- command_can_be_suspended = False
command_should_resume_prevMode = True
#Urmi 20080806: We may want it to have its own PM
command_has_its_own_PM = False
diff --git a/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py b/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py
index a990c32d0..8eeb6be52 100644
--- a/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py
+++ b/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py
@@ -43,7 +43,6 @@ class ProteinDisplayStyle_Command(EditCommand):
from utilities.constants import CL_GLOBAL_PROPERTIES
command_level = CL_GLOBAL_PROPERTIES
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = True
diff --git a/cad/src/prototype/test_commands.py b/cad/src/prototype/test_commands.py
index 54a06e9f5..e8e3b9c26 100755
--- a/cad/src/prototype/test_commands.py
+++ b/cad/src/prototype/test_commands.py
@@ -98,7 +98,6 @@ class ExampleCommand(_superclass):
## # Warning: currently only one level of temporary commands is permitted;
## # if you enter one of these commands and then enter another TemporaryCommand (e.g. Zoom Tool)
## # it exits the first temporary commmand you were in.
-## command_can_be_suspended = False #bruce 071011
## command_should_resume_prevMode = True #bruce 071011, to be revised (replaces need for customized Done method)
## test_commands_start_as_temporary_command = True # enter in different way
## ### maybe todo: set up a similar thing in Command API?
diff --git a/cad/src/temporary_commands/LineMode/Line_Command.py b/cad/src/temporary_commands/LineMode/Line_Command.py
index 0764486b5..3505efadf 100644
--- a/cad/src/temporary_commands/LineMode/Line_Command.py
+++ b/cad/src/temporary_commands/LineMode/Line_Command.py
@@ -55,7 +55,6 @@ class Line_Command(Select_Command):
# len(mouseClickPoints)
mouseClickPoints = ()
- command_can_be_suspended = False
command_should_resume_prevMode = True
command_has_its_own_PM = False
diff --git a/cad/src/temporary_commands/TemporaryCommand.py b/cad/src/temporary_commands/TemporaryCommand.py
index bd40b3cf3..5acc67298 100644
--- a/cad/src/temporary_commands/TemporaryCommand.py
+++ b/cad/src/temporary_commands/TemporaryCommand.py
@@ -22,7 +22,6 @@ class TemporaryCommand_preMixin(commonCommand):
A pre-Mixin class for Command subclasses
which want to act as temporary commands.
"""
- command_can_be_suspended = False #bruce 071011
command_should_resume_prevMode = True #bruce 071011, to be revised (replaces need for customized Done method)
#See Command.anyCommand for detailed explanation of the following flag
command_has_its_own_PM = False