From 440287b2f4de1c61b7b776f6eb283a50a2994f1b Mon Sep 17 00:00:00 2001
From: Stefan Bienert <stefan.bienert@unibas.ch>
Date: Mon, 20 Jun 2011 13:47:05 +0200
Subject: [PATCH] Made 'cancel' button of the superposition dialog do
absolutely nothing to the current scenery
---
modules/gui/pymod/dng/menu.py | 15 ++++++++-------
modules/gui/pymod/dng/superpositiondialog.py | 3 +--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/gui/pymod/dng/menu.py b/modules/gui/pymod/dng/menu.py
index de943d322..75d2ae2ba 100644
--- a/modules/gui/pymod/dng/menu.py
+++ b/modules/gui/pymod/dng/menu.py
@@ -191,13 +191,14 @@ class SceneMenu(QMenu):
i += 1
gfx_ent_2 = sel.GetActiveNode(i)
sd = superpositiondialog.SuperpositionDialog(gfx_ent_1, gfx_ent_2)
- if sd.reference == 0:
- gfx_ent_1.UpdatePositions()
- gfx.Scene().CenterOn(gfx_ent_1)
- else:
- gfx_ent_2.UpdatePositions()
- gfx.Scene().CenterOn(gfx_ent_2)
- LogScript('RMSD: %.3f'%sd.rmsd)
+ if sd.rmsd != None:
+ if sd.reference == 0:
+ gfx_ent_1.UpdatePositions()
+ gfx.Scene().CenterOn(gfx_ent_1)
+ else:
+ gfx_ent_2.UpdatePositions()
+ gfx.Scene().CenterOn(gfx_ent_2)
+ LogScript('RMSD: %.3f'%sd.rmsd)
class WindowMenu(QMenu):
def __init__(self, parent=None):
diff --git a/modules/gui/pymod/dng/superpositiondialog.py b/modules/gui/pymod/dng/superpositiondialog.py
index 4c22b4c96..3928adf7d 100644
--- a/modules/gui/pymod/dng/superpositiondialog.py
+++ b/modules/gui/pymod/dng/superpositiondialog.py
@@ -118,7 +118,7 @@ class SuperpositionDialog(QDialog):
def __init__(self, ent_one, ent_two, parent=None):
# class variables
- self.rmsd = 0.0
+ self.rmsd = None
self._mmethod_dict = {'number': 'number',
'index': 'index',
'local alignment': 'local-aln',
@@ -302,7 +302,6 @@ class SuperpositionDialog(QDialog):
self._chain_one.SetItems(self.ent_two, self.gfx_two)
self._chain_two.SetItems(self.ent_one, self.gfx_one)
self.reference = 1;
- return
def _MatchMethods(self):
methods=QComboBox(self)
--
GitLab