Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
navipy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Olivier Bertrand
navipy
Commits
43284320
Commit
43284320
authored
6 years ago
by
Olivier Bertrand
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of gitlab.ub.uni-bielefeld.de:olivier.bertrand/navipy into develop
parents
b7f634d2
c284e610
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
navipy/database/__init__.py
+1
-1
1 addition, 1 deletion
navipy/database/__init__.py
navipy/sensors/renderer.py
+10
-1
10 additions, 1 deletion
navipy/sensors/renderer.py
with
11 additions
and
2 deletions
navipy/database/__init__.py
+
1
−
1
View file @
43284320
...
...
@@ -133,7 +133,7 @@ class DataBase():
for
col
in
self
.
normalisation_columns
:
self
.
tablecolumns
[
'
normalisation
'
][
col
]
=
'
real
'
if
self
.
create
is
False
:
if
(
self
.
create
is
False
)
or
(
os
.
path
.
exists
(
filename
))
:
self
.
_logger
.
info
(
'
Connect to database
'
)
if
os
.
path
.
exists
(
filename
)
or
filename
==
'
:memory:
'
:
...
...
This diff is collapsed.
Click to expand it.
navipy/sensors/renderer.py
+
10
−
1
View file @
43284320
...
...
@@ -89,7 +89,8 @@ class AbstractRender():
# Check if posorient is a valid one
# otherwise skip to next position
if
np
.
any
(
np
.
isnan
(
posorient
)):
# Skip because we can not render when night
# Skip because we can not render when nans
self
.
_logger
.
info
(
'
Skip nan frame_i : {}
'
.
format
(
frame_i
))
continue
# Avoid rerendering by checking if data already
# exist
...
...
@@ -110,6 +111,7 @@ class AbstractRender():
# The position-orientatios is valid (none nan)
# and the cmaxminrange has not already been assigned
# so the image need to be rendered
self
.
_logger
.
info
(
'
Update frame_i : {}
'
.
format
(
frame_i
))
scene
=
self
.
scene
(
posorient
)
check_scene
(
scene
)
scene
=
scene
[...,
0
]
...
...
@@ -552,6 +554,13 @@ class BlenderRender(AbstractRender):
:type posorient: pandas Series with multi-index
"""
if
isinstance
(
posorient
,
pd
.
Series
):
# set frame
cframe
=
int
(
posorient
.
name
)
if
cframe
>
bpy
.
context
.
scene
.
frame_end
:
bpy
.
context
.
scene
.
frame_end
=
cframe
if
cframe
<
bpy
.
context
.
scene
.
frame_start
:
bpy
.
context
.
scene
.
frame_start
=
cframe
bpy
.
context
.
scene
.
frame_current
=
cframe
# set roation mode
conv_found
=
False
index
=
posorient
.
index
...
...
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