Skip to content

Commit 8f4fbcc

Browse files
author
Cyrille Favreau
authored
Merge pull request #187 from favreau/master
Added SQL filter to models metadata
2 parents 60478f7 + 90cc4f8 commit 8f4fbcc

6 files changed

Lines changed: 20 additions & 13 deletions

File tree

bioexplorer/core/plugin/atlas/Atlas.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,11 @@ void Atlas::_load()
116116
auto& container = containers[i];
117117
container.commitToModel();
118118
}
119-
ModelMetadata metadata = {{"Number of regions",
120-
std::to_string(regions.size())},
121-
{"Number of cells", std::to_string(nbCells)}};
119+
const ModelMetadata metadata = {
120+
{"Number of regions", std::to_string(regions.size())},
121+
{"Number of cells", std::to_string(nbCells)},
122+
{"Cell SQL filter", _details.cellSqlFilter},
123+
{"Region SQL filter", _details.regionSqlFilter}};
122124

123125
_modelDescriptor.reset(new brayns::ModelDescriptor(std::move(model),
124126
_details.assemblyName,

bioexplorer/core/plugin/connectomics/synapses/SynapseEfficacy.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ void SynapseEfficacy::_buildModel()
7878
container.commitToModel();
7979
PLUGIN_INFO(1, "");
8080

81-
const ModelMetadata metadata = {
82-
{"Number of synapses", std::to_string(nbSynapses)}};
81+
const ModelMetadata metadata = {{"Number of synapses",
82+
std::to_string(nbSynapses)},
83+
{"SQL filter", _details.sqlFilter}};
8384

8485
_modelDescriptor.reset(new brayns::ModelDescriptor(std::move(model),
8586
_details.assemblyName,

bioexplorer/core/plugin/connectomics/whitematter/WhiteMatter.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@ void WhiteMatter::_buildModel()
9797
container.commitToModel();
9898
PLUGIN_INFO(1, "");
9999

100-
const ModelMetadata metadata = {
101-
{"Number of streamlines", std::to_string(nbStreamlines)}};
100+
const ModelMetadata metadata = {{"Number of streamlines",
101+
std::to_string(nbStreamlines)},
102+
{"SQL filter", _details.sqlFilter}};
102103

103104
_modelDescriptor.reset(new brayns::ModelDescriptor(std::move(model),
104105
_details.assemblyName,

bioexplorer/core/plugin/morphologies/Astrocytes.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,9 @@ void Astrocytes::_buildModel(const doubles& radii)
295295
container.commitToModel();
296296
}
297297

298-
ModelMetadata metadata = {
299-
{"Number of astrocytes", std::to_string(somas.size())}};
298+
const ModelMetadata metadata = {{"Number of astrocytes",
299+
std::to_string(somas.size())},
300+
{"SQL filter", _details.sqlFilter}};
300301

301302
_modelDescriptor.reset(new brayns::ModelDescriptor(std::move(model),
302303
_details.assemblyName,

bioexplorer/core/plugin/morphologies/Neurons.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,11 @@ void Neurons::_buildNeurons()
180180
container.commitToModel();
181181
}
182182

183-
ModelMetadata metadata = {
183+
const ModelMetadata metadata = {
184184
{"Number of Neurons", std::to_string(somas.size())},
185185
{"Number of Spines", std::to_string(_nbSpines)},
186-
};
186+
{"SQL node filter", _details.sqlNodeFilter},
187+
{"SQL section filter", _details.sqlSectionFilter}};
187188

188189
_modelDescriptor.reset(new brayns::ModelDescriptor(std::move(model),
189190
_details.assemblyName,

bioexplorer/core/plugin/vasculature/Vasculature.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,9 @@ void Vasculature::_buildModel(const doubles& radii)
378378
}
379379
PLUGIN_INFO(1, "");
380380

381-
const ModelMetadata metadata = {
382-
{"Number of nodes", std::to_string(_nbNodes)}};
381+
const ModelMetadata metadata = {{"Number of nodes",
382+
std::to_string(_nbNodes)},
383+
{"SQL filter", _details.sqlFilter}};
383384

384385
_modelDescriptor.reset(new brayns::ModelDescriptor(std::move(model),
385386
_details.assemblyName,

0 commit comments

Comments
 (0)