diff options
| author | Ninad Sathaye <ninad@nanorex.com> | 2008-05-13 21:37:24 +0000 |
|---|---|---|
| committer | Ninad Sathaye <ninad@nanorex.com> | 2008-05-13 21:37:24 +0000 |
| commit | 202c06c469e7e431baf925eeb800805c4c838316 (patch) | |
| tree | 68b049de63591b29191c17ea13e4f57d10cdb32c | |
| parent | 68e02e61a63b0798caefadb049340934a84b09ad (diff) | |
| download | nanoengineer-202c06c469e7e431baf925eeb800805c4c838316.tar.gz nanoengineer-202c06c469e7e431baf925eeb800805c4c838316.zip | |
minor changes
| -rw-r--r-- | cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py | 28 | ||||
| -rw-r--r-- | cad/src/cnt/temporary_commands/NanotubeLineMode.py | 3 |
2 files changed, 3 insertions, 28 deletions
diff --git a/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py b/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py index 73287e576..971b93b15 100644 --- a/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py +++ b/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py @@ -422,31 +422,7 @@ class InsertNanotube_EditCommand(EditCommand): ntSegment.kill_with_contents() raise PluginBug("Internal error while trying to create Nanotube.") - def provideParamsForTemporaryMode(self, temporaryModeName): - """ - NOTE: This needs to be a general API method. There are situations when - user enters a temporary mode , does something there and returns back to - the previous mode he was in. He also needs to send some data from - previous mode to the temporary mode . - @see: B{NanotubeLineMode} - @see: self.acceptParamsFromTemporaryMode - """ - assert temporaryModeName == 'NANOTUBE_LINE_MODE' - - mouseClickLimit = None - ntRise = self.nanotube.ntRise() - - callback_cursorText = self.getCursorTextForTemporaryMode - callback_snapEnabled = self.isRubberbandLineSnapEnabled - callback_rubberbandLineDisplay = self.getDisplayStyleForNtRubberbandLine - - return (mouseClickLimit, - ntRise, - callback_cursorText, - callback_snapEnabled, - callback_rubberbandLineDisplay ) - - def getCursorTextForTemporaryMode(self, endPoint1, endPoint2): + def getCursorText(self, endPoint1, endPoint2): """ This is used as a callback method in CntLine mode @see: NanotubeLineMode.setParams, NanotubeLineMode_GM.Draw @@ -502,7 +478,7 @@ class InsertNanotube_EditCommand(EditCommand): self.jigList = self.win.assy.getSelectedJigs() self.callbackMethodForCursorTextString = \ - self.getCursorTextForTemporaryMode + self.getCursorText self.callbackForSnapEnabled = self.isRubberbandLineSnapEnabled diff --git a/cad/src/cnt/temporary_commands/NanotubeLineMode.py b/cad/src/cnt/temporary_commands/NanotubeLineMode.py index b83822654..07678aec9 100644 --- a/cad/src/cnt/temporary_commands/NanotubeLineMode.py +++ b/cad/src/cnt/temporary_commands/NanotubeLineMode.py @@ -107,8 +107,7 @@ class NanotubeLineMode(LineMode): @see: L{LineMode} @see: selectMolsMode.provideParamsForTemporaryMode comments for related TODOs. - @see: InsertNanotube_EditCommand.provideParamsForTemporaryMode - @see: InsertNanotube_EditCommand.getCursorTextForTemporaryMode + @see: InsertNanotube_EditCommand.getCursorText() NOTE: [2008-01-11] The default NanotubeLineMode (command) part is not used as of 2008-01-11 |