mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-08-12 02:23:34 +00:00
75c9da5098
Rename the two overloaded model identifiers and make object_id assignment single-authority, fixing a pick -> properties mismatch. Identifiers: - Per-model UUID fed_id -> model_id; the uint32 runtime handle model_id -> session_model_id (SessionState accessors + mirror hashes renamed to match). "fed_id" was a misnomer -- the federation is the whole collection, not one model. object_id assignment (fixes wrong class on click): - Producers (GeometryStreamer, .ifcview sidecar) now stamp model-LOCAL object_ids; ViewportCore::applyCachedModel is the sole authority that assigns the session-global id (base + local). Removed SceneLoader::next_object_id_, GeometryStreamer::lastObjectId(), and the streamer's start_object_id parameter. - The element table is stamped by the same base on both load paths (applySidecarData and onStreamerFinished), so registry ids match the ids pick returns. Previously the sidecar path double-rebased instances vs the registry (click IfcSite -> showed IfcDoor); the live-stream path had the same latent mismatch. Both closed. Naming / cleanup: - SceneLoader::addFiles -> queueModels; startStreamLoadFor -> loadFromGeometryStreamer; readSidecarMetadataOnly -> readSidecarMetadata. - Federation::addModel takes an explicit display_name (no QFileInfo fallback); callers pass QFileInfo(path).fileName(). - Disambiguate cryptic short locals (d->sidecar, m->model, c->chunk, ...) in SceneLoader, Federation, ViewportWindow, AreaMeasurement, SectionGizmoRenderer, and the SidecarData/SidecarReadPlan spots in ViewportCore. Tests: 125/125 pass. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
125 lines
5.1 KiB
C++
125 lines
5.1 KiB
C++
// This file was generated with the assistance of an AI coding tool.
|
|
/********************************************************************************
|
|
* *
|
|
* This file is part of Bonsai. *
|
|
* *
|
|
* Bonsai is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3.0 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* Bonsai is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
* GNU General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
* *
|
|
********************************************************************************/
|
|
|
|
#include "ElementRegistry.h"
|
|
|
|
#include "../ifcviewer/GeometryStreamer.h"
|
|
#include "../ifcviewer/SceneLoader.h"
|
|
#include "../ifcviewer/SidecarCache.h"
|
|
|
|
namespace bonsaiviewer {
|
|
|
|
ElementRegistry::ElementRegistry(QObject* parent)
|
|
: QObject(parent)
|
|
{
|
|
}
|
|
|
|
void ElementRegistry::bindLoader(SceneLoader* loader) {
|
|
loader_ = loader;
|
|
connect(loader, &SceneLoader::sidecarElementsReady,
|
|
this, &ElementRegistry::onSidecarElementsReady);
|
|
connect(loader, &SceneLoader::streamedElementsReady,
|
|
this, &ElementRegistry::onStreamedElementsReady);
|
|
}
|
|
|
|
void ElementRegistry::clear() {
|
|
elements_.clear();
|
|
}
|
|
|
|
void ElementRegistry::removeModel(uint32_t session_model_id) {
|
|
for (auto it = elements_.begin(); it != elements_.end();) {
|
|
if (it->second.session_model_id == session_model_id) {
|
|
it = elements_.erase(it);
|
|
} else {
|
|
++it;
|
|
}
|
|
}
|
|
}
|
|
|
|
std::vector<BasicElementInfo> ElementRegistry::basicElementInfoForModel(uint32_t session_model_id) const {
|
|
std::vector<BasicElementInfo> result;
|
|
result.reserve(elements_.size());
|
|
for (const auto& [object_id, info] : elements_) {
|
|
(void)object_id;
|
|
if (info.session_model_id != session_model_id) continue;
|
|
result.push_back(info);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
std::optional<BasicElementInfo> ElementRegistry::findBasicElementInfo(uint32_t object_id) const {
|
|
auto it = elements_.find(object_id);
|
|
if (it == elements_.end()) return std::nullopt;
|
|
return it->second;
|
|
}
|
|
|
|
std::optional<express::Base> ElementRegistry::findEntity(uint32_t object_id) const {
|
|
if (!loader_) return std::nullopt;
|
|
|
|
auto info = findBasicElementInfo(object_id);
|
|
if (!info) return std::nullopt;
|
|
|
|
auto* file = loader_->ifcFile(info->session_model_id);
|
|
if (!file) return std::nullopt;
|
|
|
|
try {
|
|
auto instance = file->instance_by_id(info->ifc_id);
|
|
if (!instance) return std::nullopt;
|
|
return instance;
|
|
} catch (...) {
|
|
return std::nullopt;
|
|
}
|
|
}
|
|
|
|
void ElementRegistry::onSidecarElementsReady(uint32_t /*session_model_id*/,
|
|
std::vector<ElementTableRecord> elements,
|
|
std::string string_table) {
|
|
auto string_from_table = [&](uint32_t offset, uint32_t length) -> QString {
|
|
if (length == 0 || offset + length > string_table.size()) return {};
|
|
return QString::fromStdString(string_table.substr(offset, length));
|
|
};
|
|
|
|
for (const auto& packed_element : elements) {
|
|
BasicElementInfo info;
|
|
info.object_id = packed_element.object_id;
|
|
info.session_model_id = packed_element.session_model_id;
|
|
info.ifc_id = packed_element.ifc_id;
|
|
info.guid = string_from_table(packed_element.guid_offset, packed_element.guid_length);
|
|
info.name = string_from_table(packed_element.name_offset, packed_element.name_length);
|
|
info.type = string_from_table(packed_element.type_offset, packed_element.type_length);
|
|
elements_[info.object_id] = info;
|
|
}
|
|
}
|
|
|
|
void ElementRegistry::onStreamedElementsReady(uint32_t /*session_model_id*/, std::vector<ElementInfo> elements) {
|
|
for (const auto& element : elements) {
|
|
BasicElementInfo info;
|
|
info.object_id = element.object_id;
|
|
info.session_model_id = element.session_model_id;
|
|
info.ifc_id = element.ifc_id;
|
|
info.guid = QString::fromStdString(element.guid);
|
|
info.name = QString::fromStdString(element.name);
|
|
info.type = QString::fromStdString(element.type);
|
|
elements_[info.object_id] = info;
|
|
}
|
|
}
|
|
|
|
} // namespace bonsaiviewer
|