Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
bob.bio.vein
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bob
bob.bio.vein
Commits
a7b2f7f1
Commit
a7b2f7f1
authored
Mar 14, 2018
by
André Anjos
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Catch-up with changes to verafinger
parent
470b12f3
Pipeline
#18372
passed with stages
in 60 minutes and 15 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
11 deletions
+8
-11
bob/bio/vein/database/verafinger.py
bob/bio/vein/database/verafinger.py
+8
-11
No files found.
bob/bio/vein/database/verafinger.py
View file @
a7b2f7f1
...
...
@@ -36,10 +36,8 @@ class File(BioFile):
basedir
=
args
[
0
]
if
args
else
kwargs
[
'directory'
]
annotdir
=
os
.
path
.
join
(
basedir
,
'annotations'
,
'roi'
)
if
os
.
path
.
exists
(
annotdir
):
print
(
'loading annotations'
)
roi
=
self
.
__f
.
roi
(
args
[
0
])
return
AnnotatedArray
(
image
,
metadata
=
dict
(
roi
=
roi
))
print
(
'NOT loading annotations'
)
return
image
...
...
@@ -72,6 +70,8 @@ class Database(BioDatabase):
groups
=
self
.
convert_names_to_lowlevel
(
groups
,
self
.
low_level_group_names
,
self
.
high_level_group_names
)
if
protocol
.
endswith
(
'-va'
)
or
protocol
.
endswith
(
'-VA'
):
protocol
=
protocol
[:
-
3
]
return
self
.
_db
.
model_ids
(
groups
=
groups
,
protocol
=
protocol
)
...
...
@@ -81,15 +81,12 @@ class Database(BioDatabase):
groups
=
self
.
convert_names_to_lowlevel
(
groups
,
self
.
low_level_group_names
,
self
.
high_level_group_names
)
if
(
protocol
.
endswith
(
'-va'
)
or
protocol
.
endswith
(
'-VA'
))
and
\
purposes
==
'probe'
:
#the user actually means 'attack'
retval
=
self
.
_db
.
objects
(
groups
=
groups
,
protocol
=
protocol
[:
-
3
],
purposes
=
'attack'
,
model_ids
=
model_ids
,
**
kwargs
)
else
:
retval
=
self
.
_db
.
objects
(
groups
=
groups
,
protocol
=
protocol
,
purposes
=
purposes
,
model_ids
=
model_ids
,
**
kwargs
)
if
protocol
.
endswith
(
'-va'
)
or
protocol
.
endswith
(
'-VA'
):
protocol
=
protocol
[:
-
3
]
if
purposes
==
'probe'
:
purposes
=
'attack'
retval
=
self
.
_db
.
objects
(
groups
=
groups
,
protocol
=
protocol
,
purposes
=
purposes
,
model_ids
=
model_ids
,
**
kwargs
)
return
[
File
(
f
)
for
f
in
retval
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment