From 986c9b629ee90eae6f591d4af07dd7f9b01cdbba Mon Sep 17 00:00:00 2001 From: rodrigobasilio2022 Date: Wed, 20 Mar 2024 11:12:18 -0300 Subject: [PATCH] refactor(code): Adapt api to new data structure --- Examples/Geometry/AxesActor/index.js | 4 +-- Sources/Rendering/Core/AxesActor/index.js | 38 ++++++----------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/Examples/Geometry/AxesActor/index.js b/Examples/Geometry/AxesActor/index.js index 4e2ef4d9823..16dd0d2e3cf 100644 --- a/Examples/Geometry/AxesActor/index.js +++ b/Examples/Geometry/AxesActor/index.js @@ -4,7 +4,7 @@ import '@kitware/vtk.js/favicon'; import '@kitware/vtk.js/Rendering/Profiles/Geometry'; import macro from '@kitware/vtk.js/macros'; -import vtkAxesActor from 'vtk.js/Sources/Rendering/Core/AxesActor'; +import vtkAxesActor from '@kitware/vtk.js/Rendering/Core/AxesActor'; import vtkFullScreenRenderWindow from '@kitware/vtk.js/Rendering/Misc/FullScreenRenderWindow'; import controlPanel from './controlPanel.html'; @@ -18,7 +18,7 @@ console.warn( // ---------------------------------------------------------------------------- const fullScreenRenderer = vtkFullScreenRenderWindow.newInstance({ - background: [0.9, 0.9, 0.9], + background: [0.2, 0.3, 0.4], }); const renderer = fullScreenRenderer.getRenderer(); const renderWindow = fullScreenRenderer.getRenderWindow(); diff --git a/Sources/Rendering/Core/AxesActor/index.js b/Sources/Rendering/Core/AxesActor/index.js index 1efe562547e..ca7db99a96c 100644 --- a/Sources/Rendering/Core/AxesActor/index.js +++ b/Sources/Rendering/Core/AxesActor/index.js @@ -123,40 +123,22 @@ function vtkAxesActor(publicAPI, model) { publicAPI.update(); const _debouncedUpdate = macro.debounce(publicAPI.update, 0); - publicAPI.setXAxisColor = (color) => { - model.xConfig.color = color; - _debouncedUpdate(); - }; - - publicAPI.setYAxisColor = (color) => { - model.yConfig.color = color; - _debouncedUpdate(); - }; + publicAPI.setXAxisColor = (color) => + publicAPI.setXConfig({ ...publicAPI.getXConfig(), color }); - publicAPI.setZAxisColor = (color) => { - model.zConfig.color = color; - _debouncedUpdate(); - }; + publicAPI.setYAxisColor = (color) => + publicAPI.setYConfig({ ...publicAPI.getYConfig(), color }); - publicAPI.getXAxisColor = (color) => - model.xConfig?.color || model.config?.color; + publicAPI.setZAxisColor = (color) => + publicAPI.setZConfig({ ...publicAPI.getZConfig(), color }); - publicAPI.getYAxisColor = (color) => - model.yConfig?.color || model.config?.color; + publicAPI.getXAxisColor = () => model.getXConfig().color; - publicAPI.getZAxisColor = (color) => - model.zConfig?.color || model.config?.color; + publicAPI.getYAxisColor = () => model.getYConfig().color; - const { setConfig } = publicAPI; - - publicAPI.setConfig = (c) => { - if (setConfig(c)) { - _debouncedUpdate(); - return true; - } - return false; - }; + publicAPI.getZAxisColor = () => model.getZConfig().color; + model._onConfigChanged = _debouncedUpdate; model._onXConfigChanged = _debouncedUpdate; model._onYConfigChanged = _debouncedUpdate; model._onZConfigChanged = _debouncedUpdate;