diff options
| author | Mark Sims <mark@nanorex.com> | 2008-12-17 17:28:47 +0000 |
|---|---|---|
| committer | Mark Sims <mark@nanorex.com> | 2008-12-17 17:28:47 +0000 |
| commit | f84c3eb01dc9ad03bcf2eb8b98c9c8bb192b6255 (patch) | |
| tree | 14888312d6c3bfc277e35ecb38b54a458456a09c | |
| parent | a22ad1479145005f931a4fad52619c6da9e65252 (diff) | |
| download | nanoengineer-theirix-f84c3eb01dc9ad03bcf2eb8b98c9c8bb192b6255.tar.gz nanoengineer-theirix-f84c3eb01dc9ad03bcf2eb8b98c9c8bb192b6255.zip | |
Minor refactoring.
| -rw-r--r-- | cad/src/dna/DnaSequenceEditor/Ui_DnaSequenceEditor.py | 11 | ||||
| -rw-r--r-- | cad/src/dna/commands/DnaStrand/DnaStrand_PropertyManager.py | 41 |
2 files changed, 14 insertions, 38 deletions
diff --git a/cad/src/dna/DnaSequenceEditor/Ui_DnaSequenceEditor.py b/cad/src/dna/DnaSequenceEditor/Ui_DnaSequenceEditor.py index db2289856..d1dd3db28 100644 --- a/cad/src/dna/DnaSequenceEditor/Ui_DnaSequenceEditor.py +++ b/cad/src/dna/DnaSequenceEditor/Ui_DnaSequenceEditor.py @@ -69,6 +69,10 @@ class Ui_DnaSequenceEditor(PM_DockWidget): self.setFixedHeight(90) return + # Ask Bruce if he agrees that updateSequence() and setCursorPosition() + # should be moved to the subclass DnaSequenceEditor. I think so, but I + # just want to double-check first. + # Mark 2008-12-17. def updateSequence(self, strand = None, cursorPos = 0): """ Updates the sequence editor with the sequence of I{strand}. @@ -120,7 +124,12 @@ class Ui_DnaSequenceEditor(PM_DockWidget): titleString = 'Sequence Editor for ' + self.current_strand.name self.setWindowTitle(titleString) - self.show() + if not self.isVisible(): + #Show the sequence editor if it isn't visible. + #ATTENTION: the sequence editor will (temporarily) close the + #Reports dockwidget (if it is visible). The Reports dockwidget + #is restored when the sequence Editor is closed. + self.show() return def setCursorPosition(self, cursorPos = 0): diff --git a/cad/src/dna/commands/DnaStrand/DnaStrand_PropertyManager.py b/cad/src/dna/commands/DnaStrand/DnaStrand_PropertyManager.py index e8bdd7b33..0b08158be 100644 --- a/cad/src/dna/commands/DnaStrand/DnaStrand_PropertyManager.py +++ b/cad/src/dna/commands/DnaStrand/DnaStrand_PropertyManager.py @@ -212,6 +212,7 @@ class DnaStrand_PropertyManager( DnaOrCnt_PropertyManager): def setParameters(self, params): """ This is usually called when you are editing an existing structure. + It also gets called when selecting a new strand (within this command). Some property manager ui elements then display the information obtained from the object being edited. TODO: @@ -238,8 +239,9 @@ class DnaStrand_PropertyManager( DnaOrCnt_PropertyManager): if name: # Minimal test. Should add a validator. --Mark 2008-12-16 self.nameLineEdit.setText(name) - # We could have a new strand, so update the sequence editor. - # Fixes bug 2951. --Mark 2008-12-16 + # This gets called when we enter the command *or* when selecting a new + # strand. In either case, we must update the sequence in the sequenece + # editor. Fixes bug 2951. --Mark 2008-12-16 if self.command and self.command.hasValidStructure(): self.updateSequence(strand = self.command.struct) return @@ -324,29 +326,6 @@ class DnaStrand_PropertyManager( DnaOrCnt_PropertyManager): self.updateMessage(msg1 + msg2) return - def show(self): - """ - Show this PM - As of 2007-11-20, it also shows the Sequence Editor widget and hides - the history widget. This implementation may change in the near future - This method also retrives the name information from the - command's structure for its name line edit field. - @see: DnaStrand_EditCommand.getStructureName() - @see: self.close() - """ - _superclass.show(self) - self._showSequenceEditor() - - if self.command is not None: - name = self.command.getStructureName() - if name is not None: - self.nameLineEdit.setText(name) - msg1 = ("Editing <b>%s</b>. ") % (name) - msg2 = "Use resize handles to resize the strand. Use sequence editor"\ - "to assign a new sequence or the current one to a file." - self.updateMessage(msg1 + msg2) - return - def close(self): """ Close this property manager. @@ -364,18 +343,6 @@ class DnaStrand_PropertyManager( DnaOrCnt_PropertyManager): _superclass.close(self) return - - def _showSequenceEditor(self): - if self.sequenceEditor: - if not self.sequenceEditor.isVisible(): - #Show the sequence editor if it isn't visible. - #ATTENTION: the sequence editor will (temporarily) close the - #Reports dockwidget (if it is visible). The Reports dockwidget - #is restored when the sequence Editor is closed. - self.sequenceEditor.show() - - self.updateSequence(strand = self.command.struct) - return def updateSequence(self, strand = None): """ |