diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index e4377c5dd2..e4a185a6f3 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -687,7 +687,7 @@ if(BUILD_IFCVIEWER) add_subdirectory(../src/ifcviewer ifcviewer) add_subdirectory(../src/ifcviewer-minimal ifcviewer-minimal) - add_subdirectory(../src/ifcviewer-full ifcviewer-full) + add_subdirectory(../src/bonsaiviewer bonsaiviewer) endif() # Cmake uninstall target diff --git a/src/ifcviewer-full/CMakeLists.txt b/src/bonsaiviewer/CMakeLists.txt similarity index 93% rename from src/ifcviewer-full/CMakeLists.txt rename to src/bonsaiviewer/CMakeLists.txt index a4ad6e25d1..a7648fef7a 100644 --- a/src/ifcviewer-full/CMakeLists.txt +++ b/src/bonsaiviewer/CMakeLists.txt @@ -18,12 +18,12 @@ # # ################################################################################ -message("Running CMakeLists.txt in /src/ifcviewer-full") +message("Running CMakeLists.txt in /src/bonsaiviewer") set(QT_VERSION 6 CACHE STRING "Qt version") find_package(Qt${QT_VERSION} COMPONENTS Core CorePrivate Gui Widgets Svg REQUIRED PATHS ${QT_DIR}) -set(IFCVIEWER_FULL_FILES +set(BONSAIVIEWER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ElementRegistry.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ElementRegistry.h @@ -98,19 +98,19 @@ set(IFCVIEWER_FULL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/modules/viewport/Commands.h ${CMAKE_CURRENT_SOURCE_DIR}/modules/viewport/View.cpp ${CMAKE_CURRENT_SOURCE_DIR}/modules/viewport/View.h - ${CMAKE_CURRENT_SOURCE_DIR}/ifcviewer_full_resources.qrc + ${CMAKE_CURRENT_SOURCE_DIR}/bonsaiviewer_resources.qrc ) -add_executable(IfcViewerFull ${IFCVIEWER_FULL_FILES}) +add_executable(BonsaiViewer ${BONSAIVIEWER_FILES}) -set_target_properties(IfcViewerFull PROPERTIES +set_target_properties(BonsaiViewer PROPERTIES AUTOMOC ON AUTORCC ON WIN32_EXECUTABLE ON MACOSX_BUNDLE ON ) -target_link_libraries(IfcViewerFull PRIVATE +target_link_libraries(BonsaiViewer PRIVATE IfcViewer Qt${QT_VERSION}::Core Qt${QT_VERSION}::CorePrivate @@ -119,5 +119,5 @@ target_link_libraries(IfcViewerFull PRIVATE Qt${QT_VERSION}::Widgets ) -install(TARGETS IfcViewerFull EXPORT ${IFCOPENSHELL_EXPORT_TARGETS}) -ifcopenshell_deploy_qt_runtime(IfcViewerFull) +install(TARGETS BonsaiViewer EXPORT ${IFCOPENSHELL_EXPORT_TARGETS}) +ifcopenshell_deploy_qt_runtime(BonsaiViewer) diff --git a/src/ifcviewer-full/ElementRegistry.cpp b/src/bonsaiviewer/ElementRegistry.cpp similarity index 98% rename from src/ifcviewer-full/ElementRegistry.cpp rename to src/bonsaiviewer/ElementRegistry.cpp index 295c286e65..d633e70f17 100644 --- a/src/ifcviewer-full/ElementRegistry.cpp +++ b/src/bonsaiviewer/ElementRegistry.cpp @@ -24,7 +24,7 @@ #include "../ifcviewer/SceneLoader.h" #include "../ifcviewer/SidecarCache.h" -namespace ifcviewerfull { +namespace bonsaiviewer { ElementRegistry::ElementRegistry(QObject* parent) : QObject(parent) @@ -123,4 +123,4 @@ void ElementRegistry::onStreamedElementsReady(uint32_t /*mid*/, std::vector elements_; }; -} // namespace ifcviewerfull +} // namespace bonsaiviewer #endif diff --git a/src/ifcviewer-full/MainWindow.cpp b/src/bonsaiviewer/MainWindow.cpp similarity index 94% rename from src/ifcviewer-full/MainWindow.cpp rename to src/bonsaiviewer/MainWindow.cpp index a22aa68dff..75adde0fc9 100644 --- a/src/ifcviewer-full/MainWindow.cpp +++ b/src/bonsaiviewer/MainWindow.cpp @@ -56,12 +56,12 @@ #include #include -namespace ifcviewerfull::shell { +namespace bonsaiviewer::shell { MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) { - session_state_ = new ifcviewerfull::SessionState(this); + session_state_ = new bonsaiviewer::SessionState(this); auto on_mutated = [this]() { setWindowModified(true); updateWindowTitle(); @@ -70,11 +70,11 @@ MainWindow::MainWindow(QWidget* parent) setWindowModified(false); updateWindowTitle(); }; - connect(session_state_, &ifcviewerfull::SessionState::federationChanged, this, on_mutated); - connect(session_state_, &ifcviewerfull::SessionState::modelsChanged, this, on_mutated); - connect(session_state_, &ifcviewerfull::SessionState::projectReset, this, on_clean_state); - connect(session_state_, &ifcviewerfull::SessionState::projectOpened, this, on_clean_state); - connect(session_state_, &ifcviewerfull::SessionState::projectSaved, this, on_clean_state); + connect(session_state_, &bonsaiviewer::SessionState::federationChanged, this, on_mutated); + connect(session_state_, &bonsaiviewer::SessionState::modelsChanged, this, on_mutated); + connect(session_state_, &bonsaiviewer::SessionState::projectReset, this, on_clean_state); + connect(session_state_, &bonsaiviewer::SessionState::projectOpened, this, on_clean_state); + connect(session_state_, &bonsaiviewer::SessionState::projectSaved, this, on_clean_state); setupChrome(); setupViewport(); setupPanels(); @@ -443,22 +443,22 @@ void MainWindow::setupStatus() { status_perf_label_->setVisible(show); if (!show) status_perf_label_->clear(); }); - connect(session_state_, &ifcviewerfull::SessionState::statusMessageChanged, + connect(session_state_, &bonsaiviewer::SessionState::statusMessageChanged, this, [this](const QString& mode, const QString& detail) { status_mode_label_->setText(mode); status_selection_label_->setText(detail); }); - connect(session_state_, &ifcviewerfull::SessionState::progressBegan, this, [this](const QString&) { + connect(session_state_, &bonsaiviewer::SessionState::progressBegan, this, [this](const QString&) { // Start in indeterminate mode (spinning bar). The first concrete // setProgress(...) call below switches it to a determinate 0-100 bar. status_progress_bar_->setRange(0, 0); status_progress_bar_->setVisible(true); }); - connect(session_state_, &ifcviewerfull::SessionState::progressChanged, this, [this](int percent) { + connect(session_state_, &bonsaiviewer::SessionState::progressChanged, this, [this](int percent) { if (status_progress_bar_->maximum() == 0) status_progress_bar_->setRange(0, 100); status_progress_bar_->setValue(percent); }); - connect(session_state_, &ifcviewerfull::SessionState::progressEnded, this, [this]() { + connect(session_state_, &bonsaiviewer::SessionState::progressEnded, this, [this]() { status_progress_bar_->setVisible(false); }); session_state_->setStatusMessage("Ready", "No selection"); @@ -471,9 +471,9 @@ void MainWindow::setupLoader() { // Load errors surface through SessionState as a session-level signal; the // status text + progress are already cleared there, we only show the modal. - connect(session_state_, &ifcviewerfull::SessionState::loadError, this, + connect(session_state_, &bonsaiviewer::SessionState::loadError, this, [this](const QString& message) { - QMessageBox::warning(this, "IfcViewer", message); + QMessageBox::warning(this, "Bonsai Viewer", message); }); connect(viewport_widget_->viewport(), &ViewportWindow::frameStatsUpdated, this, @@ -500,12 +500,12 @@ void MainWindow::updateWindowTitle() { auto* federation = session_state_->federation(); const QString project_path = federation->filePath(); if (project_path.isEmpty() && federation->models().empty()) { - setWindowTitle("IfcOpenShell Interface"); + setWindowTitle("Bonsai Viewer"); } else if (project_path.isEmpty()) { - setWindowTitle("untitled[*] - IfcOpenShell Interface"); + setWindowTitle("untitled[*] - Bonsai Viewer"); } else { - setWindowTitle(QFileInfo(project_path).fileName() + "[*] - IfcOpenShell Interface"); + setWindowTitle(QFileInfo(project_path).fileName() + "[*] - Bonsai Viewer"); } } -} // namespace ifcviewerfull::shell +} // namespace bonsaiviewer::shell diff --git a/src/ifcviewer-full/MainWindow.h b/src/bonsaiviewer/MainWindow.h similarity index 65% rename from src/ifcviewer-full/MainWindow.h rename to src/bonsaiviewer/MainWindow.h index 0ff2eec5c9..6b83148815 100644 --- a/src/ifcviewer-full/MainWindow.h +++ b/src/bonsaiviewer/MainWindow.h @@ -30,18 +30,18 @@ class QDockWidget; class QProgressBar; class QStackedWidget; class QToolButton; -namespace ifcviewerfull { class SessionState; } -namespace ifcviewerfull::components { class TabBar; } -namespace ifcviewerfull::modules::models { class ModelsPanel; } -namespace ifcviewerfull::modules::models { class ModelsPanelView; } -namespace ifcviewerfull::modules::spatial_hierarchy { class SpatialHierarchyPanel; } -namespace ifcviewerfull::modules::spatial_hierarchy { class SpatialHierarchyPanelView; } -namespace ifcviewerfull::modules::properties { class PropertiesPanel; } -namespace ifcviewerfull::modules::properties { class PropertiesPanelView; } -namespace ifcviewerfull::modules::viewport { class ViewportView; } -namespace ifcviewerfull::modules::viewport { class ViewportPanel; } +namespace bonsaiviewer { class SessionState; } +namespace bonsaiviewer::components { class TabBar; } +namespace bonsaiviewer::modules::models { class ModelsPanel; } +namespace bonsaiviewer::modules::models { class ModelsPanelView; } +namespace bonsaiviewer::modules::spatial_hierarchy { class SpatialHierarchyPanel; } +namespace bonsaiviewer::modules::spatial_hierarchy { class SpatialHierarchyPanelView; } +namespace bonsaiviewer::modules::properties { class PropertiesPanel; } +namespace bonsaiviewer::modules::properties { class PropertiesPanelView; } +namespace bonsaiviewer::modules::viewport { class ViewportView; } +namespace bonsaiviewer::modules::viewport { class ViewportPanel; } -namespace ifcviewerfull::shell { +namespace bonsaiviewer::shell { class MainWindow : public QMainWindow { Q_OBJECT @@ -67,26 +67,26 @@ private: QLabel* status_selection_label_ = nullptr; QLabel* status_perf_label_ = nullptr; QProgressBar* status_progress_bar_ = nullptr; - ifcviewerfull::components::TabBar* ribbon_tabs_ = nullptr; + bonsaiviewer::components::TabBar* ribbon_tabs_ = nullptr; QStackedWidget* ribbon_pages_ = nullptr; - ifcviewerfull::modules::viewport::ViewportPanel* viewport_widget_ = nullptr; - ifcviewerfull::modules::viewport::ViewportView* viewport_view_ = nullptr; - ifcviewerfull::SessionState* session_state_ = nullptr; - ifcviewerfull::modules::models::ModelsPanel* models_panel_ = nullptr; - ifcviewerfull::modules::spatial_hierarchy::SpatialHierarchyPanel* spatial_panel_ = nullptr; + bonsaiviewer::modules::viewport::ViewportPanel* viewport_widget_ = nullptr; + bonsaiviewer::modules::viewport::ViewportView* viewport_view_ = nullptr; + bonsaiviewer::SessionState* session_state_ = nullptr; + bonsaiviewer::modules::models::ModelsPanel* models_panel_ = nullptr; + bonsaiviewer::modules::spatial_hierarchy::SpatialHierarchyPanel* spatial_panel_ = nullptr; QDockWidget* layers_panel_ = nullptr; - ifcviewerfull::modules::properties::PropertiesPanel* properties_panel_ = nullptr; + bonsaiviewer::modules::properties::PropertiesPanel* properties_panel_ = nullptr; QDockWidget* stored_views_panel_ = nullptr; QDockWidget* search_panel_ = nullptr; QDockWidget* spreadsheet_panel_ = nullptr; QDockWidget* audit_panel_ = nullptr; QDockWidget* clash_panel_ = nullptr; QDockWidget* issues_panel_ = nullptr; - ifcviewerfull::modules::models::ModelsPanelView* models_view_ = nullptr; - ifcviewerfull::modules::spatial_hierarchy::SpatialHierarchyPanelView* spatial_view_ = nullptr; - ifcviewerfull::modules::properties::PropertiesPanelView* properties_view_ = nullptr; + bonsaiviewer::modules::models::ModelsPanelView* models_view_ = nullptr; + bonsaiviewer::modules::spatial_hierarchy::SpatialHierarchyPanelView* spatial_view_ = nullptr; + bonsaiviewer::modules::properties::PropertiesPanelView* properties_view_ = nullptr; }; -} // namespace ifcviewerfull::shell +} // namespace bonsaiviewer::shell #endif diff --git a/src/ifcviewer-full/Measurement.cpp b/src/bonsaiviewer/Measurement.cpp similarity index 100% rename from src/ifcviewer-full/Measurement.cpp rename to src/bonsaiviewer/Measurement.cpp diff --git a/src/ifcviewer-full/Measurement.h b/src/bonsaiviewer/Measurement.h similarity index 100% rename from src/ifcviewer-full/Measurement.h rename to src/bonsaiviewer/Measurement.h diff --git a/src/ifcviewer-full/SessionState.cpp b/src/bonsaiviewer/SessionState.cpp similarity index 99% rename from src/ifcviewer-full/SessionState.cpp rename to src/bonsaiviewer/SessionState.cpp index 03da127eeb..ea3568da51 100644 --- a/src/ifcviewer-full/SessionState.cpp +++ b/src/bonsaiviewer/SessionState.cpp @@ -25,7 +25,7 @@ #include "../ifcviewer/Federation.h" #include "../ifcviewer/SceneLoader.h" -namespace ifcviewerfull { +namespace bonsaiviewer { SessionState::SessionState(QObject* parent) : QObject(parent) @@ -183,4 +183,4 @@ void SessionState::notifyProjectReset() { emit projectReset(); } -} // namespace ifcviewerfull +} // namespace bonsaiviewer diff --git a/src/ifcviewer-full/SessionState.h b/src/bonsaiviewer/SessionState.h similarity index 99% rename from src/ifcviewer-full/SessionState.h rename to src/bonsaiviewer/SessionState.h index a55752a50a..902a933ccb 100644 --- a/src/ifcviewer-full/SessionState.h +++ b/src/bonsaiviewer/SessionState.h @@ -30,7 +30,7 @@ class Federation; class SceneLoader; class ViewportWindow; -namespace ifcviewerfull { +namespace bonsaiviewer { class ElementRegistry; @@ -124,6 +124,6 @@ private: QHash cloud_metadata_; }; -} // namespace ifcviewerfull +} // namespace bonsaiviewer #endif diff --git a/src/ifcviewer-full/ViewerSettings.cpp b/src/bonsaiviewer/ViewerSettings.cpp similarity index 69% rename from src/ifcviewer-full/ViewerSettings.cpp rename to src/bonsaiviewer/ViewerSettings.cpp index f643eb6df6..c7e92a9a6c 100644 --- a/src/ifcviewer-full/ViewerSettings.cpp +++ b/src/bonsaiviewer/ViewerSettings.cpp @@ -30,45 +30,45 @@ namespace { constexpr const char* kThemeModeKey = "interface/theme/mode"; constexpr const char* kThemeColorPrefix = "interface/theme/colors/"; -using Spec = ifcviewerfull::ViewerSettings::ThemeColorSpec; +using Spec = bonsaiviewer::ViewerSettings::ThemeColorSpec; const std::vector kThemeColorSpecs = { - {"app_background", "App Background", ifcviewerfull::components::style::palette::app_background, "#eef1f5"}, - {"border", "Border", ifcviewerfull::components::style::palette::border, "#c9d1dc"}, - {"selection_background", "Selection Background", ifcviewerfull::components::style::palette::selection_background, + {"app_background", "App Background", bonsaiviewer::components::style::palette::app_background, "#eef1f5"}, + {"border", "Border", bonsaiviewer::components::style::palette::border, "#c9d1dc"}, + {"selection_background", "Selection Background", bonsaiviewer::components::style::palette::selection_background, "#2f9e44"}, - {"tab_bar_background", "Tab Bar Background", ifcviewerfull::components::style::palette::tab_bar_background, + {"tab_bar_background", "Tab Bar Background", bonsaiviewer::components::style::palette::tab_bar_background, "#eef1f5"}, - {"tab_background", "Tab Background", ifcviewerfull::components::style::palette::tab_background, "#e3e8ef"}, - {"ribbon_background", "Ribbon Background", ifcviewerfull::components::style::palette::ribbon_background, + {"tab_background", "Tab Background", bonsaiviewer::components::style::palette::tab_background, "#e3e8ef"}, + {"ribbon_background", "Ribbon Background", bonsaiviewer::components::style::palette::ribbon_background, "#e3e8ef"}, - {"ribbon_button_hover", "Ribbon Button Hover", ifcviewerfull::components::style::palette::ribbon_button_hover, + {"ribbon_button_hover", "Ribbon Button Hover", bonsaiviewer::components::style::palette::ribbon_button_hover, "#d6dde7"}, - {"ribbon_button_pressed", "Ribbon Button Pressed", ifcviewerfull::components::style::palette::ribbon_button_pressed, + {"ribbon_button_pressed", "Ribbon Button Pressed", bonsaiviewer::components::style::palette::ribbon_button_pressed, "#cad3df"}, {"viewport_shell_background", "Viewport Shell Background", - ifcviewerfull::components::style::palette::viewport_shell_background, "#dbe1e8"}, - {"viewport_background", "Viewport Background", ifcviewerfull::components::style::palette::viewport_background, + bonsaiviewer::components::style::palette::viewport_shell_background, "#dbe1e8"}, + {"viewport_background", "Viewport Background", bonsaiviewer::components::style::palette::viewport_background, "#eef2f6"}, - {"panel_background", "Panel Background", ifcviewerfull::components::style::palette::panel_background, "#ffffff"}, - {"control_background", "Control Background", ifcviewerfull::components::style::palette::control_background, + {"panel_background", "Panel Background", bonsaiviewer::components::style::palette::panel_background, "#ffffff"}, + {"control_background", "Control Background", bonsaiviewer::components::style::palette::control_background, "#f5f7fa"}, - {"control_border_focus", "Control Border Focus", ifcviewerfull::components::style::palette::control_border_focus, + {"control_border_focus", "Control Border Focus", bonsaiviewer::components::style::palette::control_border_focus, "#7c8ca3"}, - {"box_background", "Box Background", ifcviewerfull::components::style::palette::box_background, "#f5f7fa"}, - {"scroll_handle", "Scroll Handle", ifcviewerfull::components::style::palette::scroll_handle, "#b1bac8"}, - {"scroll_handle_hover", "Scroll Handle Hover", ifcviewerfull::components::style::palette::scroll_handle_hover, + {"box_background", "Box Background", bonsaiviewer::components::style::palette::box_background, "#f5f7fa"}, + {"scroll_handle", "Scroll Handle", bonsaiviewer::components::style::palette::scroll_handle, "#b1bac8"}, + {"scroll_handle_hover", "Scroll Handle Hover", bonsaiviewer::components::style::palette::scroll_handle_hover, "#929daf"}, - {"status_background", "Status Background", ifcviewerfull::components::style::palette::status_background, + {"status_background", "Status Background", bonsaiviewer::components::style::palette::status_background, "#edf1f5"}, {"section_header_background", "Section Header Background", - ifcviewerfull::components::style::palette::section_header_background, "#eef2f6"}, - {"primary_text", "Primary Text", ifcviewerfull::components::style::palette::primary_text, "#1f2937"}, - {"secondary_text", "Secondary Text", ifcviewerfull::components::style::palette::secondary_text, "#5b6676"}, - {"disabled_text", "Disabled Text", ifcviewerfull::components::style::palette::disabled_text, "#8b95a3"}, - {"warning_text", "Warning Text", ifcviewerfull::components::style::palette::warning_text, "#b26b00"}, - {"selection_text", "Selection Text", ifcviewerfull::components::style::palette::selection_text, "#ffffff"}, - {"hover_text", "Hover Text", ifcviewerfull::components::style::palette::hover_text, "#0f172a"}, + bonsaiviewer::components::style::palette::section_header_background, "#eef2f6"}, + {"primary_text", "Primary Text", bonsaiviewer::components::style::palette::primary_text, "#1f2937"}, + {"secondary_text", "Secondary Text", bonsaiviewer::components::style::palette::secondary_text, "#5b6676"}, + {"disabled_text", "Disabled Text", bonsaiviewer::components::style::palette::disabled_text, "#8b95a3"}, + {"warning_text", "Warning Text", bonsaiviewer::components::style::palette::warning_text, "#b26b00"}, + {"selection_text", "Selection Text", bonsaiviewer::components::style::palette::selection_text, "#ffffff"}, + {"hover_text", "Hover Text", bonsaiviewer::components::style::palette::hover_text, "#0f172a"}, {"icon_color", "Icon Color", "#e7ebf2", "#445066"}, {"icon_active_color", "Icon Active Color", "#ffffff", "#101828"}, {"icon_disabled_color", "Icon Disabled Color", "#6f7988", "#98a2b3"}, @@ -93,7 +93,7 @@ QString normalizedColor(const QString& value, const QString& fallback) { } // namespace -namespace ifcviewerfull { +namespace bonsaiviewer { ViewerSettings& ViewerSettings::instance() { static ViewerSettings inst; @@ -186,4 +186,4 @@ void ViewerSettings::persist() const { } } -} // namespace ifcviewerfull +} // namespace bonsaiviewer diff --git a/src/ifcviewer-full/ViewerSettings.h b/src/bonsaiviewer/ViewerSettings.h similarity index 97% rename from src/ifcviewer-full/ViewerSettings.h rename to src/bonsaiviewer/ViewerSettings.h index 87d8a17160..a3eea1ac15 100644 --- a/src/ifcviewer-full/ViewerSettings.h +++ b/src/bonsaiviewer/ViewerSettings.h @@ -25,7 +25,7 @@ #include #include -namespace ifcviewerfull { +namespace bonsaiviewer { class ViewerSettings : public QObject { Q_OBJECT @@ -67,6 +67,6 @@ private: std::vector custom_colors_; }; -} // namespace ifcviewerfull +} // namespace bonsaiviewer #endif diff --git a/src/ifcviewer-full/ifcviewer_full_resources.qrc b/src/bonsaiviewer/bonsaiviewer_resources.qrc similarity index 100% rename from src/ifcviewer-full/ifcviewer_full_resources.qrc rename to src/bonsaiviewer/bonsaiviewer_resources.qrc diff --git a/src/ifcviewer-full/components/Buttons.cpp b/src/bonsaiviewer/components/Buttons.cpp similarity index 97% rename from src/ifcviewer-full/components/Buttons.cpp rename to src/bonsaiviewer/components/Buttons.cpp index 8f8db4cad4..f2c1e732bc 100644 --- a/src/ifcviewer-full/components/Buttons.cpp +++ b/src/bonsaiviewer/components/Buttons.cpp @@ -28,7 +28,7 @@ #include #include -namespace ifcviewerfull::components::buttons { +namespace bonsaiviewer::components::buttons { QToolButton* makeButton(const QString& text, const QString& icon_path, @@ -74,4 +74,4 @@ QWidget* makeButtonGroup(const QString& title, return group; } -} // namespace ifcviewerfull::components::buttons +} // namespace bonsaiviewer::components::buttons diff --git a/src/ifcviewer-full/components/Buttons.h b/src/bonsaiviewer/components/Buttons.h similarity index 95% rename from src/ifcviewer-full/components/Buttons.h rename to src/bonsaiviewer/components/Buttons.h index 498e7b4bbd..c80a91d180 100644 --- a/src/ifcviewer-full/components/Buttons.h +++ b/src/bonsaiviewer/components/Buttons.h @@ -26,7 +26,7 @@ class QToolButton; class QWidget; -namespace ifcviewerfull::components::buttons { +namespace bonsaiviewer::components::buttons { QToolButton* makeButton(const QString& text, const QString& icon_path, @@ -38,6 +38,6 @@ QWidget* makeButtonGroup(const QString& title, bool trailing_separator = true, int vertical_spacing = 4); -} // namespace ifcviewerfull::components::buttons +} // namespace bonsaiviewer::components::buttons #endif diff --git a/src/ifcviewer-full/components/Dialog.cpp b/src/bonsaiviewer/components/Dialog.cpp similarity index 98% rename from src/ifcviewer-full/components/Dialog.cpp rename to src/bonsaiviewer/components/Dialog.cpp index d480640aa1..07ba86558f 100644 --- a/src/ifcviewer-full/components/Dialog.cpp +++ b/src/bonsaiviewer/components/Dialog.cpp @@ -28,7 +28,7 @@ #include #include -namespace ifcviewerfull::components { +namespace bonsaiviewer::components { Dialog::Dialog(QWidget* parent, bool scrollable) : QDialog(parent) @@ -140,4 +140,4 @@ void TabbedDialog::addFooterWidget(QWidget* widget) { footer_layout_->addWidget(widget); } -} // namespace ifcviewerfull::components +} // namespace bonsaiviewer::components diff --git a/src/ifcviewer-full/components/Dialog.h b/src/bonsaiviewer/components/Dialog.h similarity index 96% rename from src/ifcviewer-full/components/Dialog.h rename to src/bonsaiviewer/components/Dialog.h index 827be44c9c..a4f7fc47f8 100644 --- a/src/ifcviewer-full/components/Dialog.h +++ b/src/bonsaiviewer/components/Dialog.h @@ -27,7 +27,7 @@ class QVBoxLayout; class QWidget; class QTabWidget; -namespace ifcviewerfull::components { +namespace bonsaiviewer::components { class Dialog : public QDialog { Q_OBJECT @@ -58,6 +58,6 @@ private: QVBoxLayout* footer_layout_ = nullptr; }; -} // namespace ifcviewerfull::components +} // namespace bonsaiviewer::components #endif diff --git a/src/ifcviewer-full/components/KeyValueTable.cpp b/src/bonsaiviewer/components/KeyValueTable.cpp similarity index 97% rename from src/ifcviewer-full/components/KeyValueTable.cpp rename to src/bonsaiviewer/components/KeyValueTable.cpp index b71bf62f18..191cad8b8e 100644 --- a/src/ifcviewer-full/components/KeyValueTable.cpp +++ b/src/bonsaiviewer/components/KeyValueTable.cpp @@ -25,7 +25,7 @@ #include #include -namespace ifcviewerfull::components { +namespace bonsaiviewer::components { KeyValueTable::KeyValueTable(const QList& rows, QWidget* parent) : QWidget(parent) @@ -69,4 +69,4 @@ KeyValueTable::KeyValueTable(const QList& rows, QWidget* paren } } -} // namespace ifcviewerfull::components +} // namespace bonsaiviewer::components diff --git a/src/ifcviewer-full/components/KeyValueTable.h b/src/bonsaiviewer/components/KeyValueTable.h similarity index 96% rename from src/ifcviewer-full/components/KeyValueTable.h rename to src/bonsaiviewer/components/KeyValueTable.h index fa69e94ad8..714ec8d668 100644 --- a/src/ifcviewer-full/components/KeyValueTable.h +++ b/src/bonsaiviewer/components/KeyValueTable.h @@ -25,7 +25,7 @@ #include #include -namespace ifcviewerfull::components { +namespace bonsaiviewer::components { struct KeyValueTableRow { QString key; @@ -42,6 +42,6 @@ public: explicit KeyValueTable(const QList& rows, QWidget* parent = nullptr); }; -} // namespace ifcviewerfull::components +} // namespace bonsaiviewer::components #endif diff --git a/src/ifcviewer-full/components/Panel.cpp b/src/bonsaiviewer/components/Panel.cpp similarity index 98% rename from src/ifcviewer-full/components/Panel.cpp rename to src/bonsaiviewer/components/Panel.cpp index 70f2899151..9969f9d754 100644 --- a/src/ifcviewer-full/components/Panel.cpp +++ b/src/bonsaiviewer/components/Panel.cpp @@ -32,7 +32,7 @@ #include #include -namespace ifcviewerfull::components { +namespace bonsaiviewer::components { namespace { @@ -137,4 +137,4 @@ void Panel::clearBodyWidgets() { } } -} // namespace ifcviewerfull::components +} // namespace bonsaiviewer::components diff --git a/src/ifcviewer-full/components/Panel.h b/src/bonsaiviewer/components/Panel.h similarity index 96% rename from src/ifcviewer-full/components/Panel.h rename to src/bonsaiviewer/components/Panel.h index 4267415696..9cbdace240 100644 --- a/src/ifcviewer-full/components/Panel.h +++ b/src/bonsaiviewer/components/Panel.h @@ -26,7 +26,7 @@ class QWidget; class QVBoxLayout; -namespace ifcviewerfull::components { +namespace bonsaiviewer::components { class Panel : public QDockWidget { Q_OBJECT @@ -48,6 +48,6 @@ private: QVBoxLayout* body_layout_ = nullptr; }; -} // namespace ifcviewerfull::components +} // namespace bonsaiviewer::components #endif diff --git a/src/ifcviewer-full/components/Section.cpp b/src/bonsaiviewer/components/Section.cpp similarity index 98% rename from src/ifcviewer-full/components/Section.cpp rename to src/bonsaiviewer/components/Section.cpp index 3a6bdc5e9d..5caedd3d68 100644 --- a/src/ifcviewer-full/components/Section.cpp +++ b/src/bonsaiviewer/components/Section.cpp @@ -28,7 +28,7 @@ #include #include -namespace ifcviewerfull::components { +namespace bonsaiviewer::components { Section::Section(const QString& title, SectionHeaderMode header_mode, QWidget* parent) : QWidget(parent) @@ -115,4 +115,4 @@ void Section::setBodyExpanding(bool expanding) { updateGeometry(); } -} // namespace ifcviewerfull::components +} // namespace bonsaiviewer::components diff --git a/src/ifcviewer-full/components/Section.h b/src/bonsaiviewer/components/Section.h similarity index 96% rename from src/ifcviewer-full/components/Section.h rename to src/bonsaiviewer/components/Section.h index 69622bf9db..8726e32ece 100644 --- a/src/ifcviewer-full/components/Section.h +++ b/src/bonsaiviewer/components/Section.h @@ -27,7 +27,7 @@ class QHBoxLayout; class QToolButton; class QVBoxLayout; -namespace ifcviewerfull::components { +namespace bonsaiviewer::components { enum class SectionHeaderMode { Visible, @@ -56,6 +56,6 @@ private: bool body_expanding_ = false; }; -} // namespace ifcviewerfull::components +} // namespace bonsaiviewer::components #endif diff --git a/src/ifcviewer-full/components/Style.cpp b/src/bonsaiviewer/components/Style.cpp similarity index 99% rename from src/ifcviewer-full/components/Style.cpp rename to src/bonsaiviewer/components/Style.cpp index 15cdd66e29..6f1196a3f1 100644 --- a/src/ifcviewer-full/components/Style.cpp +++ b/src/bonsaiviewer/components/Style.cpp @@ -22,10 +22,10 @@ #include "../ViewerSettings.h" -namespace ifcviewerfull::components::style { +namespace bonsaiviewer::components::style { QString buildAppStyleSheet() { - const auto& theme = ifcviewerfull::ViewerSettings::instance(); + const auto& theme = bonsaiviewer::ViewerSettings::instance(); QString stylesheet = QStringLiteral(R"( QMainWindow#appWindow { background: ${app_background}; @@ -494,4 +494,4 @@ QString buildAppStyleSheet() { return stylesheet; } -} // namespace ifcviewerfull::components::style +} // namespace bonsaiviewer::components::style diff --git a/src/ifcviewer-full/components/Style.h b/src/bonsaiviewer/components/Style.h similarity index 87% rename from src/ifcviewer-full/components/Style.h rename to src/bonsaiviewer/components/Style.h index d98f19650e..90a900e50c 100644 --- a/src/ifcviewer-full/components/Style.h +++ b/src/bonsaiviewer/components/Style.h @@ -23,22 +23,22 @@ #include -namespace ifcviewerfull::components::style::metrics { +namespace bonsaiviewer::components::style::metrics { inline constexpr int padding = 6; inline constexpr int section_body_padding = 10; inline constexpr int section_header_padding = 2; inline constexpr int panel_radius = 3; -} // namespace ifcviewerfull::components::style::metrics +} // namespace bonsaiviewer::components::style::metrics -namespace ifcviewerfull::components::style::typography { +namespace bonsaiviewer::components::style::typography { inline constexpr int small = 10; -} // namespace ifcviewerfull::components::style::typography +} // namespace bonsaiviewer::components::style::typography -namespace ifcviewerfull::components::style::palette { +namespace bonsaiviewer::components::style::palette { inline constexpr auto app_background = "#26292f"; inline constexpr auto border = "#3e444e"; @@ -66,12 +66,12 @@ inline constexpr auto warning_text = "#e4b35a"; inline constexpr auto selection_text = "#14161a"; inline constexpr auto hover_text = "#ffffff"; -} // namespace ifcviewerfull::components::style::palette +} // namespace bonsaiviewer::components::style::palette -namespace ifcviewerfull::components::style { +namespace bonsaiviewer::components::style { QString buildAppStyleSheet(); -} // namespace ifcviewerfull::components::style +} // namespace bonsaiviewer::components::style #endif diff --git a/src/ifcviewer-full/components/SvgIcon.cpp b/src/bonsaiviewer/components/SvgIcon.cpp similarity index 91% rename from src/ifcviewer-full/components/SvgIcon.cpp rename to src/bonsaiviewer/components/SvgIcon.cpp index cbb0a02d77..92091c631f 100644 --- a/src/ifcviewer-full/components/SvgIcon.cpp +++ b/src/bonsaiviewer/components/SvgIcon.cpp @@ -27,7 +27,7 @@ #include #include -namespace ifcviewerfull::components::icons { +namespace bonsaiviewer::components::icons { QPixmap renderTintedSvgPixmap(const QString& icon_path, const QString& color, const QSize& size) { QFile file(icon_path); @@ -64,7 +64,7 @@ QIcon makeTintedSvgIcon(const QString& icon_path, const QString& normal, } QIcon makeAccentSvgIcon(const QString& icon_path) { - const auto& theme = ifcviewerfull::ViewerSettings::instance(); + const auto& theme = bonsaiviewer::ViewerSettings::instance(); return makeTintedSvgIcon(icon_path, theme.color("icon_accent_color"), theme.color("icon_accent_active_color"), @@ -72,7 +72,7 @@ QIcon makeAccentSvgIcon(const QString& icon_path) { } QIcon makeSvgIcon(const QString& icon_path) { - const auto& theme = ifcviewerfull::ViewerSettings::instance(); + const auto& theme = bonsaiviewer::ViewerSettings::instance(); return makeTintedSvgIcon(icon_path, theme.color("icon_color"), theme.color("icon_active_color"), @@ -80,7 +80,7 @@ QIcon makeSvgIcon(const QString& icon_path) { } QPixmap makeSvgPixmap(const QString& icon_path, const QSize& size) { - return renderTintedSvgPixmap(icon_path, ifcviewerfull::ViewerSettings::instance().color("icon_color"), size); + return renderTintedSvgPixmap(icon_path, bonsaiviewer::ViewerSettings::instance().color("icon_color"), size); } -} // namespace ifcviewerfull::components::icons +} // namespace bonsaiviewer::components::icons diff --git a/src/ifcviewer-full/components/SvgIcon.h b/src/bonsaiviewer/components/SvgIcon.h similarity index 95% rename from src/ifcviewer-full/components/SvgIcon.h rename to src/bonsaiviewer/components/SvgIcon.h index 76a1cba94b..b0577b8638 100644 --- a/src/ifcviewer-full/components/SvgIcon.h +++ b/src/bonsaiviewer/components/SvgIcon.h @@ -26,7 +26,7 @@ #include #include -namespace ifcviewerfull::components::icons { +namespace bonsaiviewer::components::icons { QPixmap renderTintedSvgPixmap(const QString& icon_path, const QString& color, const QSize& size); QIcon makeTintedSvgIcon(const QString& icon_path, @@ -37,6 +37,6 @@ QIcon makeAccentSvgIcon(const QString& icon_path); QIcon makeSvgIcon(const QString& icon_path); QPixmap makeSvgPixmap(const QString& icon_path, const QSize& size); -} // namespace ifcviewerfull::components::icons +} // namespace bonsaiviewer::components::icons #endif diff --git a/src/ifcviewer-full/components/Tabs.cpp b/src/bonsaiviewer/components/Tabs.cpp similarity index 95% rename from src/ifcviewer-full/components/Tabs.cpp rename to src/bonsaiviewer/components/Tabs.cpp index 22f066e2ff..c1af24c058 100644 --- a/src/ifcviewer-full/components/Tabs.cpp +++ b/src/bonsaiviewer/components/Tabs.cpp @@ -20,7 +20,7 @@ #include "Tabs.h" -namespace ifcviewerfull::components { +namespace bonsaiviewer::components { TabBar::TabBar(QWidget* parent) : QTabBar(parent) @@ -37,4 +37,4 @@ TabWidget::TabWidget(QWidget* parent) setTabBar(new TabBar(this)); } -} // namespace ifcviewerfull::components +} // namespace bonsaiviewer::components diff --git a/src/ifcviewer-full/components/Tabs.h b/src/bonsaiviewer/components/Tabs.h similarity index 96% rename from src/ifcviewer-full/components/Tabs.h rename to src/bonsaiviewer/components/Tabs.h index 4f119b60be..a9e40c2677 100644 --- a/src/ifcviewer-full/components/Tabs.h +++ b/src/bonsaiviewer/components/Tabs.h @@ -24,7 +24,7 @@ #include #include -namespace ifcviewerfull::components { +namespace bonsaiviewer::components { class TabBar : public QTabBar { Q_OBJECT @@ -40,6 +40,6 @@ public: explicit TabWidget(QWidget* parent = nullptr); }; -} // namespace ifcviewerfull::components +} // namespace bonsaiviewer::components #endif diff --git a/src/ifcviewer-full/icons/box-3d-center.svg b/src/bonsaiviewer/icons/box-3d-center.svg similarity index 100% rename from src/ifcviewer-full/icons/box-3d-center.svg rename to src/bonsaiviewer/icons/box-3d-center.svg diff --git a/src/ifcviewer-full/icons/box-3d-three-points.svg b/src/bonsaiviewer/icons/box-3d-three-points.svg similarity index 100% rename from src/ifcviewer-full/icons/box-3d-three-points.svg rename to src/bonsaiviewer/icons/box-3d-three-points.svg diff --git a/src/ifcviewer-full/icons/building.svg b/src/bonsaiviewer/icons/building.svg similarity index 100% rename from src/ifcviewer-full/icons/building.svg rename to src/bonsaiviewer/icons/building.svg diff --git a/src/ifcviewer-full/icons/cellar.svg b/src/bonsaiviewer/icons/cellar.svg similarity index 100% rename from src/ifcviewer-full/icons/cellar.svg rename to src/bonsaiviewer/icons/cellar.svg diff --git a/src/ifcviewer-full/icons/check.svg b/src/bonsaiviewer/icons/check.svg similarity index 100% rename from src/ifcviewer-full/icons/check.svg rename to src/bonsaiviewer/icons/check.svg diff --git a/src/ifcviewer-full/icons/city.svg b/src/bonsaiviewer/icons/city.svg similarity index 100% rename from src/ifcviewer-full/icons/city.svg rename to src/bonsaiviewer/icons/city.svg diff --git a/src/ifcviewer-full/icons/clock-rotate-right.svg b/src/bonsaiviewer/icons/clock-rotate-right.svg similarity index 100% rename from src/ifcviewer-full/icons/clock-rotate-right.svg rename to src/bonsaiviewer/icons/clock-rotate-right.svg diff --git a/src/ifcviewer-full/icons/cloud-square.svg b/src/bonsaiviewer/icons/cloud-square.svg similarity index 100% rename from src/ifcviewer-full/icons/cloud-square.svg rename to src/bonsaiviewer/icons/cloud-square.svg diff --git a/src/ifcviewer-full/icons/cube-bandage.svg b/src/bonsaiviewer/icons/cube-bandage.svg similarity index 100% rename from src/ifcviewer-full/icons/cube-bandage.svg rename to src/bonsaiviewer/icons/cube-bandage.svg diff --git a/src/ifcviewer-full/icons/cube-cut-with-curve.svg b/src/bonsaiviewer/icons/cube-cut-with-curve.svg similarity index 100% rename from src/ifcviewer-full/icons/cube-cut-with-curve.svg rename to src/bonsaiviewer/icons/cube-cut-with-curve.svg diff --git a/src/ifcviewer-full/icons/cube-dots.svg b/src/bonsaiviewer/icons/cube-dots.svg similarity index 100% rename from src/ifcviewer-full/icons/cube-dots.svg rename to src/bonsaiviewer/icons/cube-dots.svg diff --git a/src/ifcviewer-full/icons/cube-scan-solid.svg b/src/bonsaiviewer/icons/cube-scan-solid.svg similarity index 100% rename from src/ifcviewer-full/icons/cube-scan-solid.svg rename to src/bonsaiviewer/icons/cube-scan-solid.svg diff --git a/src/ifcviewer-full/icons/cube-scan.svg b/src/bonsaiviewer/icons/cube-scan.svg similarity index 100% rename from src/ifcviewer-full/icons/cube-scan.svg rename to src/bonsaiviewer/icons/cube-scan.svg diff --git a/src/ifcviewer-full/icons/cube.svg b/src/bonsaiviewer/icons/cube.svg similarity index 100% rename from src/ifcviewer-full/icons/cube.svg rename to src/bonsaiviewer/icons/cube.svg diff --git a/src/ifcviewer-full/icons/cursor-pointer.svg b/src/bonsaiviewer/icons/cursor-pointer.svg similarity index 100% rename from src/ifcviewer-full/icons/cursor-pointer.svg rename to src/bonsaiviewer/icons/cursor-pointer.svg diff --git a/src/ifcviewer-full/icons/database-restore.svg b/src/bonsaiviewer/icons/database-restore.svg similarity index 100% rename from src/ifcviewer-full/icons/database-restore.svg rename to src/bonsaiviewer/icons/database-restore.svg diff --git a/src/ifcviewer-full/icons/database.svg b/src/bonsaiviewer/icons/database.svg similarity index 100% rename from src/ifcviewer-full/icons/database.svg rename to src/bonsaiviewer/icons/database.svg diff --git a/src/ifcviewer-full/icons/download-square.svg b/src/bonsaiviewer/icons/download-square.svg similarity index 100% rename from src/ifcviewer-full/icons/download-square.svg rename to src/bonsaiviewer/icons/download-square.svg diff --git a/src/ifcviewer-full/icons/drone.svg b/src/bonsaiviewer/icons/drone.svg similarity index 100% rename from src/ifcviewer-full/icons/drone.svg rename to src/bonsaiviewer/icons/drone.svg diff --git a/src/ifcviewer-full/icons/eye-closed.svg b/src/bonsaiviewer/icons/eye-closed.svg similarity index 100% rename from src/ifcviewer-full/icons/eye-closed.svg rename to src/bonsaiviewer/icons/eye-closed.svg diff --git a/src/ifcviewer-full/icons/eye-solid.svg b/src/bonsaiviewer/icons/eye-solid.svg similarity index 100% rename from src/ifcviewer-full/icons/eye-solid.svg rename to src/bonsaiviewer/icons/eye-solid.svg diff --git a/src/ifcviewer-full/icons/eye.svg b/src/bonsaiviewer/icons/eye.svg similarity index 100% rename from src/ifcviewer-full/icons/eye.svg rename to src/bonsaiviewer/icons/eye.svg diff --git a/src/ifcviewer-full/icons/face-3d-draft.svg b/src/bonsaiviewer/icons/face-3d-draft.svg similarity index 100% rename from src/ifcviewer-full/icons/face-3d-draft.svg rename to src/bonsaiviewer/icons/face-3d-draft.svg diff --git a/src/ifcviewer-full/icons/filter.svg b/src/bonsaiviewer/icons/filter.svg similarity index 100% rename from src/ifcviewer-full/icons/filter.svg rename to src/bonsaiviewer/icons/filter.svg diff --git a/src/ifcviewer-full/icons/floppy-disk-arrow-in.svg b/src/bonsaiviewer/icons/floppy-disk-arrow-in.svg similarity index 100% rename from src/ifcviewer-full/icons/floppy-disk-arrow-in.svg rename to src/bonsaiviewer/icons/floppy-disk-arrow-in.svg diff --git a/src/ifcviewer-full/icons/floppy-disk.svg b/src/bonsaiviewer/icons/floppy-disk.svg similarity index 100% rename from src/ifcviewer-full/icons/floppy-disk.svg rename to src/bonsaiviewer/icons/floppy-disk.svg diff --git a/src/ifcviewer-full/icons/folder-minus.svg b/src/bonsaiviewer/icons/folder-minus.svg similarity index 100% rename from src/ifcviewer-full/icons/folder-minus.svg rename to src/bonsaiviewer/icons/folder-minus.svg diff --git a/src/ifcviewer-full/icons/folder-plus.svg b/src/bonsaiviewer/icons/folder-plus.svg similarity index 100% rename from src/ifcviewer-full/icons/folder-plus.svg rename to src/bonsaiviewer/icons/folder-plus.svg diff --git a/src/ifcviewer-full/icons/folder.svg b/src/bonsaiviewer/icons/folder.svg similarity index 100% rename from src/ifcviewer-full/icons/folder.svg rename to src/bonsaiviewer/icons/folder.svg diff --git a/src/ifcviewer-full/icons/frame-alt.svg b/src/bonsaiviewer/icons/frame-alt.svg similarity index 100% rename from src/ifcviewer-full/icons/frame-alt.svg rename to src/bonsaiviewer/icons/frame-alt.svg diff --git a/src/ifcviewer-full/icons/home-alt.svg b/src/bonsaiviewer/icons/home-alt.svg similarity index 100% rename from src/ifcviewer-full/icons/home-alt.svg rename to src/bonsaiviewer/icons/home-alt.svg diff --git a/src/ifcviewer-full/icons/home.svg b/src/bonsaiviewer/icons/home.svg similarity index 100% rename from src/ifcviewer-full/icons/home.svg rename to src/bonsaiviewer/icons/home.svg diff --git a/src/ifcviewer-full/icons/intersect.svg b/src/bonsaiviewer/icons/intersect.svg similarity index 100% rename from src/ifcviewer-full/icons/intersect.svg rename to src/bonsaiviewer/icons/intersect.svg diff --git a/src/ifcviewer-full/icons/minus-square.svg b/src/bonsaiviewer/icons/minus-square.svg similarity index 100% rename from src/ifcviewer-full/icons/minus-square.svg rename to src/bonsaiviewer/icons/minus-square.svg diff --git a/src/ifcviewer-full/icons/perspective-view.svg b/src/bonsaiviewer/icons/perspective-view.svg similarity index 100% rename from src/ifcviewer-full/icons/perspective-view.svg rename to src/bonsaiviewer/icons/perspective-view.svg diff --git a/src/ifcviewer-full/icons/planimetry.svg b/src/bonsaiviewer/icons/planimetry.svg similarity index 100% rename from src/ifcviewer-full/icons/planimetry.svg rename to src/bonsaiviewer/icons/planimetry.svg diff --git a/src/ifcviewer-full/icons/plus-square.svg b/src/bonsaiviewer/icons/plus-square.svg similarity index 100% rename from src/ifcviewer-full/icons/plus-square.svg rename to src/bonsaiviewer/icons/plus-square.svg diff --git a/src/ifcviewer-full/icons/refresh-double.svg b/src/bonsaiviewer/icons/refresh-double.svg similarity index 100% rename from src/ifcviewer-full/icons/refresh-double.svg rename to src/bonsaiviewer/icons/refresh-double.svg diff --git a/src/ifcviewer-full/icons/select-edge3d.svg b/src/bonsaiviewer/icons/select-edge3d.svg similarity index 100% rename from src/ifcviewer-full/icons/select-edge3d.svg rename to src/bonsaiviewer/icons/select-edge3d.svg diff --git a/src/ifcviewer-full/icons/select-face3d.svg b/src/bonsaiviewer/icons/select-face3d.svg similarity index 100% rename from src/ifcviewer-full/icons/select-face3d.svg rename to src/bonsaiviewer/icons/select-face3d.svg diff --git a/src/ifcviewer-full/icons/select-point3d.svg b/src/bonsaiviewer/icons/select-point3d.svg similarity index 100% rename from src/ifcviewer-full/icons/select-point3d.svg rename to src/bonsaiviewer/icons/select-point3d.svg diff --git a/src/ifcviewer-full/icons/settings.svg b/src/bonsaiviewer/icons/settings.svg similarity index 100% rename from src/ifcviewer-full/icons/settings.svg rename to src/bonsaiviewer/icons/settings.svg diff --git a/src/ifcviewer-full/icons/sidebar-expand.svg b/src/bonsaiviewer/icons/sidebar-expand.svg similarity index 100% rename from src/ifcviewer-full/icons/sidebar-expand.svg rename to src/bonsaiviewer/icons/sidebar-expand.svg diff --git a/src/ifcviewer-full/icons/square3d-from-center.svg b/src/bonsaiviewer/icons/square3d-from-center.svg similarity index 100% rename from src/ifcviewer-full/icons/square3d-from-center.svg rename to src/bonsaiviewer/icons/square3d-from-center.svg diff --git a/src/ifcviewer-full/icons/xmark-circle.svg b/src/bonsaiviewer/icons/xmark-circle.svg similarity index 100% rename from src/ifcviewer-full/icons/xmark-circle.svg rename to src/bonsaiviewer/icons/xmark-circle.svg diff --git a/src/ifcviewer-full/main.cpp b/src/bonsaiviewer/main.cpp similarity index 88% rename from src/ifcviewer-full/main.cpp rename to src/bonsaiviewer/main.cpp index d80199da07..ff2f79a87a 100644 --- a/src/ifcviewer-full/main.cpp +++ b/src/bonsaiviewer/main.cpp @@ -49,7 +49,7 @@ void installUiFont() { int main(int argc, char* argv[]) { QApplication app(argc, argv); - app.setApplicationName("IfcViewer"); + app.setApplicationName("Bonsai Viewer"); app.setOrganizationName("IfcOpenShell"); QSurfaceFormat fmt; @@ -61,21 +61,21 @@ int main(int argc, char* argv[]) { QSurfaceFormat::setDefaultFormat(fmt); QCommandLineParser parser; - parser.setApplicationDescription("IfcOpenShell IFC viewer"); + parser.setApplicationDescription("Bonsai Viewer — IfcOpenShell IFC viewer"); parser.addHelpOption(); parser.process(app); installUiFont(); const auto applyStyle = [&app]() { - app.setStyleSheet(ifcviewerfull::components::style::buildAppStyleSheet()); + app.setStyleSheet(bonsaiviewer::components::style::buildAppStyleSheet()); }; applyStyle(); - QObject::connect(&ifcviewerfull::ViewerSettings::instance(), - &ifcviewerfull::ViewerSettings::themeChanged, + QObject::connect(&bonsaiviewer::ViewerSettings::instance(), + &bonsaiviewer::ViewerSettings::themeChanged, &app, applyStyle); - ifcviewerfull::shell::MainWindow window; + bonsaiviewer::shell::MainWindow window; window.show(); return app.exec(); } diff --git a/src/ifcviewer-full/modules/connectors/Discovery.cpp b/src/bonsaiviewer/modules/connectors/Discovery.cpp similarity index 96% rename from src/ifcviewer-full/modules/connectors/Discovery.cpp rename to src/bonsaiviewer/modules/connectors/Discovery.cpp index af395f62a1..307df1feb0 100644 --- a/src/ifcviewer-full/modules/connectors/Discovery.cpp +++ b/src/bonsaiviewer/modules/connectors/Discovery.cpp @@ -29,7 +29,7 @@ #include #include -namespace ifcviewerfull::modules::connectors { +namespace bonsaiviewer::modules::connectors { namespace { @@ -85,7 +85,7 @@ QString userConnectorsDir() { // Win -> %APPDATA% (Roaming) // matching CLOUD_SYNC_PROTOCOL.md's listed locations. const QString base = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); - return QDir(base).filePath("IfcOpenShell/IfcViewer/connectors"); + return QDir(base).filePath("IfcOpenShell/BonsaiViewer/connectors"); } std::vector discoverConnectors() { @@ -111,4 +111,4 @@ std::vector discoverConnectors() { return result; } -} // namespace ifcviewerfull::modules::connectors +} // namespace bonsaiviewer::modules::connectors diff --git a/src/ifcviewer-full/modules/connectors/Discovery.h b/src/bonsaiviewer/modules/connectors/Discovery.h similarity index 96% rename from src/ifcviewer-full/modules/connectors/Discovery.h rename to src/bonsaiviewer/modules/connectors/Discovery.h index 816bcd5738..9063165d7c 100644 --- a/src/ifcviewer-full/modules/connectors/Discovery.h +++ b/src/bonsaiviewer/modules/connectors/Discovery.h @@ -24,7 +24,7 @@ #include #include -namespace ifcviewerfull::modules::connectors { +namespace bonsaiviewer::modules::connectors { struct ConnectorManifest { QString id; // from connector.json; stable identifier @@ -45,6 +45,6 @@ std::vector discoverConnectors(); // for "open user connectors dir" affordances. QString userConnectorsDir(); -} // namespace ifcviewerfull::modules::connectors +} // namespace bonsaiviewer::modules::connectors #endif diff --git a/src/ifcviewer-full/modules/connectors/PickerDialog.cpp b/src/bonsaiviewer/modules/connectors/PickerDialog.cpp similarity index 97% rename from src/ifcviewer-full/modules/connectors/PickerDialog.cpp rename to src/bonsaiviewer/modules/connectors/PickerDialog.cpp index 748a80170f..6b39d869e0 100644 --- a/src/ifcviewer-full/modules/connectors/PickerDialog.cpp +++ b/src/bonsaiviewer/modules/connectors/PickerDialog.cpp @@ -29,7 +29,7 @@ #include #include -namespace ifcviewerfull::modules::connectors { +namespace bonsaiviewer::modules::connectors { ConnectorPickerDialog::ConnectorPickerDialog(const std::vector& manifests, const QString& title, @@ -76,4 +76,4 @@ ConnectorPickerDialog::ConnectorPickerDialog(const std::vector #include -namespace ifcviewerfull::modules::connectors { +namespace bonsaiviewer::modules::connectors { // Connector chooser, modelled on AddModelDialog: one button per available // connector. Always shown (even when only one connector is installed), per @@ -49,6 +49,6 @@ private: QString selected_id_; }; -} // namespace ifcviewerfull::modules::connectors +} // namespace bonsaiviewer::modules::connectors #endif diff --git a/src/ifcviewer-full/modules/connectors/Process.cpp b/src/bonsaiviewer/modules/connectors/Process.cpp similarity index 98% rename from src/ifcviewer-full/modules/connectors/Process.cpp rename to src/bonsaiviewer/modules/connectors/Process.cpp index 2f6445c94d..1f27222391 100644 --- a/src/ifcviewer-full/modules/connectors/Process.cpp +++ b/src/bonsaiviewer/modules/connectors/Process.cpp @@ -26,7 +26,7 @@ #include #include -namespace ifcviewerfull::modules::connectors { +namespace bonsaiviewer::modules::connectors { namespace { @@ -194,4 +194,4 @@ void ConnectorProcess::failPendingAndClear(int code, const QString& message) { } } -} // namespace ifcviewerfull::modules::connectors +} // namespace bonsaiviewer::modules::connectors diff --git a/src/ifcviewer-full/modules/connectors/Process.h b/src/bonsaiviewer/modules/connectors/Process.h similarity index 97% rename from src/ifcviewer-full/modules/connectors/Process.h rename to src/bonsaiviewer/modules/connectors/Process.h index ee68289222..ae83533e51 100644 --- a/src/ifcviewer-full/modules/connectors/Process.h +++ b/src/bonsaiviewer/modules/connectors/Process.h @@ -31,7 +31,7 @@ #include #include -namespace ifcviewerfull::modules::connectors { +namespace bonsaiviewer::modules::connectors { // One running connector subprocess. Owns the QProcess, frames stdio as // newline-delimited JSON-RPC 2.0, and routes responses back to per-call @@ -93,6 +93,6 @@ private: QHash pending_; }; -} // namespace ifcviewerfull::modules::connectors +} // namespace bonsaiviewer::modules::connectors #endif diff --git a/src/ifcviewer-full/modules/connectors/Registry.cpp b/src/bonsaiviewer/modules/connectors/Registry.cpp similarity index 97% rename from src/ifcviewer-full/modules/connectors/Registry.cpp rename to src/bonsaiviewer/modules/connectors/Registry.cpp index 8da02c9195..1ec2c6ad86 100644 --- a/src/ifcviewer-full/modules/connectors/Registry.cpp +++ b/src/bonsaiviewer/modules/connectors/Registry.cpp @@ -24,7 +24,7 @@ #include -namespace ifcviewerfull::modules::connectors { +namespace bonsaiviewer::modules::connectors { ConnectorRegistry::ConnectorRegistry(QObject* parent) : QObject(parent) @@ -106,4 +106,4 @@ void ConnectorRegistry::shutdownAll() { } } -} // namespace ifcviewerfull::modules::connectors +} // namespace bonsaiviewer::modules::connectors diff --git a/src/ifcviewer-full/modules/connectors/Registry.h b/src/bonsaiviewer/modules/connectors/Registry.h similarity index 96% rename from src/ifcviewer-full/modules/connectors/Registry.h rename to src/bonsaiviewer/modules/connectors/Registry.h index 536ec74ab5..6947332c99 100644 --- a/src/ifcviewer-full/modules/connectors/Registry.h +++ b/src/bonsaiviewer/modules/connectors/Registry.h @@ -28,7 +28,7 @@ #include #include -namespace ifcviewerfull::modules::connectors { +namespace bonsaiviewer::modules::connectors { class ConnectorProcess; @@ -69,6 +69,6 @@ private: QString last_error_; }; -} // namespace ifcviewerfull::modules::connectors +} // namespace bonsaiviewer::modules::connectors #endif diff --git a/src/ifcviewer-full/modules/models/AddModelDialog.cpp b/src/bonsaiviewer/modules/models/AddModelDialog.cpp similarity index 98% rename from src/ifcviewer-full/modules/models/AddModelDialog.cpp rename to src/bonsaiviewer/modules/models/AddModelDialog.cpp index 183403290c..ad2ef7e7e1 100644 --- a/src/ifcviewer-full/modules/models/AddModelDialog.cpp +++ b/src/bonsaiviewer/modules/models/AddModelDialog.cpp @@ -31,7 +31,7 @@ #include #include -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { namespace { @@ -157,4 +157,4 @@ void AddModelDialog::setupUi() { addBodyWidget(choices_section); } -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models diff --git a/src/ifcviewer-full/modules/models/AddModelDialog.h b/src/bonsaiviewer/modules/models/AddModelDialog.h similarity index 95% rename from src/ifcviewer-full/modules/models/AddModelDialog.h rename to src/bonsaiviewer/modules/models/AddModelDialog.h index c546abb2b0..eda3c1061a 100644 --- a/src/ifcviewer-full/modules/models/AddModelDialog.h +++ b/src/bonsaiviewer/modules/models/AddModelDialog.h @@ -23,7 +23,7 @@ #include "../../components/Dialog.h" -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { enum class SourceMode { None, @@ -48,6 +48,6 @@ private: SourceMode selected_mode_ = SourceMode::None; }; -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models #endif diff --git a/src/ifcviewer-full/modules/models/Commands.cpp b/src/bonsaiviewer/modules/models/Commands.cpp similarity index 99% rename from src/ifcviewer-full/modules/models/Commands.cpp rename to src/bonsaiviewer/modules/models/Commands.cpp index 723d7d353a..ad2a409577 100644 --- a/src/ifcviewer-full/modules/models/Commands.cpp +++ b/src/bonsaiviewer/modules/models/Commands.cpp @@ -61,7 +61,7 @@ #include -namespace ifcviewerfull::modules::models::commands { +namespace bonsaiviewer::modules::models::commands { namespace { @@ -749,4 +749,4 @@ void openSettings(SessionState& s, QWidget& host) { dialog.exec(); } -} // namespace ifcviewerfull::modules::models::commands +} // namespace bonsaiviewer::modules::models::commands diff --git a/src/ifcviewer-full/modules/models/Commands.h b/src/bonsaiviewer/modules/models/Commands.h similarity index 96% rename from src/ifcviewer-full/modules/models/Commands.h rename to src/bonsaiviewer/modules/models/Commands.h index a55d74bd92..4bd8a00deb 100644 --- a/src/ifcviewer-full/modules/models/Commands.h +++ b/src/bonsaiviewer/modules/models/Commands.h @@ -29,9 +29,9 @@ class QWidget; class ViewportWindow; -namespace ifcviewerfull { class SessionState; } +namespace bonsaiviewer { class SessionState; } -namespace ifcviewerfull::modules::models::commands { +namespace bonsaiviewer::modules::models::commands { // User-facing commands. Each one is responsible for emitting any notify() // signals exactly once, at the end of its execution. @@ -67,6 +67,6 @@ void loadModels(SessionState& s, const QStringList& paths, const QStringList& fe } // namespace detail -} // namespace ifcviewerfull::modules::models::commands +} // namespace bonsaiviewer::modules::models::commands #endif diff --git a/src/ifcviewer-full/modules/models/FederationItemModel.cpp b/src/bonsaiviewer/modules/models/FederationItemModel.cpp similarity index 98% rename from src/ifcviewer-full/modules/models/FederationItemModel.cpp rename to src/bonsaiviewer/modules/models/FederationItemModel.cpp index fe3bcf4ba1..fa7efca01f 100644 --- a/src/ifcviewer-full/modules/models/FederationItemModel.cpp +++ b/src/bonsaiviewer/modules/models/FederationItemModel.cpp @@ -27,7 +27,7 @@ #include #include -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { namespace { @@ -113,7 +113,7 @@ void FederationItemModel::styleRowVisibility(QStandardItem* name_item, bool visi name_item->setData(QVariant(), Qt::ForegroundRole); if (vis_item) vis_item->setData(QVariant(), Qt::ForegroundRole); } else { - const QBrush disabled(QColor(ifcviewerfull::ViewerSettings::instance().color("disabled_text"))); + const QBrush disabled(QColor(bonsaiviewer::ViewerSettings::instance().color("disabled_text"))); name_item->setForeground(disabled); if (vis_item) vis_item->setForeground(disabled); } @@ -271,4 +271,4 @@ void FederationItemModel::onModelGroupChanged(const QString& fed_id, const QStri refreshSubtreeVisibility(taken.first()); } -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models diff --git a/src/ifcviewer-full/modules/models/FederationItemModel.h b/src/bonsaiviewer/modules/models/FederationItemModel.h similarity index 97% rename from src/ifcviewer-full/modules/models/FederationItemModel.h rename to src/bonsaiviewer/modules/models/FederationItemModel.h index 22cc61908d..3cc094dbbd 100644 --- a/src/ifcviewer-full/modules/models/FederationItemModel.h +++ b/src/bonsaiviewer/modules/models/FederationItemModel.h @@ -28,7 +28,7 @@ class Federation; -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { // QStandardItemModel that mirrors the Federation tree (groups + models in // two columns: name + visibility icon). Subscribes directly to Federation's @@ -81,6 +81,6 @@ private: QHash id_to_name_item_; // both group_ids and fed_ids }; -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models #endif diff --git a/src/ifcviewer-full/modules/models/Panel.cpp b/src/bonsaiviewer/modules/models/Panel.cpp similarity index 97% rename from src/ifcviewer-full/modules/models/Panel.cpp rename to src/bonsaiviewer/modules/models/Panel.cpp index 786d8b7223..89c4a104b3 100644 --- a/src/ifcviewer-full/modules/models/Panel.cpp +++ b/src/bonsaiviewer/modules/models/Panel.cpp @@ -40,11 +40,11 @@ #include #include -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { namespace { -constexpr auto kDragMimeType = "application/x-ifcviewerfull-model-items"; +constexpr auto kDragMimeType = "application/x-bonsaiviewer-model-items"; QString idOf(const QModelIndex& index) { return index.sibling(index.row(), 0).data(FederationItemModel::IdRole).toString(); @@ -85,7 +85,7 @@ constexpr int kVisibilityColumnWidth = 28; // messages happen the same way as menu-driven moves. class ModelsTreeView : public QTreeView { public: - explicit ModelsTreeView(ifcviewerfull::SessionState* session_state, QWidget* parent) + explicit ModelsTreeView(bonsaiviewer::SessionState* session_state, QWidget* parent) : QTreeView(parent), session_state_(session_state) {} protected: @@ -223,12 +223,12 @@ private: return false; } - ifcviewerfull::SessionState* session_state_; + bonsaiviewer::SessionState* session_state_; }; } // namespace -ModelsPanel::ModelsPanel(ifcviewerfull::SessionState* session_state, +ModelsPanel::ModelsPanel(bonsaiviewer::SessionState* session_state, ViewportWindow* viewport, QWidget* parent) : components::Panel("Models", nullptr, parent, true) @@ -392,4 +392,4 @@ void ModelsPanel::setModel(FederationItemModel* model) { tree_->expandAll(); } -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models diff --git a/src/ifcviewer-full/modules/models/Panel.h b/src/bonsaiviewer/modules/models/Panel.h similarity index 90% rename from src/ifcviewer-full/modules/models/Panel.h rename to src/bonsaiviewer/modules/models/Panel.h index 3fc65c9ad6..251bf30242 100644 --- a/src/ifcviewer-full/modules/models/Panel.h +++ b/src/bonsaiviewer/modules/models/Panel.h @@ -27,9 +27,9 @@ class QTreeView; class ViewportWindow; -namespace ifcviewerfull { class SessionState; } +namespace bonsaiviewer { class SessionState; } -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { class FederationItemModel; @@ -40,7 +40,7 @@ class FederationItemModel; class ModelsPanel : public components::Panel { Q_OBJECT public: - explicit ModelsPanel(ifcviewerfull::SessionState* session_state, + explicit ModelsPanel(bonsaiviewer::SessionState* session_state, ViewportWindow* viewport, QWidget* parent = nullptr); @@ -49,12 +49,12 @@ public: void setModel(FederationItemModel* model); private: - ifcviewerfull::SessionState* session_state_ = nullptr; + bonsaiviewer::SessionState* session_state_ = nullptr; ViewportWindow* viewport_ = nullptr; QTreeView* tree_ = nullptr; FederationItemModel* model_ = nullptr; }; -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models #endif diff --git a/src/ifcviewer-full/modules/models/SettingsDialog.cpp b/src/bonsaiviewer/modules/models/SettingsDialog.cpp similarity index 99% rename from src/ifcviewer-full/modules/models/SettingsDialog.cpp rename to src/bonsaiviewer/modules/models/SettingsDialog.cpp index b5a0dc7780..9f544ac9a3 100644 --- a/src/ifcviewer-full/modules/models/SettingsDialog.cpp +++ b/src/bonsaiviewer/modules/models/SettingsDialog.cpp @@ -46,7 +46,7 @@ #include #include -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { namespace { @@ -124,7 +124,7 @@ QLabel* makeReadOnlyValue(QWidget* parent) { } // namespace -SettingsDialog::SettingsDialog(ifcviewerfull::SessionState* session_state, QWidget* parent) +SettingsDialog::SettingsDialog(bonsaiviewer::SessionState* session_state, QWidget* parent) : components::TabbedDialog(parent) , session_state_(session_state) , federation_(session_state ? session_state->federation() : nullptr) @@ -482,4 +482,4 @@ void SettingsDialog::onAccepted() { accept(); } -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models diff --git a/src/ifcviewer-full/modules/models/SettingsDialog.h b/src/bonsaiviewer/modules/models/SettingsDialog.h similarity index 93% rename from src/ifcviewer-full/modules/models/SettingsDialog.h rename to src/bonsaiviewer/modules/models/SettingsDialog.h index 0916081ee6..68d70b5a72 100644 --- a/src/ifcviewer-full/modules/models/SettingsDialog.h +++ b/src/bonsaiviewer/modules/models/SettingsDialog.h @@ -36,18 +36,18 @@ class QShowEvent; class QTableWidget; class QTableWidgetItem; -namespace ifcviewerfull { +namespace bonsaiviewer { class SessionState; } -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { class SettingsView; class SettingsDialog : public components::TabbedDialog { Q_OBJECT public: - explicit SettingsDialog(ifcviewerfull::SessionState* session_state, QWidget* parent = nullptr); + explicit SettingsDialog(bonsaiviewer::SessionState* session_state, QWidget* parent = nullptr); void renderSelectedModelGeoref(const SelectedModelGeorefState& state); protected: @@ -69,7 +69,7 @@ private: void updateSelectedModelGeoref(); void onAccepted(); - ifcviewerfull::SessionState* session_state_ = nullptr; + bonsaiviewer::SessionState* session_state_ = nullptr; Federation* federation_ = nullptr; SceneLoader* loader_ = nullptr; @@ -100,6 +100,6 @@ private: SettingsView* settings_view_ = nullptr; }; -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models #endif diff --git a/src/ifcviewer-full/modules/models/SettingsView.cpp b/src/bonsaiviewer/modules/models/SettingsView.cpp similarity index 98% rename from src/ifcviewer-full/modules/models/SettingsView.cpp rename to src/bonsaiviewer/modules/models/SettingsView.cpp index 3fc65b9aa8..2428a39a7d 100644 --- a/src/ifcviewer-full/modules/models/SettingsView.cpp +++ b/src/bonsaiviewer/modules/models/SettingsView.cpp @@ -29,7 +29,7 @@ #include -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { namespace { @@ -203,7 +203,7 @@ SelectedModelGeorefState stateFromCachedGeoref(const ModelGeoref& georef) { } // namespace SettingsView::SettingsView(SettingsDialog* widget, - ifcviewerfull::SessionState* session_state) + bonsaiviewer::SessionState* session_state) : widget_(widget), session_state_(session_state) { } @@ -243,4 +243,4 @@ void SettingsView::refresh(const QString& fed_id) const { widget_->renderSelectedModelGeoref(stateFromCachedGeoref(*georef)); } -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models diff --git a/src/ifcviewer-full/modules/models/SettingsView.h b/src/bonsaiviewer/modules/models/SettingsView.h similarity index 88% rename from src/ifcviewer-full/modules/models/SettingsView.h rename to src/bonsaiviewer/modules/models/SettingsView.h index b6ccfc02be..1d5114d4d8 100644 --- a/src/ifcviewer-full/modules/models/SettingsView.h +++ b/src/bonsaiviewer/modules/models/SettingsView.h @@ -23,26 +23,26 @@ #include "Types.h" -namespace ifcviewerfull { +namespace bonsaiviewer { class SessionState; } -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { class SettingsDialog; class SettingsView { public: explicit SettingsView(SettingsDialog* widget, - ifcviewerfull::SessionState* session_state); + bonsaiviewer::SessionState* session_state); void refresh(const QString& fed_id) const; private: SettingsDialog* widget_ = nullptr; - ifcviewerfull::SessionState* session_state_ = nullptr; + bonsaiviewer::SessionState* session_state_ = nullptr; }; -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models #endif diff --git a/src/ifcviewer-full/modules/models/Types.h b/src/bonsaiviewer/modules/models/Types.h similarity index 96% rename from src/ifcviewer-full/modules/models/Types.h rename to src/bonsaiviewer/modules/models/Types.h index b8599b8467..1e80a3e939 100644 --- a/src/ifcviewer-full/modules/models/Types.h +++ b/src/bonsaiviewer/modules/models/Types.h @@ -24,7 +24,7 @@ #include #include -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { enum class ItemKind { Group, @@ -64,6 +64,6 @@ struct SelectedModelGeorefState { QString factor_z; }; -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models #endif diff --git a/src/ifcviewer-full/modules/models/View.cpp b/src/bonsaiviewer/modules/models/View.cpp similarity index 91% rename from src/ifcviewer-full/modules/models/View.cpp rename to src/bonsaiviewer/modules/models/View.cpp index 3261367aeb..2c158e21e1 100644 --- a/src/ifcviewer-full/modules/models/View.cpp +++ b/src/bonsaiviewer/modules/models/View.cpp @@ -27,7 +27,7 @@ #include "../../SessionState.h" #include "../../../ifcviewer/Federation.h" -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { namespace { @@ -53,7 +53,7 @@ QList validMoveTargets(const Federation& federation, } ModelsPanelView::ModelsPanelView(ModelsPanel* widget, - ifcviewerfull::SessionState* session_state, + bonsaiviewer::SessionState* session_state, QObject* parent) : QObject(parent) , widget_(widget) @@ -67,9 +67,9 @@ ModelsPanelView::ModelsPanelView(ModelsPanel* widget, auto rebuild = [this]() { model_->rebuildAll(); }; connect(session_state_, &SessionState::projectReset, this, rebuild); connect(session_state_, &SessionState::projectOpened, this, rebuild); - connect(&ifcviewerfull::ViewerSettings::instance(), - &ifcviewerfull::ViewerSettings::themeChanged, + connect(&bonsaiviewer::ViewerSettings::instance(), + &bonsaiviewer::ViewerSettings::themeChanged, this, rebuild); } -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models diff --git a/src/ifcviewer-full/modules/models/View.h b/src/bonsaiviewer/modules/models/View.h similarity index 91% rename from src/ifcviewer-full/modules/models/View.h rename to src/bonsaiviewer/modules/models/View.h index 1ec87e5d5a..6fb67eca09 100644 --- a/src/ifcviewer-full/modules/models/View.h +++ b/src/bonsaiviewer/modules/models/View.h @@ -26,9 +26,9 @@ #include class Federation; -namespace ifcviewerfull { class SessionState; } +namespace bonsaiviewer { class SessionState; } -namespace ifcviewerfull::modules::models { +namespace bonsaiviewer::modules::models { class FederationItemModel; class ModelsPanel; @@ -49,15 +49,15 @@ class ModelsPanelView : public QObject { Q_OBJECT public: explicit ModelsPanelView(ModelsPanel* widget, - ifcviewerfull::SessionState* session_state, + bonsaiviewer::SessionState* session_state, QObject* parent = nullptr); private: ModelsPanel* widget_ = nullptr; - ifcviewerfull::SessionState* session_state_ = nullptr; + bonsaiviewer::SessionState* session_state_ = nullptr; FederationItemModel* model_ = nullptr; }; -} // namespace ifcviewerfull::modules::models +} // namespace bonsaiviewer::modules::models #endif diff --git a/src/ifcviewer-full/modules/project/Commands.cpp b/src/bonsaiviewer/modules/project/Commands.cpp similarity index 99% rename from src/ifcviewer-full/modules/project/Commands.cpp rename to src/bonsaiviewer/modules/project/Commands.cpp index b893f24df1..978274ce22 100644 --- a/src/ifcviewer-full/modules/project/Commands.cpp +++ b/src/bonsaiviewer/modules/project/Commands.cpp @@ -46,7 +46,7 @@ #include -namespace ifcviewerfull::modules::project::commands { +namespace bonsaiviewer::modules::project::commands { namespace { @@ -668,4 +668,4 @@ bool saveProjectDialog(SessionState& s, QWidget& host) { return false; } -} // namespace ifcviewerfull::modules::project::commands +} // namespace bonsaiviewer::modules::project::commands diff --git a/src/ifcviewer-full/modules/project/Commands.h b/src/bonsaiviewer/modules/project/Commands.h similarity index 95% rename from src/ifcviewer-full/modules/project/Commands.h rename to src/bonsaiviewer/modules/project/Commands.h index 44707f897f..e49b5f1b42 100644 --- a/src/ifcviewer-full/modules/project/Commands.h +++ b/src/bonsaiviewer/modules/project/Commands.h @@ -25,9 +25,9 @@ class QWidget; class ViewportWindow; -namespace ifcviewerfull { class SessionState; } +namespace bonsaiviewer { class SessionState; } -namespace ifcviewerfull::modules::project::commands { +namespace bonsaiviewer::modules::project::commands { // User-facing commands. Each owns its own dialogs and confirmations; each // emits exactly one notify() at the end (projectReset / projectOpened / @@ -58,6 +58,6 @@ bool saveAsCloudProject(SessionState& s, QWidget& host); // Project" ribbon button is wired to. bool saveProjectDialog(SessionState& s, QWidget& host); -} // namespace ifcviewerfull::modules::project::commands +} // namespace bonsaiviewer::modules::project::commands #endif diff --git a/src/ifcviewer-full/modules/project/SaveProjectDialog.cpp b/src/bonsaiviewer/modules/project/SaveProjectDialog.cpp similarity index 98% rename from src/ifcviewer-full/modules/project/SaveProjectDialog.cpp rename to src/bonsaiviewer/modules/project/SaveProjectDialog.cpp index 9de19f6383..b293626d30 100644 --- a/src/ifcviewer-full/modules/project/SaveProjectDialog.cpp +++ b/src/bonsaiviewer/modules/project/SaveProjectDialog.cpp @@ -30,7 +30,7 @@ #include #include -namespace ifcviewerfull::modules::project { +namespace bonsaiviewer::modules::project { namespace { @@ -145,4 +145,4 @@ void SaveProjectDialog::setupUi(bool has_manifest) { addBodyWidget(choices_section); } -} // namespace ifcviewerfull::modules::project +} // namespace bonsaiviewer::modules::project diff --git a/src/ifcviewer-full/modules/project/SaveProjectDialog.h b/src/bonsaiviewer/modules/project/SaveProjectDialog.h similarity index 96% rename from src/ifcviewer-full/modules/project/SaveProjectDialog.h rename to src/bonsaiviewer/modules/project/SaveProjectDialog.h index 7162634557..0e49d69fc0 100644 --- a/src/ifcviewer-full/modules/project/SaveProjectDialog.h +++ b/src/bonsaiviewer/modules/project/SaveProjectDialog.h @@ -23,7 +23,7 @@ #include "../../components/Dialog.h" -namespace ifcviewerfull::modules::project { +namespace bonsaiviewer::modules::project { enum class SaveTarget { None, @@ -49,6 +49,6 @@ private: SaveTarget selected_target_ = SaveTarget::None; }; -} // namespace ifcviewerfull::modules::project +} // namespace bonsaiviewer::modules::project #endif diff --git a/src/ifcviewer-full/modules/properties/Panel.cpp b/src/bonsaiviewer/modules/properties/Panel.cpp similarity index 87% rename from src/ifcviewer-full/modules/properties/Panel.cpp rename to src/bonsaiviewer/modules/properties/Panel.cpp index e643db8bf6..991bf0018d 100644 --- a/src/ifcviewer-full/modules/properties/Panel.cpp +++ b/src/bonsaiviewer/modules/properties/Panel.cpp @@ -35,31 +35,31 @@ namespace { -QWidget* makePropertySetPanel(const ifcviewerfull::modules::properties::PropertySet& property_set, QWidget* parent = nullptr) { +QWidget* makePropertySetPanel(const bonsaiviewer::modules::properties::PropertySet& property_set, QWidget* parent = nullptr) { auto* group = new QGroupBox(property_set.title, parent); group->setObjectName("propertySetBox"); auto* layout = new QVBoxLayout(group); layout->setContentsMargins(10, 10, 10, 10); layout->setSpacing(0); - QList rows; + QList rows; for (const auto& row : property_set.rows) { rows.append({row.key, row.value, "keyValueValueLabel", "", "", 0}); } - layout->addWidget(new ifcviewerfull::components::KeyValueTable(rows, group)); + layout->addWidget(new bonsaiviewer::components::KeyValueTable(rows, group)); return group; } -QWidget* makeAttributeList(const QList& rows, QWidget* parent = nullptr) { - QList table_rows; +QWidget* makeAttributeList(const QList& rows, QWidget* parent = nullptr) { + QList table_rows; for (const auto& row : rows) { table_rows.append({row.key, row.value, "keyValueValueLabel", "", "", 0}); } - return new ifcviewerfull::components::KeyValueTable(table_rows, parent); + return new bonsaiviewer::components::KeyValueTable(table_rows, parent); } -QWidget* makeRelationshipList(const QList& rows, QWidget* parent = nullptr) { - QList table_rows; +QWidget* makeRelationshipList(const QList& rows, QWidget* parent = nullptr) { + QList table_rows; for (const auto& row_data : rows) { table_rows.append({row_data.key, row_data.value, @@ -68,22 +68,22 @@ QWidget* makeRelationshipList(const QListsetObjectName("panelSectionFilterWrapper"); auto* layout = new QVBoxLayout(wrapper); - layout->setContentsMargins(ifcviewerfull::components::style::metrics::section_body_padding, + layout->setContentsMargins(bonsaiviewer::components::style::metrics::section_body_padding, 0, - ifcviewerfull::components::style::metrics::section_body_padding, + bonsaiviewer::components::style::metrics::section_body_padding, 0); layout->setSpacing(0); auto* field = new QLineEdit(wrapper); field->setClearButtonEnabled(true); - field->addAction(ifcviewerfull::components::icons::makeSvgIcon(":/icons/filter.svg"), QLineEdit::LeadingPosition); + field->addAction(bonsaiviewer::components::icons::makeSvgIcon(":/icons/filter.svg"), QLineEdit::LeadingPosition); field->setVisible(false); layout->addWidget(field); @@ -91,7 +91,7 @@ QWidget* makeFilterWrapper(QLineEdit** field_out, QWidget* parent = nullptr) { return wrapper; } -QFrame* makeEntityBox(const ifcviewerfull::modules::properties::EntitySummary& entity, QWidget* parent = nullptr) { +QFrame* makeEntityBox(const bonsaiviewer::modules::properties::EntitySummary& entity, QWidget* parent = nullptr) { auto* entity_box = new QFrame(parent); entity_box->setObjectName("entityClassBox"); auto* entity_layout = new QHBoxLayout(entity_box); @@ -99,7 +99,7 @@ QFrame* makeEntityBox(const ifcviewerfull::modules::properties::EntitySummary& e entity_layout->setSpacing(10); auto* entity_icon = new QLabel(entity_box); - entity_icon->setPixmap(ifcviewerfull::components::icons::makeSvgPixmap(":/icons/cube-dots.svg", QSize(28, 28))); + entity_icon->setPixmap(bonsaiviewer::components::icons::makeSvgPixmap(":/icons/cube-dots.svg", QSize(28, 28))); entity_icon->setAlignment(Qt::AlignCenter); auto* entity_text = new QWidget(entity_box); @@ -121,7 +121,7 @@ QFrame* makeEntityBox(const ifcviewerfull::modules::properties::EntitySummary& e } // namespace -namespace ifcviewerfull::modules::properties { +namespace bonsaiviewer::modules::properties { PropertiesPanel::PropertiesPanel(QWidget* parent) : components::Panel("Properties", nullptr, parent, false, true) @@ -234,4 +234,4 @@ void PropertiesPanel::render(const PropertiesPanelState& state) { addBodyWidget(quantities_section); } -} // namespace ifcviewerfull::modules::properties +} // namespace bonsaiviewer::modules::properties diff --git a/src/ifcviewer-full/modules/properties/Panel.h b/src/bonsaiviewer/modules/properties/Panel.h similarity index 95% rename from src/ifcviewer-full/modules/properties/Panel.h rename to src/bonsaiviewer/modules/properties/Panel.h index bd92850701..7e52cbb084 100644 --- a/src/ifcviewer-full/modules/properties/Panel.h +++ b/src/bonsaiviewer/modules/properties/Panel.h @@ -31,7 +31,7 @@ class QLabel; class QLineEdit; class QToolButton; -namespace ifcviewerfull::modules::properties { +namespace bonsaiviewer::modules::properties { class PropertiesPanel : public components::Panel { Q_OBJECT @@ -51,6 +51,6 @@ private: QString quantities_filter_text_; }; -} // namespace ifcviewerfull::modules::properties +} // namespace bonsaiviewer::modules::properties #endif diff --git a/src/ifcviewer-full/modules/properties/Types.h b/src/bonsaiviewer/modules/properties/Types.h similarity index 95% rename from src/ifcviewer-full/modules/properties/Types.h rename to src/bonsaiviewer/modules/properties/Types.h index fe4a94e201..7c4f81ba61 100644 --- a/src/ifcviewer-full/modules/properties/Types.h +++ b/src/bonsaiviewer/modules/properties/Types.h @@ -25,7 +25,7 @@ #include #include -namespace ifcviewerfull::modules::properties { +namespace bonsaiviewer::modules::properties { struct KeyValueRow { QString key; @@ -55,6 +55,6 @@ struct PropertiesPanelState { QList quantity_sets; }; -} // namespace ifcviewerfull::modules::properties +} // namespace bonsaiviewer::modules::properties #endif diff --git a/src/ifcviewer-full/modules/properties/View.cpp b/src/bonsaiviewer/modules/properties/View.cpp similarity index 90% rename from src/ifcviewer-full/modules/properties/View.cpp rename to src/bonsaiviewer/modules/properties/View.cpp index 6dc34355d4..02c022c18c 100644 --- a/src/ifcviewer-full/modules/properties/View.cpp +++ b/src/bonsaiviewer/modules/properties/View.cpp @@ -25,20 +25,20 @@ #include "../../ElementRegistry.h" #include "../../SessionState.h" -namespace ifcviewerfull::modules::properties { +namespace bonsaiviewer::modules::properties { PropertiesPanelView::PropertiesPanelView(PropertiesPanel* widget, - ifcviewerfull::SessionState* session_state, + bonsaiviewer::SessionState* session_state, QObject* parent) : QObject(parent), widget_(widget), session_state_(session_state) { - connect(session_state_, &ifcviewerfull::SessionState::selectionChanged, this, [this](uint32_t object_id) { + connect(session_state_, &bonsaiviewer::SessionState::selectionChanged, this, [this](uint32_t object_id) { refresh(object_id); }); - connect(session_state_, &ifcviewerfull::SessionState::projectReset, this, [this]() { + connect(session_state_, &bonsaiviewer::SessionState::projectReset, this, [this]() { refresh(0); }); - connect(session_state_, &ifcviewerfull::SessionState::projectOpened, this, [this](const QString&) { + connect(session_state_, &bonsaiviewer::SessionState::projectOpened, this, [this](const QString&) { refresh(0); }); refresh(0); @@ -121,4 +121,4 @@ void PropertiesPanelView::refresh(uint32_t object_id) { widget_->render(state); } -} // namespace ifcviewerfull::modules::properties +} // namespace bonsaiviewer::modules::properties diff --git a/src/ifcviewer-full/modules/properties/View.h b/src/bonsaiviewer/modules/properties/View.h similarity index 87% rename from src/ifcviewer-full/modules/properties/View.h rename to src/bonsaiviewer/modules/properties/View.h index 2f7cdde57a..1805a11fb5 100644 --- a/src/ifcviewer-full/modules/properties/View.h +++ b/src/bonsaiviewer/modules/properties/View.h @@ -25,8 +25,8 @@ #include -namespace ifcviewerfull { class SessionState; } -namespace ifcviewerfull::modules::properties { +namespace bonsaiviewer { class SessionState; } +namespace bonsaiviewer::modules::properties { class PropertiesPanel; @@ -34,16 +34,16 @@ class PropertiesPanelView : public QObject { Q_OBJECT public: explicit PropertiesPanelView(PropertiesPanel* widget, - ifcviewerfull::SessionState* session_state, + bonsaiviewer::SessionState* session_state, QObject* parent = nullptr); private: void refresh(uint32_t object_id); PropertiesPanel* widget_ = nullptr; - ifcviewerfull::SessionState* session_state_ = nullptr; + bonsaiviewer::SessionState* session_state_ = nullptr; }; -} // namespace ifcviewerfull::modules::properties +} // namespace bonsaiviewer::modules::properties #endif diff --git a/src/ifcviewer-full/modules/settings/Dialog.cpp b/src/bonsaiviewer/modules/settings/Dialog.cpp similarity index 95% rename from src/ifcviewer-full/modules/settings/Dialog.cpp rename to src/bonsaiviewer/modules/settings/Dialog.cpp index ce664f463e..2f029d03e5 100644 --- a/src/ifcviewer-full/modules/settings/Dialog.cpp +++ b/src/bonsaiviewer/modules/settings/Dialog.cpp @@ -49,9 +49,9 @@ #include #include -namespace ifcviewerfull::modules::settings { +namespace bonsaiviewer::modules::settings { -SettingsDialog::SettingsDialog(ifcviewerfull::SessionState* session_state, QWidget* parent) +SettingsDialog::SettingsDialog(bonsaiviewer::SessionState* session_state, QWidget* parent) : components::TabbedDialog(parent) , session_state_(session_state) { @@ -210,9 +210,9 @@ void SettingsDialog::setupUi() { theme_form->setVerticalSpacing(10); theme_mode_combo_ = new QComboBox(theme_body); - theme_mode_combo_->addItem("Dark", static_cast(ifcviewerfull::ViewerSettings::ThemeMode::Dark)); - theme_mode_combo_->addItem("Light", static_cast(ifcviewerfull::ViewerSettings::ThemeMode::Light)); - theme_mode_combo_->addItem("Custom", static_cast(ifcviewerfull::ViewerSettings::ThemeMode::Custom)); + theme_mode_combo_->addItem("Dark", static_cast(bonsaiviewer::ViewerSettings::ThemeMode::Dark)); + theme_mode_combo_->addItem("Light", static_cast(bonsaiviewer::ViewerSettings::ThemeMode::Light)); + theme_mode_combo_->addItem("Custom", static_cast(bonsaiviewer::ViewerSettings::ThemeMode::Custom)); theme_form->addRow("Preset", theme_mode_combo_); theme_custom_body_ = new QWidget(theme_body); @@ -222,7 +222,7 @@ void SettingsDialog::setupUi() { custom_grid->setVerticalSpacing(8); int row = 0; - for (const auto& spec : ifcviewerfull::ViewerSettings::themeColorSpecs()) { + for (const auto& spec : bonsaiviewer::ViewerSettings::themeColorSpecs()) { auto* label = new QLabel(QString::fromUtf8(spec.label), theme_custom_body_); auto* edit = new QLineEdit(theme_custom_body_); edit->setPlaceholderText("#000000"); @@ -311,7 +311,7 @@ void SettingsDialog::syncFromSettings() { } void SettingsDialog::syncThemeSettings() { - const auto& settings = ifcviewerfull::ViewerSettings::instance(); + const auto& settings = bonsaiviewer::ViewerSettings::instance(); const int idx = theme_mode_combo_->findData(static_cast(settings.themeMode())); theme_mode_combo_->setCurrentIndex(idx >= 0 ? idx : 0); for (auto& editor : theme_color_editors_) { @@ -323,8 +323,8 @@ void SettingsDialog::syncThemeSettings() { void SettingsDialog::updateThemeEditorEnabled() { if (!theme_mode_combo_ || !theme_custom_body_) return; const auto mode = - static_cast(theme_mode_combo_->currentData().toInt()); - const bool is_custom = mode == ifcviewerfull::ViewerSettings::ThemeMode::Custom; + static_cast(theme_mode_combo_->currentData().toInt()); + const bool is_custom = mode == bonsaiviewer::ViewerSettings::ThemeMode::Custom; theme_custom_body_->setVisible(is_custom); theme_custom_body_->setEnabled(is_custom); } @@ -354,9 +354,9 @@ void SettingsDialog::onAccepted() { AppSettings::instance().setHizResolution(hiz_resolution_spin_->value()); AppSettings::instance().setNavPreset( static_cast(nav_preset_combo_->currentIndex())); - auto& interface_settings = ifcviewerfull::ViewerSettings::instance(); + auto& interface_settings = bonsaiviewer::ViewerSettings::instance(); interface_settings.setThemeMode( - static_cast(theme_mode_combo_->currentData().toInt())); + static_cast(theme_mode_combo_->currentData().toInt())); for (const auto& editor : theme_color_editors_) { interface_settings.setCustomColor(editor.key, editor.edit->text()); } @@ -451,4 +451,4 @@ QWidget* SettingsDialog::buildConnectorsTab() { return tab; } -} // namespace ifcviewerfull::modules::settings +} // namespace bonsaiviewer::modules::settings diff --git a/src/ifcviewer-full/modules/settings/Dialog.h b/src/bonsaiviewer/modules/settings/Dialog.h similarity index 91% rename from src/ifcviewer-full/modules/settings/Dialog.h rename to src/bonsaiviewer/modules/settings/Dialog.h index 4f83387981..2266060fc9 100644 --- a/src/ifcviewer-full/modules/settings/Dialog.h +++ b/src/bonsaiviewer/modules/settings/Dialog.h @@ -34,14 +34,14 @@ class QShowEvent; class QSpinBox; class QWidget; -namespace ifcviewerfull { class SessionState; } +namespace bonsaiviewer { class SessionState; } -namespace ifcviewerfull::modules::settings { +namespace bonsaiviewer::modules::settings { class SettingsDialog : public components::TabbedDialog { Q_OBJECT public: - explicit SettingsDialog(ifcviewerfull::SessionState* session_state, + explicit SettingsDialog(bonsaiviewer::SessionState* session_state, QWidget* parent = nullptr); protected: @@ -56,7 +56,7 @@ private: void pickThemeColor(QLineEdit* edit); void onAccepted(); - ifcviewerfull::SessionState* session_state_ = nullptr; + bonsaiviewer::SessionState* session_state_ = nullptr; struct ThemeColorEditor { QString key; @@ -80,6 +80,6 @@ private: std::vector theme_color_editors_; }; -} // namespace ifcviewerfull::modules::settings +} // namespace bonsaiviewer::modules::settings #endif diff --git a/src/ifcviewer-full/modules/spatial_hierarchy/Panel.cpp b/src/bonsaiviewer/modules/spatial_hierarchy/Panel.cpp similarity index 97% rename from src/ifcviewer-full/modules/spatial_hierarchy/Panel.cpp rename to src/bonsaiviewer/modules/spatial_hierarchy/Panel.cpp index 8c2ca124c1..0b8dfaee7b 100644 --- a/src/ifcviewer-full/modules/spatial_hierarchy/Panel.cpp +++ b/src/bonsaiviewer/modules/spatial_hierarchy/Panel.cpp @@ -27,7 +27,7 @@ #include #include -namespace ifcviewerfull::modules::spatial_hierarchy { +namespace bonsaiviewer::modules::spatial_hierarchy { SpatialHierarchyPanel::SpatialHierarchyPanel(QWidget* parent) : components::Panel("Spatial Hierarchy", nullptr, parent) @@ -92,4 +92,4 @@ QString SpatialHierarchyPanel::iconPath(ItemKind kind) const { return ":/icons/frame-alt.svg"; } -} // namespace ifcviewerfull::modules::spatial_hierarchy +} // namespace bonsaiviewer::modules::spatial_hierarchy diff --git a/src/ifcviewer-full/modules/spatial_hierarchy/Panel.h b/src/bonsaiviewer/modules/spatial_hierarchy/Panel.h similarity index 95% rename from src/ifcviewer-full/modules/spatial_hierarchy/Panel.h rename to src/bonsaiviewer/modules/spatial_hierarchy/Panel.h index 3227ab1439..f3b10f7294 100644 --- a/src/ifcviewer-full/modules/spatial_hierarchy/Panel.h +++ b/src/bonsaiviewer/modules/spatial_hierarchy/Panel.h @@ -28,7 +28,7 @@ class QTreeWidget; class QTreeWidgetItem; -namespace ifcviewerfull::modules::spatial_hierarchy { +namespace bonsaiviewer::modules::spatial_hierarchy { class SpatialHierarchyPanel : public components::Panel { Q_OBJECT @@ -48,6 +48,6 @@ private: QTreeWidget* tree_ = nullptr; }; -} // namespace ifcviewerfull::modules::spatial_hierarchy +} // namespace bonsaiviewer::modules::spatial_hierarchy #endif diff --git a/src/ifcviewer-full/modules/spatial_hierarchy/Types.h b/src/bonsaiviewer/modules/spatial_hierarchy/Types.h similarity index 94% rename from src/ifcviewer-full/modules/spatial_hierarchy/Types.h rename to src/bonsaiviewer/modules/spatial_hierarchy/Types.h index 24152d2879..2f5f0301c3 100644 --- a/src/ifcviewer-full/modules/spatial_hierarchy/Types.h +++ b/src/bonsaiviewer/modules/spatial_hierarchy/Types.h @@ -25,7 +25,7 @@ #include #include -namespace ifcviewerfull::modules::spatial_hierarchy { +namespace bonsaiviewer::modules::spatial_hierarchy { enum class ItemKind { Site, @@ -43,6 +43,6 @@ struct TreeNode { using NodePath = QStringList; -} // namespace ifcviewerfull::modules::spatial_hierarchy +} // namespace bonsaiviewer::modules::spatial_hierarchy #endif diff --git a/src/ifcviewer-full/modules/spatial_hierarchy/View.cpp b/src/bonsaiviewer/modules/spatial_hierarchy/View.cpp similarity index 93% rename from src/ifcviewer-full/modules/spatial_hierarchy/View.cpp rename to src/bonsaiviewer/modules/spatial_hierarchy/View.cpp index b568314e67..05b8615f05 100644 --- a/src/ifcviewer-full/modules/spatial_hierarchy/View.cpp +++ b/src/bonsaiviewer/modules/spatial_hierarchy/View.cpp @@ -24,7 +24,7 @@ #include "../../SessionState.h" -namespace ifcviewerfull::modules::spatial_hierarchy { +namespace bonsaiviewer::modules::spatial_hierarchy { namespace { @@ -40,7 +40,7 @@ TreeNode* findNodeRecursive(QList& nodes, const NodePath& path, int de } // namespace SpatialHierarchyPanelView::SpatialHierarchyPanelView(SpatialHierarchyPanel* widget, - ifcviewerfull::SessionState* session_state, + bonsaiviewer::SessionState* session_state, QObject* parent) : QObject(parent), widget_(widget), session_state_(session_state) { @@ -72,4 +72,4 @@ TreeNode* SpatialHierarchyPanelView::findNode(const NodePath& path) { return findNodeRecursive(nodes_, path, 0); } -} // namespace ifcviewerfull::modules::spatial_hierarchy +} // namespace bonsaiviewer::modules::spatial_hierarchy diff --git a/src/ifcviewer-full/modules/spatial_hierarchy/View.h b/src/bonsaiviewer/modules/spatial_hierarchy/View.h similarity index 87% rename from src/ifcviewer-full/modules/spatial_hierarchy/View.h rename to src/bonsaiviewer/modules/spatial_hierarchy/View.h index de9aae2b25..c3260f469f 100644 --- a/src/ifcviewer-full/modules/spatial_hierarchy/View.h +++ b/src/bonsaiviewer/modules/spatial_hierarchy/View.h @@ -25,8 +25,8 @@ #include -namespace ifcviewerfull { class SessionState; } -namespace ifcviewerfull::modules::spatial_hierarchy { +namespace bonsaiviewer { class SessionState; } +namespace bonsaiviewer::modules::spatial_hierarchy { class SpatialHierarchyPanel; @@ -34,7 +34,7 @@ class SpatialHierarchyPanelView : public QObject { Q_OBJECT public: explicit SpatialHierarchyPanelView(SpatialHierarchyPanel* widget, - ifcviewerfull::SessionState* session_state, + bonsaiviewer::SessionState* session_state, QObject* parent = nullptr); private: @@ -42,10 +42,10 @@ private: TreeNode* findNode(const NodePath& path); SpatialHierarchyPanel* widget_ = nullptr; - ifcviewerfull::SessionState* session_state_ = nullptr; + bonsaiviewer::SessionState* session_state_ = nullptr; QList nodes_; }; -} // namespace ifcviewerfull::modules::spatial_hierarchy +} // namespace bonsaiviewer::modules::spatial_hierarchy #endif diff --git a/src/ifcviewer-full/modules/todo/Panel.cpp b/src/bonsaiviewer/modules/todo/Panel.cpp similarity index 96% rename from src/ifcviewer-full/modules/todo/Panel.cpp rename to src/bonsaiviewer/modules/todo/Panel.cpp index 8b43858bd5..5042672e75 100644 --- a/src/ifcviewer-full/modules/todo/Panel.cpp +++ b/src/bonsaiviewer/modules/todo/Panel.cpp @@ -25,7 +25,7 @@ #include #include -namespace ifcviewerfull::modules::todo { +namespace bonsaiviewer::modules::todo { TodoPanel::TodoPanel(const QString& title, QWidget* parent) : QWidget(parent) @@ -56,4 +56,4 @@ TodoPanel::TodoPanel(const QString& title, QWidget* parent) layout->addWidget(section); } -} // namespace ifcviewerfull::modules::todo +} // namespace bonsaiviewer::modules::todo diff --git a/src/ifcviewer-full/modules/todo/Panel.h b/src/bonsaiviewer/modules/todo/Panel.h similarity index 95% rename from src/ifcviewer-full/modules/todo/Panel.h rename to src/bonsaiviewer/modules/todo/Panel.h index 67f789fc04..d5f50716f4 100644 --- a/src/ifcviewer-full/modules/todo/Panel.h +++ b/src/bonsaiviewer/modules/todo/Panel.h @@ -23,7 +23,7 @@ #include -namespace ifcviewerfull::modules::todo { +namespace bonsaiviewer::modules::todo { class TodoPanel : public QWidget { Q_OBJECT @@ -31,6 +31,6 @@ public: explicit TodoPanel(const QString& title, QWidget* parent = nullptr); }; -} // namespace ifcviewerfull::modules::todo +} // namespace bonsaiviewer::modules::todo #endif diff --git a/src/ifcviewer-full/modules/viewport/Commands.cpp b/src/bonsaiviewer/modules/viewport/Commands.cpp similarity index 97% rename from src/ifcviewer-full/modules/viewport/Commands.cpp rename to src/bonsaiviewer/modules/viewport/Commands.cpp index 4bbcdd4dd8..fd8fa30dd5 100644 --- a/src/ifcviewer-full/modules/viewport/Commands.cpp +++ b/src/bonsaiviewer/modules/viewport/Commands.cpp @@ -24,7 +24,7 @@ #include "../../../ifcviewer/Federation.h" #include "../../../ifcviewer/ViewportWindow.h" -namespace ifcviewerfull::modules::viewport::commands { +namespace bonsaiviewer::modules::viewport::commands { void setHome(SessionState& session, ViewportWindow& vp) { auto camera = vp.cameraState(); @@ -99,4 +99,4 @@ void invertVisibility(ViewportWindow& vp) { vp.invertElementVisibility(); } -} // namespace ifcviewerfull::modules::viewport::commands +} // namespace bonsaiviewer::modules::viewport::commands diff --git a/src/ifcviewer-full/modules/viewport/Commands.h b/src/bonsaiviewer/modules/viewport/Commands.h similarity index 93% rename from src/ifcviewer-full/modules/viewport/Commands.h rename to src/bonsaiviewer/modules/viewport/Commands.h index 16b7a14321..0233873faa 100644 --- a/src/ifcviewer-full/modules/viewport/Commands.h +++ b/src/bonsaiviewer/modules/viewport/Commands.h @@ -22,9 +22,9 @@ #define IFCINTERFACE_MODULES_VIEWPORT_COMMANDS_H class ViewportWindow; -namespace ifcviewerfull { class SessionState; } +namespace bonsaiviewer { class SessionState; } -namespace ifcviewerfull::modules::viewport::commands { +namespace bonsaiviewer::modules::viewport::commands { void setHome(SessionState& session, ViewportWindow& vp); void goHome(SessionState& session, ViewportWindow& vp); @@ -43,6 +43,6 @@ void isolateSelected(ViewportWindow& vp); void showAll(ViewportWindow& vp); void invertVisibility(ViewportWindow& vp); -} // namespace ifcviewerfull::modules::viewport::commands +} // namespace bonsaiviewer::modules::viewport::commands #endif diff --git a/src/ifcviewer-full/modules/viewport/Panel.cpp b/src/bonsaiviewer/modules/viewport/Panel.cpp similarity index 96% rename from src/ifcviewer-full/modules/viewport/Panel.cpp rename to src/bonsaiviewer/modules/viewport/Panel.cpp index d2ad709299..ca6c694028 100644 --- a/src/ifcviewer-full/modules/viewport/Panel.cpp +++ b/src/bonsaiviewer/modules/viewport/Panel.cpp @@ -26,7 +26,7 @@ #include #include -namespace ifcviewerfull::modules::viewport { +namespace bonsaiviewer::modules::viewport { ViewportPanel::ViewportPanel(QWidget* parent) : QWidget(parent) @@ -57,4 +57,4 @@ ViewportPanel::ViewportPanel(QWidget* parent) root->addWidget(shell); } -} // namespace ifcviewerfull::modules::viewport +} // namespace bonsaiviewer::modules::viewport diff --git a/src/ifcviewer-full/modules/viewport/Panel.h b/src/bonsaiviewer/modules/viewport/Panel.h similarity index 95% rename from src/ifcviewer-full/modules/viewport/Panel.h rename to src/bonsaiviewer/modules/viewport/Panel.h index 9b5a512696..6d6db34080 100644 --- a/src/ifcviewer-full/modules/viewport/Panel.h +++ b/src/bonsaiviewer/modules/viewport/Panel.h @@ -25,7 +25,7 @@ class ViewportWindow; -namespace ifcviewerfull::modules::viewport { +namespace bonsaiviewer::modules::viewport { class ViewportPanel : public QWidget { Q_OBJECT @@ -40,6 +40,6 @@ private: QWidget* viewport_container_ = nullptr; }; -} // namespace ifcviewerfull::modules::viewport +} // namespace bonsaiviewer::modules::viewport #endif diff --git a/src/ifcviewer-full/modules/viewport/View.cpp b/src/bonsaiviewer/modules/viewport/View.cpp similarity index 96% rename from src/ifcviewer-full/modules/viewport/View.cpp rename to src/bonsaiviewer/modules/viewport/View.cpp index ffd36c8118..06538e70b8 100644 --- a/src/ifcviewer-full/modules/viewport/View.cpp +++ b/src/bonsaiviewer/modules/viewport/View.cpp @@ -33,9 +33,9 @@ #include -namespace ifcviewerfull::modules::viewport { +namespace bonsaiviewer::modules::viewport { -ViewportView::ViewportView(ifcviewerfull::SessionState* session_state, +ViewportView::ViewportView(bonsaiviewer::SessionState* session_state, ViewportWindow* viewport, QObject* parent) : QObject(parent) @@ -44,10 +44,10 @@ ViewportView::ViewportView(ifcviewerfull::SessionState* session_state, , area_measurement_(std::make_unique()) , length_measurement_(std::make_unique()) { - auto& settings = ifcviewerfull::ViewerSettings::instance(); - connect(&settings, &ifcviewerfull::ViewerSettings::themeChanged, this, [this]() { + auto& settings = bonsaiviewer::ViewerSettings::instance(); + connect(&settings, &bonsaiviewer::ViewerSettings::themeChanged, this, [this]() { viewport_->setBackgroundColor( - QColor(ifcviewerfull::ViewerSettings::instance().color("viewport_background"))); + QColor(bonsaiviewer::ViewerSettings::instance().color("viewport_background"))); }); viewport_->setBackgroundColor(QColor(settings.color("viewport_background"))); @@ -229,4 +229,4 @@ void ViewportView::updateVolumeReadout() { viewport_->setOverlayLabels(labels); } -} // namespace ifcviewerfull::modules::viewport +} // namespace bonsaiviewer::modules::viewport diff --git a/src/ifcviewer-full/modules/viewport/View.h b/src/bonsaiviewer/modules/viewport/View.h similarity index 91% rename from src/ifcviewer-full/modules/viewport/View.h rename to src/bonsaiviewer/modules/viewport/View.h index 0182683e54..ecd7773ba7 100644 --- a/src/ifcviewer-full/modules/viewport/View.h +++ b/src/bonsaiviewer/modules/viewport/View.h @@ -24,12 +24,12 @@ #include #include -namespace ifcviewerfull { class SessionState; } +namespace bonsaiviewer { class SessionState; } class ViewportWindow; class AreaMeasurement; class LengthMeasurement; -namespace ifcviewerfull::modules::viewport { +namespace bonsaiviewer::modules::viewport { // Renders SessionState into the OpenGL viewport. Subscribes to session-level // signals only; on each one it calls refresh() to re-derive viewport state @@ -43,7 +43,7 @@ class ViewportView : public QObject { Q_OBJECT public: - explicit ViewportView(ifcviewerfull::SessionState* session_state, + explicit ViewportView(bonsaiviewer::SessionState* session_state, ViewportWindow* viewport, QObject* parent = nullptr); ~ViewportView() override; @@ -56,12 +56,12 @@ private: void maybeGuessFederatedFalseOrigin(uint32_t mid); void updateVolumeReadout(); - ifcviewerfull::SessionState* session_state_ = nullptr; + bonsaiviewer::SessionState* session_state_ = nullptr; ViewportWindow* viewport_ = nullptr; std::unique_ptr area_measurement_; std::unique_ptr length_measurement_; }; -} // namespace ifcviewerfull::modules::viewport +} // namespace bonsaiviewer::modules::viewport #endif diff --git a/src/ifcviewer-autodesk/CLOUD_SYNC_PROTOCOL.md b/src/ifcviewer-autodesk/CLOUD_SYNC_PROTOCOL.md index 2380b816cb..af1e5a73c3 100644 --- a/src/ifcviewer-autodesk/CLOUD_SYNC_PROTOCOL.md +++ b/src/ifcviewer-autodesk/CLOUD_SYNC_PROTOCOL.md @@ -478,9 +478,9 @@ small, fixed set of locations for these folders. The IfcViewer scans the **user connectors directory**. The platform's per-user application data location: - - Linux: `~/.local/share/IfcOpenShell/IfcViewer/connectors/` - - macOS: `~/Library/Application Support/IfcOpenShell/IfcViewer/connectors/` - - Windows: `%APPDATA%\IfcOpenShell\IfcViewer\connectors\` + - Linux: `~/.local/share/IfcOpenShell/BonsaiViewer/connectors/` + - macOS: `~/Library/Application Support/IfcOpenShell/BonsaiViewer/connectors/` + - Windows: `%APPDATA%\IfcOpenShell\BonsaiViewer\connectors\` The IfcViewer looks at every immediate subdirectory and treats it as a connector iff it contains a `connector.json`. Connectors are launched on diff --git a/src/ifcviewer-autodesk/packaging/README.md b/src/ifcviewer-autodesk/packaging/README.md index 6364afa6f1..e0469c2ed1 100644 --- a/src/ifcviewer-autodesk/packaging/README.md +++ b/src/ifcviewer-autodesk/packaging/README.md @@ -18,8 +18,8 @@ dist/ autodesk--.zip # the distribution archive ``` -The folder is what the IfcViewer expects under -`~/.local/share/IfcOpenShell/IfcViewer/connectors/` (or the OS equivalent). +The folder is what Bonsai Viewer expects under +`~/.local/share/IfcOpenShell/BonsaiViewer/connectors/` (or the OS equivalent). ## Build steps (any OS) @@ -83,16 +83,16 @@ builds do; on Gentoo make sure `USE="tk"` is set for `dev-lang/python`. ```bash # Linux -unzip dist/autodesk-linux-x86_64.zip -d ~/.local/share/IfcOpenShell/IfcViewer/connectors/ +unzip dist/autodesk-linux-x86_64.zip -d ~/.local/share/IfcOpenShell/BonsaiViewer/connectors/ # macOS -unzip dist/autodesk-macos-arm64.zip -d "~/Library/Application Support/IfcOpenShell/IfcViewer/connectors/" +unzip dist/autodesk-macos-arm64.zip -d "~/Library/Application Support/IfcOpenShell/BonsaiViewer/connectors/" # Windows (PowerShell) -Expand-Archive dist\autodesk-windows-x86_64.zip -DestinationPath "$env:APPDATA\IfcOpenShell\IfcViewer\connectors\" +Expand-Archive dist\autodesk-windows-x86_64.zip -DestinationPath "$env:APPDATA\IfcOpenShell\BonsaiViewer\connectors\" ``` -The IfcViewer picks up the connector on next launch. +Bonsai Viewer picks up the connector on next launch. ## Out of scope here diff --git a/src/ifcviewer/settings.rst b/src/ifcviewer/settings.rst index 2962bf0da5..7bb45bd201 100644 --- a/src/ifcviewer/settings.rst +++ b/src/ifcviewer/settings.rst @@ -10,7 +10,7 @@ in the GUI because they target developers and benchmark runs. All variables are read once at first use (most are static-cached inside the function that consumes them), so set them in the shell -before launching ``IfcViewerFull`` rather than expecting hot-toggle +before launching ``BonsaiViewer`` rather than expecting hot-toggle behaviour. Diagnostic and benchmark instrumentation