diff --git a/CMakeLists.txt b/CMakeLists.txt index 24252fc..24712b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,4 +80,4 @@ find_package(nanobind CONFIG REQUIRED) install(TARGETS libspice COMPONENT python - LIBRARY DESTINATION "${CMAKE_SOURCE_DIR}/src/openalea/spice/") + LIBRARY DESTINATION "${SKBUILD_PLATLIB_DIR}/openalea/spice/") diff --git a/examples/python/plantgl-rad-scene/plantglRadScene.py b/examples/python/plantgl-rad-scene/plantglRadScene.py index 49c868a..c2fdd2e 100644 --- a/examples/python/plantgl-rad-scene/plantglRadScene.py +++ b/examples/python/plantgl-rad-scene/plantglRadScene.py @@ -1,16 +1,18 @@ -from openalea.spice.simulator import Simulator +from openalea.spice.simulator import * if __name__ == "__main__": simulator = Simulator(config_file="simulation.ini") - simulator.addVirtualDiskSensorsFromFile("./captors/captors_expe1.csv") - - # simulator.setupRender(Vec3(68.0, 1200.0, 1500.0), Vec3(1280.0, 860.0, 980.0), 75.0) - # simulator.n_samples = 2 - res = simulator.run() + simulator.setup() + simulator.run() + calibrated_res = simulator.calibrateResults("spectrum/chambre1_spectrum", + "points_calibration.csv") + simulator.results.writeResults() simulator.visualizeResults() + + # command visualiser Environnement PlantGL # ipython # %gui qt -# run planglRadScene.py +# run planglRadScene.py \ No newline at end of file diff --git a/examples/python/plantgl-rad-scene/writeplot.py b/examples/python/plantgl-rad-scene/writeplot.py index 27ccc7b..ce6c212 100644 --- a/examples/python/plantgl-rad-scene/writeplot.py +++ b/examples/python/plantgl-rad-scene/writeplot.py @@ -1,9 +1,8 @@ import os +import re -import pandas as pd import matplotlib.pyplot as plt -import numpy as np -import re +import pandas as pd # TODO: Make a good plot diff --git a/pyproject.toml b/pyproject.toml index e94f22c..f9a4931 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -63,7 +63,6 @@ channels = [ "conda-forge" ] dependencies = [ - "openalea.plantgl", "matplotlib-base", "make", "ninja", @@ -83,16 +82,17 @@ local_scheme = "no-local-version" [tool.scikit-build] metadata.version.provider = "scikit_build_core.metadata.setuptools_scm" -build-dir="./build/{wheel_tag}" +build-dir="build" sdist.include = ["*.so", "*.dylib", "*.dll", "*.pyd"] sdist.exclude = ["*.pyc", "*.pyo"] logging.level = "WARNING" build.verbose = true experimental = true +editable.rebuild = true [tool.scikit-build.cmake] build-type="Release" source-dir="." -[tool.scikit-build.wheel] -packages = ["src/openalea"] +[tool.scikit-build.wheel.packages] +"openalea/spice" = "src/openalea/spice"