Added neuron connectivity matrix visualizer #220
Conversation
favreau
force-pushed
the
master
branch
5 times, most recently
from
f5e84aa to
cf36617
Compare
brayns/Brayns.cpp
Outdated
| @@ -85,6 +86,10 @@ struct Brayns::Impl | |||
| _parametersManager->parse(argc, argv); | |||
| _parametersManager->print(); | |||
|
|
|||
| // Initialize Mesh loader | |||
| _meshLoader.reset( | |||
There was a problem hiding this comment.
why pointer? can we not have a local meshloader everytime we need one? Does it have to be a permanent member of Brayns.cpp?
There was a problem hiding this comment.
We need a global meshloader indeed (and it's a pain). The reason behind it is that triangle faces use indices to vertices. When you load several meshes from different files, indices have to remain consistent. We could have many mesh loaders, but they would still have to aggregate at some point, so using a single one is the simple solution.
There was a problem hiding this comment.
the pointer is still not necessary. using proper initialization order in ctor should suffice
brayns/Brayns.cpp
Outdated
| @@ -521,6 +528,21 @@ struct Brayns::Impl | |||
|
|
|||
| #if (BRAYNS_USE_BRION) | |||
| /** | |||
| Loads data from a neuron matrix file (command line parameter | |||
| --matrix-file) | |||
There was a problem hiding this comment.
--connectivity-file rather than matrix? Sounds too generic imo. In the end, everything is a matrix :)
brayns/io/MatrixLoader.cpp
Outdated
| @@ -0,0 +1,276 @@ | |||
| /* Copyright (c) 2015-2017, EPFL/Blue Brain Project | |||
| * All rights reserved. Do not distribute without permission. | |||
| * Responsible Author: Jafet Villafranca Diaz <jafet.villafrancadiaz@epfl.ch> | |||
There was a problem hiding this comment.
Yep, he initiated the work. I added me, but I am not removing him ;)
brayns/io/MatrixLoader.cpp
Outdated
| * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| */ | ||
|
|
||
| #include <H5Cpp.h> |
There was a problem hiding this comment.
h5cpp is deprecated, use highfive instead. Or coordinate with Mohammed and Juan to get this into brion, where highfive is already used.
brayns/io/MeshLoader.cpp
Outdated
| _geometryParameters.getCircuitMeshFolder(); | ||
| auto meshFilenamePattern = | ||
| _geometryParameters.getCircuitMeshFilenamePattern(); | ||
| std::string gidAsString = std::to_string(gid); |
| @@ -55,7 +55,6 @@ class MeshLoader | |||
| * @return true if the file was successfully imported. False otherwise. | |||
| */ | |||
| bool importMeshFromFile(const std::string& filename, Scene& scene, | |||
| @@ -241,6 +241,16 @@ class GeometryParameters : public AbstractParameters | |||
| * Return the full path of the file containing a scene description | |||
| */ | |||
| std::string getSceneFile() const { return _sceneFile; }; | |||
| /** File containing neuron matrix */ | |||
| std::string getMatrixFile() const { return _matrixFile; } | |||
There was a problem hiding this comment.
const ref for all the returns here please
brayns/io/MeshLoader.h
Outdated
| @@ -39,7 +39,7 @@ namespace brayns | |||
| class MeshLoader | |||
| { | |||
| public: | |||
| MeshLoader(GeometryParameters& geometryParameters); | |||
| MeshLoader(); | |||
There was a problem hiding this comment.
why removed? the geometry params are always the same, so giving them once in the construction is fine.
| @@ -241,6 +241,22 @@ class GeometryParameters : public AbstractParameters | |||
| * Return the full path of the file containing a scene description | |||
| */ | |||
| std::string getSceneFile() const { return _sceneFile; }; | |||
| /** File containing neuron matrix */ | |||
| std::string getConnectivityFile() const { return _connectivityFile; } | |||
There was a problem hiding this comment.
still no const refs here
No description provided.