From 606928d5ade464226860f6682f75bbebd7d764a0 Mon Sep 17 00:00:00 2001 From: Mikhail Svechnikov <svechnikovmv@gmail.com> Date: Tue, 30 Jul 2024 18:07:34 +0200 Subject: [PATCH] upd var name --- GUI/View/Realspace/RealspaceBuilder.cpp | 2 +- Img3D/Type/SceneGeometry.h | 2 +- Sample/Interface/RoughnessMap.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/GUI/View/Realspace/RealspaceBuilder.cpp b/GUI/View/Realspace/RealspaceBuilder.cpp index ba58c756676..60fd44dc828 100644 --- a/GUI/View/Realspace/RealspaceBuilder.cpp +++ b/GUI/View/Realspace/RealspaceBuilder.cpp @@ -105,7 +105,7 @@ std::unique_ptr<const double2d_t> layerRoughnessMap(const LayerItem& layerItem, if (const auto* br = dynamic_cast<const BasicRoughnessItem*>(layerItem.certainRoughness())) { auto roughness = LayerRoughness(br->sigma().dVal(), br->hurst().dVal(), br->lateralCorrelationLength().dVal()); - int n = sceneGeometry.roughnessResolution; + int n = sceneGeometry.numRoughnessPointsAlongAxis; double L = 2 * sceneGeometry.layerSize; auto rmap = RoughnessMap(n, n, L, L, &roughness, seed); // seed < 0 ==> random every time result.reset(new double2d_t(rmap.generateMap())); diff --git a/Img3D/Type/SceneGeometry.h b/Img3D/Type/SceneGeometry.h index a131ccd1332..4bc389a724f 100644 --- a/Img3D/Type/SceneGeometry.h +++ b/Img3D/Type/SceneGeometry.h @@ -21,7 +21,7 @@ struct SceneGeometry { double layerBorderWidth = 5.0; double topOrBottomLayerThickness = 25.0; double layerMinimumThickness = 2.0; - unsigned roughnessResolution = 256; + unsigned numRoughnessPointsAlongAxis = 256; unsigned maxNumberOfParticlesToShow = 20000; }; diff --git a/Sample/Interface/RoughnessMap.cpp b/Sample/Interface/RoughnessMap.cpp index fb43819d4a6..0e40f37a4f7 100644 --- a/Sample/Interface/RoughnessMap.cpp +++ b/Sample/Interface/RoughnessMap.cpp @@ -178,7 +178,7 @@ RoughnessMap::double2d_t RoughnessMap::applyHeightsToSpectrum(const double2d_t& // flatten spectral map auto s_map_flat = Vec::flatten(s_map); - // sort and remember the original potitions + // sort and remember the original positions std::vector<std::pair<double, size_t>> s_map_indexed(s_map_flat.size()); for (size_t i = 0; i < s_map_flat.size(); i++) s_map_indexed[i] = std::make_pair(s_map_flat[i], i); -- GitLab