Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fslpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michiel Cottaar
fslpy
Commits
ebd14e27
Commit
ebd14e27
authored
5 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
BF: Force mesh indices to be integers. Remove unnecessary Mesh.__new__.
parent
90fcc75d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fsl/data/mesh.py
+2
-10
2 additions, 10 deletions
fsl/data/mesh.py
with
2 additions
and
10 deletions
fsl/data/mesh.py
+
2
−
10
View file @
ebd14e27
...
@@ -154,14 +154,6 @@ class Mesh(notifier.Notifier, meta.Meta):
...
@@ -154,14 +154,6 @@ class Mesh(notifier.Notifier, meta.Meta):
"""
"""
def
__new__
(
cls
,
*
args
,
**
kwargs
):
"""
Create a ``Mesh``. We must override ``__new__``, otherwise the
:class:`Meta` and :class:`Notifier` ``__new__`` methods will not be
called correctly.
"""
return
super
(
Mesh
,
cls
).
__new__
(
cls
,
*
args
,
**
kwargs
)
def
__init__
(
self
,
def
__init__
(
self
,
indices
,
indices
,
name
=
'
mesh
'
,
name
=
'
mesh
'
,
...
@@ -189,7 +181,7 @@ class Mesh(notifier.Notifier, meta.Meta):
...
@@ -189,7 +181,7 @@ class Mesh(notifier.Notifier, meta.Meta):
self
.
__name
=
name
self
.
__name
=
name
self
.
__dataSource
=
dataSource
self
.
__dataSource
=
dataSource
self
.
__nvertices
=
indices
.
max
()
+
1
self
.
__nvertices
=
int
(
indices
.
max
()
)
+
1
self
.
__selected
=
None
self
.
__selected
=
None
# We potentially store two copies of
# We potentially store two copies of
...
@@ -197,7 +189,7 @@ class Mesh(notifier.Notifier, meta.Meta):
...
@@ -197,7 +189,7 @@ class Mesh(notifier.Notifier, meta.Meta):
# orders. The vindices dict stores refs
# orders. The vindices dict stores refs
# to one or the other for each vertex
# to one or the other for each vertex
# set.
# set.
self
.
__indices
=
np
.
asarray
(
indices
).
reshape
((
-
1
,
3
))
self
.
__indices
=
np
.
asarray
(
indices
,
dtype
=
np
.
int32
).
reshape
((
-
1
,
3
))
self
.
__fixedIndices
=
None
self
.
__fixedIndices
=
None
self
.
__vindices
=
collections
.
OrderedDict
()
self
.
__vindices
=
collections
.
OrderedDict
()
...
...
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