App,Base: add option to automatically expand compound shapes on file import

Relates to GitHub #374

Author: HuguesDelorme

i18n/mayo_en.qm

@@ -96,6 +96,10 @@ AppModule::AppModule()
 
     m_settings->setPropertyValueConversion(this);
     Application::defineMayoFormat(m_application);
+    m_settings->signalPropertyChanged.connectSlot([=](const Property* prop){
+        if (prop == &m_props.autoExpandCompoundToAssembly)
+            m_application->setAutoExpandCompoundToAssembly(m_props.autoExpandCompoundToAssembly);
+    });
 }
 
 QStringUtils::TextOptions AppModule::defaultTextOptions() const

i18n/mayo_en.ts

@@ -39,6 +39,8 @@ AppModuleProperties::AppModuleProperties(Settings* settings)
       groupId_application(settings->addGroup(textId("application"))),
       groupId_meshing(settings->addGroup(textId("meshing"))),
       groupId_graphics(settings->addGroup(textId("graphics"))),
+      groupId_import(settings->addGroup(textId("import"))),
+      groupId_export(settings->addGroup(textId("export"))),
       language(this, textId("language"), &AppModule::languages()),
       viewCubeCorner(this, textId("viewCubeCorner"), &cornerEnumeration()),
       m_settings(settings)
@@ -95,6 +97,9 @@ AppModuleProperties::AppModuleProperties(Settings* settings)
     settings->addSetting(&this->meshDefaultsShowEdges, sectionId_graphicsMeshDefaults);
     settings->addSetting(&this->meshDefaultsShowNodes, sectionId_graphicsMeshDefaults);
 
+    // Import
+    settings->addSetting(&this->autoExpandCompoundToAssembly, groupId_import);
+
     // Register reset functions
     settings->addResetFunction(sectionId_systemUnits, [=]{
         this->unitSystemDecimals.setValue(2);
@@ -139,14 +144,16 @@ AppModuleProperties::AppModuleProperties(Settings* settings)
         this->meshDefaultsShowEdges.setValue(meshDefaults.showEdges);
         this->meshDefaultsShowNodes.setValue(meshDefaults.showNodes);
     });
+    settings->addResetFunction(groupId_import, [=]{
+        this->autoExpandCompoundToAssembly.setValue(true);
+    });
 }
 
 void AppModuleProperties::IO_bindParameters(const IO::System* ioSystem)
 {
     // Import
-    const auto groupId_Import = m_settings->addGroup(textId("import"));
     for (IO::Format format : ioSystem->readerFormats()) {
-        auto sectionId_format = m_settings->addSection(groupId_Import, IO::formatIdentifier(format));
+        auto sectionId_format = m_settings->addSection(groupId_import, IO::formatIdentifier(format));
         const IO::FactoryReader* factory = ioSystem->findFactoryReader(format);
         std::unique_ptr<PropertyGroup> ptrGroup = factory->createProperties(format, m_settings);
         if (ptrGroup) {
@@ -161,9 +168,8 @@ void AppModuleProperties::IO_bindParameters(const IO::System* ioSystem)
     }
 
     // Export
-    const auto groupId_Export = m_settings->addGroup(textId("export"));
     for (IO::Format format : ioSystem->writerFormats()) {
-        auto sectionId_format = m_settings->addSection(groupId_Export, IO::formatIdentifier(format));
+        auto sectionId_format = m_settings->addSection(groupId_export, IO::formatIdentifier(format));
         const IO::FactoryWriter* factory = ioSystem->findFactoryWriter(format);
         std::unique_ptr<PropertyGroup> ptrGroup = factory->createProperties(format, m_settings);
         if (ptrGroup) {
@@ -253,6 +259,12 @@ void AppModuleProperties::retranslate()
     this->clipPlanesCappingHatchOn.setDescription(
         textIdTr("Enable capping hatch texture of currently clipped graphics")
     );
+
+    // Import
+    this->autoExpandCompoundToAssembly.setDescription(
+        textIdTr("Automatically expand compound shapes to assemblies. For some input models this "
+                 "allows 3D exploding")
+    );
 }
 
 void AppModuleProperties::onPropertyChanged(Property* prop)

i18n/mayo_fr.qm

@@ -57,6 +57,8 @@ class AppModuleProperties : public PropertyGroup {
     const Settings::GroupIndex groupId_application;
     const Settings::GroupIndex groupId_meshing;
     const Settings::GroupIndex groupId_graphics;
+    const Settings::GroupIndex groupId_import;
+    const Settings::GroupIndex groupId_export;
 
     // System
     PropertyInt unitSystemDecimals{ this, textId("decimalCount") };
@@ -91,6 +93,8 @@ class AppModuleProperties : public PropertyGroup {
     PropertyEnumeration meshDefaultsMaterial{ this, textId("material"), &OcctEnums::Graphic3d_NameOfMaterial() };
     PropertyBool meshDefaultsShowEdges{ this, textId("showEgesOn") };
     PropertyBool meshDefaultsShowNodes{ this, textId("showNodesOn") };
+    // Import
+    PropertyBool autoExpandCompoundToAssembly{ this, textId("autoExpandCompoundToAssembly") };
 
 protected:
     // -- from PropertyGroup

i18n/mayo_fr.ts

@@ -50,6 +50,7 @@ class Document::FormatXmlRetrievalDriver : public XmlXCAFDrivers_DocumentRetriev
 struct Application::Private {
     std::atomic<Document::Identifier> m_seqDocumentIdentifier = {};
     std::unordered_map<Document::Identifier, DocumentPtr> m_mapIdentifierDocument;
+    bool m_autoExpandCompoundToAssembly = true;
 };
 
 struct ApplicationI18N {
@@ -143,6 +144,16 @@ void Application::closeDocument(const DocumentPtr& doc)
     //doc->Main().ForgetAllAttributes(true/*clearChildren*/);
 }
 
+bool Application::autoExpandCompoundToAssembly() const
+{
+    return d->m_autoExpandCompoundToAssembly;
+}
+
+void Application::setAutoExpandCompoundToAssembly(bool on)
+{
+    d->m_autoExpandCompoundToAssembly = on;
+}
+
 void Application::defineMayoFormat(const ApplicationPtr& app)
 {
     const char strFougueCopyright[] = "Copyright (c) 2024, Fougue Ltd. <https://www.fougue.pro>";