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
7951fac5
Commit
7951fac5
authored
14 years ago
by
Ansgar Philippsen
Browse files
Options
Downloads
Patches
Plain Diff
tweaks to gfx trace connectivity; fixed dcd loader error message
parent
f2fc43a3
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/gfx/src/impl/backbone_trace.cc
+2
-0
2 additions, 0 deletions
modules/gfx/src/impl/backbone_trace.cc
modules/io/src/mol/dcd_io.cc
+8
-2
8 additions, 2 deletions
modules/io/src/mol/dcd_io.cc
with
10 additions
and
2 deletions
modules/gfx/src/impl/backbone_trace.cc
+
2
−
0
View file @
7951fac5
...
...
@@ -38,6 +38,8 @@ bool in_sequence(const mol::ResidueHandle& r1, const mol::ResidueHandle& r2)
if
(
n2
.
GetInsCode
()
!=
'\0'
)
{
if
(
n1
.
NextInsertionCode
()
==
n2
)
return
true
;
}
if
(
mol
::
InSequence
(
r1
,
r2
))
return
true
;
// perhaps this fallback is not so good...
if
(
n1
.
GetNum
()
+
1
==
n2
.
GetNum
())
return
true
;
return
false
;
}
...
...
This diff is collapsed.
Click to expand it.
modules/io/src/mol/dcd_io.cc
+
8
−
2
View file @
7951fac5
...
...
@@ -188,12 +188,18 @@ mol::CoordGroupHandle load_dcd(const mol::AtomHandleList& alist2,
const
String
&
trj_fn
,
unsigned
int
stride
)
{
std
::
ifstream
istream
(
trj_fn
.
c_str
(),
std
::
ios
::
binary
);
if
(
!
istream
)
{
std
::
ostringstream
msg
;
msg
<<
"LoadCHARMMTraj: cannot open "
<<
trj_fn
;
throw
(
IOException
(
msg
.
str
()));
}
Profile
profile_load
(
"LoadCHARMMTraj"
);
mol
::
AtomHandleList
alist
(
alist2
);
std
::
sort
(
alist
.
begin
(),
alist
.
end
(),
less_index
);
std
::
ifstream
istream
(
trj_fn
.
c_str
(),
std
::
ios
::
binary
);
DCDHeader
header
;
bool
swap_flag
=
false
,
skip_flag
=
false
,
gap_flag
=
false
;
read_dcd_header
(
istream
,
header
,
swap_flag
,
skip_flag
,
gap_flag
);
...
...
@@ -315,7 +321,7 @@ mol::CoordGroupHandle LoadCHARMMTraj(const mol::EntityHandle& ent,
DCDCoordSource
*
source
=
new
DCDCoordSource
(
alist
,
trj_fn
,
stride
);
return
mol
::
CoordGroupHandle
(
DCDCoordSourcePtr
(
source
));
}
LOG_INFO
(
"Importing CHARMM trajectory with lazy_load=false"
);
LOG_INFO
(
"Importing CHARMM trajectory with lazy_load=false"
);
return
load_dcd
(
alist
,
trj_fn
,
stride
);
}
...
...
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