Skip to content
Snippets Groups Projects
Commit 440287b2 authored by Bienchen's avatar Bienchen
Browse files

Made 'cancel' button of the superposition dialog do absolutely nothing to the current scenery

parent f68f5966
No related branches found
No related tags found
No related merge requests found
...@@ -191,13 +191,14 @@ class SceneMenu(QMenu): ...@@ -191,13 +191,14 @@ class SceneMenu(QMenu):
i += 1 i += 1
gfx_ent_2 = sel.GetActiveNode(i) gfx_ent_2 = sel.GetActiveNode(i)
sd = superpositiondialog.SuperpositionDialog(gfx_ent_1, gfx_ent_2) sd = superpositiondialog.SuperpositionDialog(gfx_ent_1, gfx_ent_2)
if sd.reference == 0: if sd.rmsd != None:
gfx_ent_1.UpdatePositions() if sd.reference == 0:
gfx.Scene().CenterOn(gfx_ent_1) gfx_ent_1.UpdatePositions()
else: gfx.Scene().CenterOn(gfx_ent_1)
gfx_ent_2.UpdatePositions() else:
gfx.Scene().CenterOn(gfx_ent_2) gfx_ent_2.UpdatePositions()
LogScript('RMSD: %.3f'%sd.rmsd) gfx.Scene().CenterOn(gfx_ent_2)
LogScript('RMSD: %.3f'%sd.rmsd)
class WindowMenu(QMenu): class WindowMenu(QMenu):
def __init__(self, parent=None): def __init__(self, parent=None):
......
...@@ -118,7 +118,7 @@ class SuperpositionDialog(QDialog): ...@@ -118,7 +118,7 @@ class SuperpositionDialog(QDialog):
def __init__(self, ent_one, ent_two, parent=None): def __init__(self, ent_one, ent_two, parent=None):
# class variables # class variables
self.rmsd = 0.0 self.rmsd = None
self._mmethod_dict = {'number': 'number', self._mmethod_dict = {'number': 'number',
'index': 'index', 'index': 'index',
'local alignment': 'local-aln', 'local alignment': 'local-aln',
...@@ -302,7 +302,6 @@ class SuperpositionDialog(QDialog): ...@@ -302,7 +302,6 @@ class SuperpositionDialog(QDialog):
self._chain_one.SetItems(self.ent_two, self.gfx_two) self._chain_one.SetItems(self.ent_two, self.gfx_two)
self._chain_two.SetItems(self.ent_one, self.gfx_one) self._chain_two.SetItems(self.ent_one, self.gfx_one)
self.reference = 1; self.reference = 1;
return
def _MatchMethods(self): def _MatchMethods(self):
methods=QComboBox(self) methods=QComboBox(self)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment