summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Smith <bruce@nanorex.com>2008-08-06 22:33:28 +0000
committerBruce Smith <bruce@nanorex.com>2008-08-06 22:33:28 +0000
commit6ce22b0cfcdfec7e2b84fbfd0a1cf464691fcc25 (patch)
tree44ede414ca2bb59f39872414cf66cae2354f77c1
parenta97a338ed235f4e2a44105bd904c4dd5b61039ee (diff)
downloadnanoengineer-6ce22b0cfcdfec7e2b84fbfd0a1cf464691fcc25.tar.gz
nanoengineer-6ce22b0cfcdfec7e2b84fbfd0a1cf464691fcc25.zip
rename command_has_its_own_gui -> command_has_its_own_PM
-rw-r--r--cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py2
-rw-r--r--cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py2
-rw-r--r--cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py2
-rwxr-xr-xcad/src/command_support/Command.py39
-rw-r--r--cad/src/command_support/EditCommand_PM.py2
-rw-r--r--cad/src/command_support/baseCommand.py10
-rw-r--r--cad/src/commands/BuildAtoms/AtomsTool_Command.py2
-rw-r--r--cad/src/commands/BuildAtoms/BondTool_Command.py2
-rw-r--r--cad/src/commands/ColorScheme/ColorScheme_Command.py2
-rw-r--r--cad/src/commands/LightingScheme/LightingScheme_Command.py2
-rw-r--r--cad/src/commands/LinearMotorProperties/LinearMotor_EditCommand.py2
-rwxr-xr-xcad/src/commands/Move/Move_Command.py2
-rw-r--r--cad/src/commands/Paste/PasteFromClipboard_Command.py2
-rwxr-xr-xcad/src/commands/PlaneProperties/Plane_EditCommand.py4
-rw-r--r--cad/src/commands/QuteMol/QuteMol_Command.py2
-rw-r--r--cad/src/commands/RotaryMotorProperties/RotaryMotor_EditCommand.py2
-rwxr-xr-xcad/src/commands/Rotate/RotateChunks_Command.py2
-rw-r--r--cad/src/commands/StereoProperties/StereoProperties_Command.py2
-rwxr-xr-xcad/src/commands/Translate/TranslateChunks_Command.py2
-rw-r--r--cad/src/dna/commands/BreakStrands/BreakStrands_Command.py2
-rw-r--r--cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py2
-rw-r--r--cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py2
-rw-r--r--cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_Command.py2
-rw-r--r--cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py2
-rw-r--r--cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py2
-rw-r--r--cad/src/dna/commands/JoinStrands/JoinStrands_Command.py2
-rw-r--r--cad/src/dna/commands/MakeCrossovers/MakeCrossovers_Command.py2
-rw-r--r--cad/src/dna/commands/OrderDna/OrderDna_Command.py2
-rw-r--r--cad/src/protein/commands/BuildPeptide/Peptide_EditCommand.py4
-rw-r--r--cad/src/protein/commands/BuildProtein/BuildProtein_EditCommand.py4
-rw-r--r--cad/src/protein/commands/CompareProteins/CompareProteins_Command.py2
-rw-r--r--cad/src/protein/commands/EditResidues/EditResidues_Command.py2
-rw-r--r--cad/src/protein/commands/EditRotamers/EditRotamers_Command.py2
-rw-r--r--cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py2
-rw-r--r--cad/src/temporary_commands/LineMode.py4
-rw-r--r--cad/src/temporary_commands/TemporaryCommand.py2
36 files changed, 65 insertions, 60 deletions
diff --git a/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py b/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py
index 0315b3a0e..7eb156514 100644
--- a/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py
+++ b/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py
@@ -55,7 +55,7 @@ class BuildNanotube_EditCommand(EditCommand):
GraphicsMode_class = BuildNanotube_GraphicsMode
command_should_resume_prevMode = False
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
command_can_be_suspended = True
# Generators for DNA, nanotubes and graphene have their MT name
diff --git a/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py b/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py
index ef8bafb8e..84972f267 100644
--- a/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py
+++ b/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py
@@ -66,7 +66,7 @@ class InsertNanotube_EditCommand(EditCommand):
command_parent = 'BUILD_NANOTUBE'
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
command_can_be_suspended = False
# Generators for DNA, nanotubes and graphene have their MT name
diff --git a/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py b/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py
index b7719178c..a9ccdbc57 100644
--- a/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py
+++ b/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py
@@ -104,7 +104,7 @@ class NanotubeSegment_EditCommand(State_preMixin, EditCommand):
command_parent = 'BUILD_NANOTUBE'
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
command_can_be_suspended = False
create_name_from_prefix = True
diff --git a/cad/src/command_support/Command.py b/cad/src/command_support/Command.py
index 473193183..42d3eec46 100755
--- a/cad/src/command_support/Command.py
+++ b/cad/src/command_support/Command.py
@@ -94,11 +94,11 @@ class anyCommand(object, StateMixin):
featurename = ""
# Command's property manager. Subclasses should initialize the propMgr object
- # if they need one.
+ # if they need one. [in command_enter_PM (after refactoring) or __init__]
propMgr = None
- # note: the following 3 command_ attributes may be ignored or revised
+ # 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
@@ -116,8 +116,13 @@ class anyCommand(object, StateMixin):
# commandSequencer.userEnterTemporaryCommand.
# [bruce 071011, to be revised (replaces need for customized Done methods)]
- command_has_its_own_gui = True
- #command_has_its_own_gui means, for example, the command has its own PM,
+ command_has_its_own_PM = True
+ # note: following comment predates the command stack refactoring circa 080806.
+ # This flag now means only that the command should create its own PM
+ # in self.propMgr rather than letting one from the parent (if any)
+ # remain visible.
+ #
+ #command_has_its_own_PM means, for example, the command has its own PM,
#and flyout toolbar and/or the Done/Cancel button corner (confirmation
#corner).
#For most of the commands, this is True (e.g. BuildAtoms mode ,
@@ -140,7 +145,7 @@ class anyCommand(object, StateMixin):
# previous mode (while in a temporary mode) , then 'that previous mode'
# will exit. The related code makes sure to first leave the temporary
# mode(s) before leaving the regular mode (the command with
- # command_has_its_own_gui set to True). See also, flag
+ # command_has_its_own_PM set to True). See also, flag
# 'exit_using_done_cancel' in basicCommand.Done used (= False) for a
# typical exit of a temporary mode . See that method for detailed
# comment. -- Ninad 2007-11-09
@@ -774,7 +779,7 @@ class basicCommand(anyCommand):
#For temporary commands with their own gui (the commands that
#are expected to return to the previous command when done),
#use the 'Transient-Done' confirmation corner images.
- if self.command_has_its_own_gui and \
+ if self.command_has_its_own_PM and \
self.command_should_resume_prevMode:
res.append('Transient-Done')
else:
@@ -1303,7 +1308,7 @@ class basicCommand(anyCommand):
if new_mode is None:
try:
new_mode = self.commandSequencer.prevMode
- if new_mode and not self.command_has_its_own_gui:
+ if new_mode and not self.command_has_its_own_PM:
if exit_using_done_or_cancel_button:
# This fixes bugs like 2566, 2565
# @bug: But it doesn't fix the
@@ -1313,7 +1318,7 @@ class basicCommand(anyCommand):
# Because of this, there is a bug in this
# conditional. The bug and related NFR is documented
# in bug 2583
- if new_mode.command_has_its_own_gui:
+ if new_mode.command_has_its_own_PM:
#Example: command has a PM which in turn has a
#done/cancel button or a formal way to exit a
#regular mode.
@@ -1345,7 +1350,7 @@ class basicCommand(anyCommand):
self._exit_previous_command(exit_using_done_or_cancel_button)
if resuming:
new_mode_options['resuming'] = True
- new_mode_options['has_its_own_gui'] = self.command_has_its_own_gui
+ new_mode_options['has_its_own_gui'] = self.command_has_its_own_PM
else:
assert new_mode_options.get('resuming', False) == False
# bruce 071011 added this; old code just pretended it was false
@@ -1386,15 +1391,15 @@ class basicCommand(anyCommand):
assert not USE_COMMAND_STACK # this method will be replaced when USE_COMMAND_STACK is true
previous_command = self.commandSequencer.prevMode
#Fixed bug 2800. The original if conditional was as follows --
- #if previous_command and not self.command_has_its_own_gui
+ #if previous_command and not self.command_has_its_own_PM
#But it could happen that the current command is a temporary command
#that usually resumes the previous mode and it still has its own gui.
- #(e.g. Join Strand command). So 'if not self.command_has_its_own_gui
+ #(e.g. Join Strand command). So 'if not self.command_has_its_own_PM
#is incorrect. -- Ninad 2008-04-12. See also bug 2583
if previous_command:
if exit_using_done_or_cancel_button:
- if previous_command.command_has_its_own_gui:
+ if previous_command.command_has_its_own_PM:
previous_command.Done()
else:
#new Command is a temporary mode with no special
@@ -1444,7 +1449,7 @@ class basicCommand(anyCommand):
if new_mode is None:
try:
new_mode = self.commandSequencer.prevMode
- if new_mode and not self.command_has_its_own_gui:
+ if new_mode and not self.command_has_its_own_PM:
if exit_using_done_or_cancel_button:
# This fixes bugs like 2566, 2565
# @bug: But it doesn't fix the
@@ -1454,7 +1459,7 @@ class basicCommand(anyCommand):
# Because of this, there is a bug in this
# conditional. The bug and related NFR is documented
# in bug 2583
- if new_mode.command_has_its_own_gui:
+ if new_mode.command_has_its_own_PM:
new_mode.Cancel()
else:
new_mode.Cancel(exit_using_don_or_cancel = False)
@@ -1480,9 +1485,9 @@ class basicCommand(anyCommand):
#parameter, This fixes bugs like 2593.
previous_command = self.commandSequencer.prevMode
if previous_command is not new_mode:
- if previous_command and not self.command_has_its_own_gui:
+ if previous_command and not self.command_has_its_own_PM:
if exit_using_done_or_cancel_button:
- if previous_command.command_has_its_own_gui:
+ if previous_command.command_has_its_own_PM:
previous_command.Cancel()
else:
#new Command is a temporary mode with no special
@@ -1491,7 +1496,7 @@ class basicCommand(anyCommand):
exit_using_done_or_cancel_button = False)
if resuming:
new_mode_options['resuming'] = True
- new_mode_options['has_its_own_gui'] = self.command_has_its_own_gui
+ new_mode_options['has_its_own_gui'] = self.command_has_its_own_PM
else:
assert new_mode_options.get('resuming', False) == False
# bruce 071011 added this; old code just pretended it was false
diff --git a/cad/src/command_support/EditCommand_PM.py b/cad/src/command_support/EditCommand_PM.py
index 73d6700b3..ec2f36776 100644
--- a/cad/src/command_support/EditCommand_PM.py
+++ b/cad/src/command_support/EditCommand_PM.py
@@ -89,7 +89,7 @@ class EditCommand_PM(PM_Dialog):
"""
#First exit temporary modes (e.g. Pan mode) if any.
currentCommand = self.win.commandSequencer.currentCommand
- if not currentCommand.command_has_its_own_gui:
+ if not currentCommand.command_has_its_own_PM:
currentCommand.Done()
self.connect_or_disconnect_signals(False)
self.enable_or_disable_gui_actions(bool_enable = True)
diff --git a/cad/src/command_support/baseCommand.py b/cad/src/command_support/baseCommand.py
index d9946a44d..44cadb670 100644
--- a/cad/src/command_support/baseCommand.py
+++ b/cad/src/command_support/baseCommand.py
@@ -56,7 +56,7 @@ class baseCommand(object):
# - related to a command's property manager (PM)
- command_has_its_own_gui = True ### note: this might be renamed, or removed
+ command_has_its_own_PM = True
propMgr = None # will be set to the PM to use with self (whether or not created by self)
@@ -65,7 +65,7 @@ class baseCommand(object):
## @return: the property manager object to use when this command is current
## (or when its subcommands don't have a PM of their own).
## """
-## if self.command_has_its_own_gui:
+## if self.command_has_its_own_PM:
## return self.propMgr # might be None
## else:
## return self.parentCommand and self.parentCommand.get_propertyManager()
@@ -288,7 +288,7 @@ class baseCommand(object):
[subclasses should extend as needed, typically calling superclass
implementation at the start]
"""
- if not self.command_has_its_own_gui: # rename?
+ if not self.command_has_its_own_PM:
self.propMgr = self.parentCommand.propMgr
self.command_enter_PM()
self.command_enter_flyout()
@@ -303,7 +303,7 @@ class baseCommand(object):
For commands which use their parent command's PM, it has already
been assigned to self.propMgr, assuming this method is called by
the base class implementation of command_entered (as usual)
- and that self.command_has_its_own_gui is false.
+ and that self.command_has_its_own_PM is false.
In that case, this method is allowed to perform side effects on
that "parent PM" (and this is the best place to do them),
@@ -323,7 +323,7 @@ class baseCommand(object):
@note: base class implementation of command_entered calls this,
after setting self.propMgr to PM from parent command if
- self.command_has_its_own_gui is false.
+ self.command_has_its_own_PM is false.
[subclasses should override as needed]
"""
diff --git a/cad/src/commands/BuildAtoms/AtomsTool_Command.py b/cad/src/commands/BuildAtoms/AtomsTool_Command.py
index c9b206d51..8b8264c10 100644
--- a/cad/src/commands/BuildAtoms/AtomsTool_Command.py
+++ b/cad/src/commands/BuildAtoms/AtomsTool_Command.py
@@ -31,7 +31,7 @@ class AtomsTool_Command(BuildAtoms_Command):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = False
+ command_has_its_own_PM = False
currentActiveTool = 'ATOMS_TOOL'
diff --git a/cad/src/commands/BuildAtoms/BondTool_Command.py b/cad/src/commands/BuildAtoms/BondTool_Command.py
index 91fc2176a..9af23d860 100644
--- a/cad/src/commands/BuildAtoms/BondTool_Command.py
+++ b/cad/src/commands/BuildAtoms/BondTool_Command.py
@@ -43,7 +43,7 @@ class BondTool_Command(BuildAtoms_Command):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = False
+ command_has_its_own_PM = False
currentActiveTool = 'BONDS_TOOL'
diff --git a/cad/src/commands/ColorScheme/ColorScheme_Command.py b/cad/src/commands/ColorScheme/ColorScheme_Command.py
index 31b5f2241..532fde211 100644
--- a/cad/src/commands/ColorScheme/ColorScheme_Command.py
+++ b/cad/src/commands/ColorScheme/ColorScheme_Command.py
@@ -43,7 +43,7 @@ class ColorScheme_Command(EditCommand):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/commands/LightingScheme/LightingScheme_Command.py b/cad/src/commands/LightingScheme/LightingScheme_Command.py
index bdf1d814c..3fe4a6e9d 100644
--- a/cad/src/commands/LightingScheme/LightingScheme_Command.py
+++ b/cad/src/commands/LightingScheme/LightingScheme_Command.py
@@ -43,7 +43,7 @@ class LightingScheme_Command(EditCommand):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/commands/LinearMotorProperties/LinearMotor_EditCommand.py b/cad/src/commands/LinearMotorProperties/LinearMotor_EditCommand.py
index 07e2133fc..28056425d 100644
--- a/cad/src/commands/LinearMotorProperties/LinearMotor_EditCommand.py
+++ b/cad/src/commands/LinearMotorProperties/LinearMotor_EditCommand.py
@@ -34,7 +34,7 @@ class LinearMotor_EditCommand(EditCommand):
#See Command.anyCommand for details about the following flags
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
commandName = 'LINEAR_MOTOR'
featurename = "Linear Motor"
diff --git a/cad/src/commands/Move/Move_Command.py b/cad/src/commands/Move/Move_Command.py
index b31711e32..2f3915d38 100755
--- a/cad/src/commands/Move/Move_Command.py
+++ b/cad/src/commands/Move/Move_Command.py
@@ -49,7 +49,7 @@ class Move_basicCommand(SelectChunks_basicCommand):
command_can_be_suspended = True
command_should_resume_prevMode = False
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/commands/Paste/PasteFromClipboard_Command.py b/cad/src/commands/Paste/PasteFromClipboard_Command.py
index 4e8e99c73..e53b8f13e 100644
--- a/cad/src/commands/Paste/PasteFromClipboard_Command.py
+++ b/cad/src/commands/Paste/PasteFromClipboard_Command.py
@@ -59,7 +59,7 @@ class PasteFromClipboard_Command(BuildAtoms_Command):
command_should_resume_prevMode = False
#See Command.anyCommand for details about the following flag
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
GraphicsMode_class = PasteFromClipboard_GraphicsMode
diff --git a/cad/src/commands/PlaneProperties/Plane_EditCommand.py b/cad/src/commands/PlaneProperties/Plane_EditCommand.py
index 10025448c..4fd26c252 100755
--- a/cad/src/commands/PlaneProperties/Plane_EditCommand.py
+++ b/cad/src/commands/PlaneProperties/Plane_EditCommand.py
@@ -56,8 +56,8 @@ class Plane_EditCommand(EditCommand):
#-- Ninad 2008-04-15
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
- # When <command_should_resume_prevMode> and <command_has_its_own_gui>
+ command_has_its_own_PM = True
+ # When <command_should_resume_prevMode> and <command_has_its_own_PM>
# are both set to True (like here), want_confirmation_corner_type()
# will determine that the confirmation corner should include the
# Transient-Done image, which is sometimes OK and sometimes not OK.
diff --git a/cad/src/commands/QuteMol/QuteMol_Command.py b/cad/src/commands/QuteMol/QuteMol_Command.py
index cb562f0be..4ee3d0726 100644
--- a/cad/src/commands/QuteMol/QuteMol_Command.py
+++ b/cad/src/commands/QuteMol/QuteMol_Command.py
@@ -29,7 +29,7 @@ class QuteMol_Command(SelectChunks_Command):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/commands/RotaryMotorProperties/RotaryMotor_EditCommand.py b/cad/src/commands/RotaryMotorProperties/RotaryMotor_EditCommand.py
index d7820dca6..3b3150e96 100644
--- a/cad/src/commands/RotaryMotorProperties/RotaryMotor_EditCommand.py
+++ b/cad/src/commands/RotaryMotorProperties/RotaryMotor_EditCommand.py
@@ -34,7 +34,7 @@ class RotaryMotor_EditCommand(EditCommand):
#See Command.anyCommand for details about the following flags
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
commandName = 'ROTARY_MOTOR'
featurename = "Rotary Motor"
diff --git a/cad/src/commands/Rotate/RotateChunks_Command.py b/cad/src/commands/Rotate/RotateChunks_Command.py
index 1268168e6..5ca1ac9d2 100755
--- a/cad/src/commands/Rotate/RotateChunks_Command.py
+++ b/cad/src/commands/Rotate/RotateChunks_Command.py
@@ -27,7 +27,7 @@ class RotateChunks_Command(Move_Command):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = False
+ command_has_its_own_PM = False
GraphicsMode_class = RotateChunks_GraphicsMode
diff --git a/cad/src/commands/StereoProperties/StereoProperties_Command.py b/cad/src/commands/StereoProperties/StereoProperties_Command.py
index 558f7ed22..4ffd3128c 100644
--- a/cad/src/commands/StereoProperties/StereoProperties_Command.py
+++ b/cad/src/commands/StereoProperties/StereoProperties_Command.py
@@ -37,7 +37,7 @@ class StereoProperties_Command(SelectChunks_Command):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/commands/Translate/TranslateChunks_Command.py b/cad/src/commands/Translate/TranslateChunks_Command.py
index 0ffcc1219..71ed70e21 100755
--- a/cad/src/commands/Translate/TranslateChunks_Command.py
+++ b/cad/src/commands/Translate/TranslateChunks_Command.py
@@ -28,7 +28,7 @@ class TranslateChunks_Command(Move_Command):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = False
+ command_has_its_own_PM = False
GraphicsMode_class = TranslateChunks_GraphicsMode
diff --git a/cad/src/dna/commands/BreakStrands/BreakStrands_Command.py b/cad/src/dna/commands/BreakStrands/BreakStrands_Command.py
index d3a5e396c..1ae79678f 100644
--- a/cad/src/dna/commands/BreakStrands/BreakStrands_Command.py
+++ b/cad/src/dna/commands/BreakStrands/BreakStrands_Command.py
@@ -35,7 +35,7 @@ class BreakStrands_Command(BuildAtoms_Command):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py b/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py
index b8f4475a7..44ca2ddc9 100644
--- a/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py
+++ b/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py
@@ -55,7 +55,7 @@ class BuildDna_EditCommand(EditCommand):
GraphicsMode_class = BuildDna_GraphicsMode
command_should_resume_prevMode = False
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
command_can_be_suspended = True
# Generators for DNA, nanotubes and graphene have their MT name
diff --git a/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py b/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py
index 11aab3327..0f1cdab6c 100644
--- a/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py
+++ b/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py
@@ -84,7 +84,7 @@ class DnaDuplex_EditCommand(EditCommand):
command_parent = 'BUILD_DNA'
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
command_can_be_suspended = False
# Generators for DNA, nanotubes and graphene have their MT name
diff --git a/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_Command.py b/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_Command.py
index da65bcbdb..2d2fdc9da 100644
--- a/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_Command.py
+++ b/cad/src/dna/commands/DnaDisplayStyle/DnaDisplayStyle_Command.py
@@ -40,7 +40,7 @@ class DnaDisplayStyle_Command(EditCommand):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py b/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py
index a17bceb12..8bdc5899d 100644
--- a/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py
+++ b/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py
@@ -111,7 +111,7 @@ class DnaSegment_EditCommand(State_preMixin, EditCommand):
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
command_can_be_suspended = False
# Generators for DNA, nanotubes and graphene have their MT name
diff --git a/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py b/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py
index 97c833009..e1569f381 100644
--- a/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py
+++ b/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py
@@ -83,7 +83,7 @@ class DnaStrand_EditCommand(State_preMixin, EditCommand):
command_parent = 'BUILD_DNA'
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
command_can_be_suspended = False
# Generators for DNA, nanotubes and graphene have their MT name
diff --git a/cad/src/dna/commands/JoinStrands/JoinStrands_Command.py b/cad/src/dna/commands/JoinStrands/JoinStrands_Command.py
index a4ffb3881..75c4854e0 100644
--- a/cad/src/dna/commands/JoinStrands/JoinStrands_Command.py
+++ b/cad/src/dna/commands/JoinStrands/JoinStrands_Command.py
@@ -153,7 +153,7 @@ class JoinStrands_Command(BuildAtoms_Command):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_Command.py b/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_Command.py
index d685ebad8..8f5913cfd 100644
--- a/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_Command.py
+++ b/cad/src/dna/commands/MakeCrossovers/MakeCrossovers_Command.py
@@ -51,7 +51,7 @@ class MakeCrossovers_Command(SelectChunks_Command,
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/dna/commands/OrderDna/OrderDna_Command.py b/cad/src/dna/commands/OrderDna/OrderDna_Command.py
index ac9f6e80b..4da269107 100644
--- a/cad/src/dna/commands/OrderDna/OrderDna_Command.py
+++ b/cad/src/dna/commands/OrderDna/OrderDna_Command.py
@@ -38,7 +38,7 @@ class OrderDna_Command(EditCommand):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/protein/commands/BuildPeptide/Peptide_EditCommand.py b/cad/src/protein/commands/BuildPeptide/Peptide_EditCommand.py
index c431d23c5..a1503b9a8 100644
--- a/cad/src/protein/commands/BuildPeptide/Peptide_EditCommand.py
+++ b/cad/src/protein/commands/BuildPeptide/Peptide_EditCommand.py
@@ -42,7 +42,7 @@ class Peptide_EditCommand(EditCommand):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
def __init__(self, commandSequencer, struct = None):
"""
@@ -382,4 +382,4 @@ class Peptide_EditCommand(EditCommand):
@note: placeholder for now
"""
return True
- \ No newline at end of file
+
diff --git a/cad/src/protein/commands/BuildProtein/BuildProtein_EditCommand.py b/cad/src/protein/commands/BuildProtein/BuildProtein_EditCommand.py
index b7cb25d8d..6fda41f1a 100644
--- a/cad/src/protein/commands/BuildProtein/BuildProtein_EditCommand.py
+++ b/cad/src/protein/commands/BuildProtein/BuildProtein_EditCommand.py
@@ -26,7 +26,7 @@ class BuildProtein_EditCommand(EditCommand):
from utilities.constants import CL_ENVIRONMENT_PROVIDING
command_level = CL_ENVIRONMENT_PROVIDING
command_should_resume_prevMode = False
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
command_can_be_suspended = True
create_name_from_prefix = True
call_makeMenus_for_each_event = True
@@ -158,4 +158,4 @@ class BuildProtein_EditCommand(EditCommand):
assert not self.propMgr
propMgr = self.win.createBuildProteinPropMgr_if_needed(self)
return propMgr
- \ No newline at end of file
+
diff --git a/cad/src/protein/commands/CompareProteins/CompareProteins_Command.py b/cad/src/protein/commands/CompareProteins/CompareProteins_Command.py
index 6afdcdbe6..c6d2fc58b 100644
--- a/cad/src/protein/commands/CompareProteins/CompareProteins_Command.py
+++ b/cad/src/protein/commands/CompareProteins/CompareProteins_Command.py
@@ -41,7 +41,7 @@ class CompareProteins_Command(EditCommand):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/protein/commands/EditResidues/EditResidues_Command.py b/cad/src/protein/commands/EditResidues/EditResidues_Command.py
index f288d4c5b..0300047af 100644
--- a/cad/src/protein/commands/EditResidues/EditResidues_Command.py
+++ b/cad/src/protein/commands/EditResidues/EditResidues_Command.py
@@ -41,7 +41,7 @@ class EditResidues_Command(EditCommand):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py b/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py
index 984562032..be787e2c6 100644
--- a/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py
+++ b/cad/src/protein/commands/EditRotamers/EditRotamers_Command.py
@@ -41,7 +41,7 @@ class EditRotamers_Command(EditCommand):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py b/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py
index e58f9ccd6..7a8e34100 100644
--- a/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py
+++ b/cad/src/protein/commands/ProteinDisplayStyle/ProteinDisplayStyle_Command.py
@@ -40,7 +40,7 @@ class ProteinDisplayStyle_Command(EditCommand):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = True
+ command_has_its_own_PM = True
flyoutToolbar = None
diff --git a/cad/src/temporary_commands/LineMode.py b/cad/src/temporary_commands/LineMode.py
index 80aa95f08..c88b36939 100644
--- a/cad/src/temporary_commands/LineMode.py
+++ b/cad/src/temporary_commands/LineMode.py
@@ -534,7 +534,7 @@ class LineMode(Select_Command):
command_can_be_suspended = False
command_should_resume_prevMode = True
- command_has_its_own_gui = False
+ command_has_its_own_PM = False
_results_callback = None #bruce 080801
@@ -597,4 +597,4 @@ class LineMode(Select_Command):
"""
#bruce 080801 split this out of restore_gui
### REVIEW: make this a Request Command API method??
- return (self.mouseClickPoints,) \ No newline at end of file
+ return (self.mouseClickPoints,)
diff --git a/cad/src/temporary_commands/TemporaryCommand.py b/cad/src/temporary_commands/TemporaryCommand.py
index 4b76716cb..8c8863460 100644
--- a/cad/src/temporary_commands/TemporaryCommand.py
+++ b/cad/src/temporary_commands/TemporaryCommand.py
@@ -25,7 +25,7 @@ class TemporaryCommand_preMixin(commonCommand):
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_gui = False
+ command_has_its_own_PM = False
pass