Skip to content

Commit

Permalink
BRAYNS-619 Release 3.7.0. (#1240)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Adrien4193
Adrien4193 authored Mar 20, 2024
1 parent 7cc0f4a commit 28a0c04
Show file tree
Hide file tree
Showing 8 changed files with 264 additions and 17 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set(BUILD_SHARED_LIBS ON)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(Brayns VERSION 3.6.0)
project(Brayns VERSION 3.7.0)

# Extra CMake scripts
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake)
Expand Down
2 changes: 1 addition & 1 deletion python/brayns/version.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
# along with this library; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

VERSION = "3.6.0"
VERSION = "3.7.0"
"""Version tag of brayns Python package (major.minor.patch)."""
2 changes: 1 addition & 1 deletion python/doc/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
# built documents.
#
# The short X.Y version.
version = "3.6.0"
version = "3.7.0"
# The full version, including alpha/beta/rc tags.
release = version

Expand Down
20 changes: 9 additions & 11 deletions python/doc/source/jsonrpcapi/api_circuitexplorer_methods.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ This loader does not support loading binary data using 'upload-model'.
"load_soma": {
"description": "Load the soma section of the neuron",
"type": "boolean",
"default": true
"default": false
},
"radius_multiplier": {
"description": "Parameter to multiply all morphology sample radii by",
Expand All @@ -80,7 +80,7 @@ This loader does not support loading binary data using 'upload-model'.
"resampling": {
"description": "Minimum angle cosine between 2 segments to merge them (disabled if > 1)",
"type": "number",
"default": 0.9
"default": 2
},
"subsampling": {
"description": "Skip factor when converting samples into geometry (disabled if <= 1)",
Expand Down Expand Up @@ -190,7 +190,7 @@ This loader does not support loading binary data using 'upload-model'.
"load_soma": {
"description": "Load the soma section of the neuron",
"type": "boolean",
"default": true
"default": false
},
"radius_multiplier": {
"description": "Parameter to multiply all morphology sample radii by",
Expand All @@ -201,7 +201,7 @@ This loader does not support loading binary data using 'upload-model'.
"resampling": {
"description": "Minimum angle cosine between 2 segments to merge them (disabled if > 1)",
"type": "number",
"default": 0.9
"default": 2
},
"subsampling": {
"description": "Skip factor when converting samples into geometry (disabled if <= 1)",
Expand All @@ -220,9 +220,6 @@ This loader does not support loading binary data using 'upload-model'.
"maximum": 1
}
},
"required": [
"morphology_folder"
],
"additionalProperties": false
}

Expand Down Expand Up @@ -265,7 +262,7 @@ This loader does not support loading binary data using 'upload-model'.
"load_soma": {
"description": "Load the soma section of the neuron",
"type": "boolean",
"default": true
"default": false
},
"radius_multiplier": {
"description": "Parameter to multiply all morphology sample radii by",
Expand All @@ -276,7 +273,7 @@ This loader does not support loading binary data using 'upload-model'.
"resampling": {
"description": "Minimum angle cosine between 2 segments to merge them (disabled if > 1)",
"type": "number",
"default": 0.9
"default": 2
},
"subsampling": {
"description": "Skip factor when converting samples into geometry (disabled if <= 1)",
Expand Down Expand Up @@ -380,7 +377,7 @@ This loader does not support loading binary data using 'upload-model'.
"load_soma": {
"description": "Load the soma section of the neuron",
"type": "boolean",
"default": true
"default": false
},
"radius_multiplier": {
"description": "Parameter to multiply all morphology sample radii by",
Expand All @@ -391,7 +388,7 @@ This loader does not support loading binary data using 'upload-model'.
"resampling": {
"description": "Minimum angle cosine between 2 segments to merge them (disabled if > 1)",
"type": "number",
"default": 0.9
"default": 2
},
"subsampling": {
"description": "Skip factor when converting samples into geometry (disabled if <= 1)",
Expand Down Expand Up @@ -462,6 +459,7 @@ This loader does not support loading binary data using 'upload-model'.
"title": "VasculatureGeometrySettings",
"description": "Settings for vasculature geometry load (ignored for any non-vasculature population",
"type": "object",
"default": {},
"properties": {
"radius_multiplier": {
"description": "Factor to multiply all vasculature sample radii",
Expand Down
249 changes: 249 additions & 0 deletions python/doc/source/jsonrpcapi/api_core_methods.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3135,6 +3135,255 @@ Add a quad light which iluminates the scene on a specific area.

----

add-light-sphere
~~~~~~~~~~~~~~~~

Add a sphere or a point light (radius = 0).

**Params**:

.. jsonschema::

{
"type": "object",
"properties": {
"color": {
"description": "Light color RGB normalized",
"type": "array",
"default": [
1,
1,
1
],
"items": {
"type": "number"
},
"minItems": 3,
"maxItems": 3
},
"intensity": {
"description": "Light intensity",
"type": "number",
"default": 1,
"minimum": 0
},
"position": {
"description": "Light position XYZ",
"type": "array",
"default": [
0,
0,
0
],
"items": {
"type": "number"
},
"minItems": 3,
"maxItems": 3
},
"radius": {
"description": "Sphere radius",
"type": "number",
"default": 0
}
},
"additionalProperties": false
}

**Result**:

.. jsonschema::

{
"type": "object",
"properties": {
"bounds": {
"title": "Bounds",
"description": "Model bounds",
"type": "object",
"readOnly": true,
"properties": {
"max": {
"description": "Top front right corner XYZ",
"type": "array",
"readOnly": true,
"items": {
"type": "number"
},
"minItems": 3,
"maxItems": 3
},
"min": {
"description": "Bottom back left corner XYZ",
"type": "array",
"readOnly": true,
"items": {
"type": "number"
},
"minItems": 3,
"maxItems": 3
}
},
"required": [
"max",
"min"
],
"additionalProperties": false
},
"info": {
"title": "ModelInfo",
"description": "Model-specific info",
"type": "object",
"readOnly": true,
"properties": {
"base_transform": {
"title": "Transform",
"description": "Model transform",
"type": "object",
"readOnly": true,
"properties": {
"rotation": {
"description": "Rotation XYZW",
"type": "array",
"items": {
"type": "number"
},
"minItems": 4,
"maxItems": 4
},
"scale": {
"description": "Scale XYZ",
"type": "array",
"items": {
"type": "number"
},
"minItems": 3,
"maxItems": 3
},
"translation": {
"description": "Translation XYZ",
"type": "array",
"items": {
"type": "number"
},
"minItems": 3,
"maxItems": 3
}
},
"additionalProperties": false
},
"load_info": {
"title": "LoadInfo",
"description": "Model load info",
"type": "object",
"readOnly": true,
"properties": {
"load_parameters": {
"description": "Loader settings",
"readOnly": true
},
"loader_name": {
"description": "Loader name",
"type": "string",
"readOnly": true
},
"path": {
"description": "File path in case of file load type",
"type": "string",
"readOnly": true
},
"source": {
"description": "Model load source",
"type": "string",
"readOnly": true,
"enum": [
"from_file",
"from_blob",
"none"
]
}
},
"required": [
"load_parameters",
"loader_name",
"path",
"source"
],
"additionalProperties": false
},
"metadata": {
"description": "Model-specific metadata",
"type": "object",
"readOnly": true,
"additionalProperties": {
"type": "string"
}
}
},
"additionalProperties": false
},
"is_visible": {
"description": "Wether the model is being rendered or not",
"type": "boolean"
},
"model_id": {
"description": "Model ID",
"type": "integer",
"readOnly": true,
"minimum": 0
},
"model_type": {
"description": "Model type",
"type": "string",
"readOnly": true
},
"transform": {
"title": "Transform",
"description": "Model transform",
"type": "object",
"properties": {
"rotation": {
"description": "Rotation XYZW",
"type": "array",
"items": {
"type": "number"
},
"minItems": 4,
"maxItems": 4
},
"scale": {
"description": "Scale XYZ",
"type": "array",
"items": {
"type": "number"
},
"minItems": 3,
"maxItems": 3
},
"translation": {
"description": "Translation XYZ",
"type": "array",
"items": {
"type": "number"
},
"minItems": 3,
"maxItems": 3
}
},
"additionalProperties": false
}
},
"required": [
"bounds",
"info",
"model_id",
"model_type"
],
"additionalProperties": false
}

----

add-model
~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion python/doc/source/metadata.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "brayns",
"description": "Brayns python API",
"version": "3.6.0",
"version": "3.7.0",
"repository": {
"type": "git",
"url": "https://github.com/BlueBrain/Brayns.git"
Expand Down
2 changes: 1 addition & 1 deletion python/doc/source/pythonapi/core.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ light
-----

.. automodule:: brayns.core.light
:members: add_light, AmbientLight, clear_lights, DirectionalLight, Light, QuadLight
:members: add_light, AmbientLight, clear_lights, DirectionalLight, Light, QuadLight, SphereLight
:undoc-members:
:show-inheritance:

Expand Down
2 changes: 1 addition & 1 deletion python/setup.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = brayns
version = 3.6.0
version = 3.7.0
url = https://github.com/BlueBrain/Brayns
download_url = https://github.com/BlueBrain/Brayns
project_urls =
Expand Down

0 comments on commit 28a0c04

Please sign in to comment.