Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
schwede
openstructure
Commits
440287b2
Commit
440287b2
authored
13 years ago
by
Bienchen
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/gui/pymod/dng/menu.py
+8
-7
8 additions, 7 deletions
modules/gui/pymod/dng/menu.py
modules/gui/pymod/dng/superpositiondialog.py
+1
-2
1 addition, 2 deletions
modules/gui/pymod/dng/superpositiondialog.py
with
9 additions
and
9 deletions
modules/gui/pymod/dng/menu.py
+
8
−
7
View file @
440287b2
...
@@ -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
):
...
...
This diff is collapsed.
Click to expand it.
modules/gui/pymod/dng/superpositiondialog.py
+
1
−
2
View file @
440287b2
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment