Merge pull request #136 from LIHPC-Computational-Geometry/topology_import_V0

Topology import v0

Author: SimonCald

src/Core/Topo/CommandExportBlocks.cpp

@@ -10,7 +10,7 @@ namespace Topo {
 /*----------------------------------------------------------------------------*/
 CommandExportBlocks::
 CommandExportBlocks(Internal::Context &context, const std::string &fileName)
-: Internal::CommandInternal(context, "Export des Blocs"), m_impl(context, fileName)
+: Internal::CommandInternal(context, "Export des Blocs"),m_filename(fileName), m_impl(context, fileName)
 {}
 /*----------------------------------------------------------------------------*/
 CommandExportBlocks::~CommandExportBlocks()
@@ -19,6 +19,19 @@ CommandExportBlocks::~CommandExportBlocks()
 void CommandExportBlocks::
 internalExecute()
 {
+
+    std::string ext;
+    int i = m_filename.rfind('.', m_filename.length());
+    if (i != std::string::npos) {
+        ext = m_filename.substr(i+1, m_filename.length() - i);
+    }
+
+    if(ext != "blk"){
+        TkUtil::UTF8String	message (TkUtil::Charset::UTF_8);
+        message<<"Erreur dans l'extension du fichier, merci d'utiliser \".blk\"";
+        throw TkUtil::Exception (message);
+
+    }
     // écriture du STEP
     m_impl.perform(&getInfoCommand());
 }

src/Core/Topo/CommandImportBlocks.cpp

@@ -0,0 +1,55 @@
+//
+// Created by calderans on 4/3/25.
+//
+
+#include "Topo/CommandImportBlocks.h"
+/*----------------------------------------------------------------------------*/
+#include <TkUtil/Exception.h>
+/*----------------------------------------------------------------------------*/
+namespace Mgx3D {
+/*----------------------------------------------------------------------------*/
+    namespace Topo {
+
+/*----------------------------------------------------------------------------*/
+        CommandImportBlocks::
+        CommandImportBlocks(Internal::Context& c, const std::string& n)
+                : CommandCreateTopo(c, "Import (Topo) Mdl"), m_filename(n)
+        {
+            m_impl = new ImportBlocksImplementation(c, &getInfoCommand(), m_filename);
+        }
+/*----------------------------------------------------------------------------*/
+        CommandImportBlocks::~CommandImportBlocks()
+        {
+            if(m_impl)
+                delete m_impl;
+        }
+/*----------------------------------------------------------------------------*/
+        void CommandImportBlocks::
+        internalExecute()
+        {
+            m_impl->internalExecute();
+
+
+            for(auto te : getInfoCommand().getTopoInfoEntity()){
+                if(te.first->getDim() == 0){
+                    getTopoManager().add((Vertex*)te.first);
+                }else if(te.first->getDim() == 1){
+                    getTopoManager().add((CoEdge*)te.first);
+                }else if(te.first->getDim() == 2){
+                    getTopoManager().add((CoFace*)te.first);
+                }else if(te.first->getDim() == 3){
+                    getTopoManager().add((Block*)te.first);
+                }
+            }
+
+        }
+/*----------------------------------------------------------------------------*/
+         void CommandImportBlocks::getPreviewRepresentation(Utils::DisplayRepresentation& dr)
+        {
+            MGX_FORBIDDEN("getPreviewRepresentation non prévu");
+        }
+/*----------------------------------------------------------------------------*/
+    } // end namespace Topo
+/*----------------------------------------------------------------------------*/
+} // end namespace Mgx3D
+/*----------------------------------------------------------------------------*/

src/Core/Topo/ExportBlocksImplementation.cpp

@@ -15,9 +15,6 @@ ExportBlocksImplementation(Internal::Context& c, const std::string& n)
 : m_context(c), m_filename(n)
 {}
 /*----------------------------------------------------------------------------*/
-ExportBlocksImplementation::
-~ExportBlocksImplementation()
-{}
 /*----------------------------------------------------------------------------*/
 void ExportBlocksImplementation::perform(Internal::InfoCommand* icmd)
 {
@@ -105,7 +102,7 @@ void ExportBlocksImplementation::writeEdges(std::ofstream &str, std::vector<Topo
                     for(auto e_name : dynamic_cast<EdgeMeshingPropertyGlobalInterpolate*>(prop)->getFirstCoEdges()){
                         str << m_edge_ids_mapping[e_name] << " ";
                     }
-                    str << "] ";
+                    str << "] [ ";
                     for(auto e_name : dynamic_cast<EdgeMeshingPropertyGlobalInterpolate*>(prop)->getSecondCoEdges()){
                         str << m_edge_ids_mapping[e_name] << " ";
                     }
@@ -181,6 +178,7 @@ void ExportBlocksImplementation::writeFaces(std::ofstream &str, std::vector<Topo
 void ExportBlocksImplementation::writeBlocks(std::ofstream &str, std::vector<Topo::Block*> blocks) {
         str  << "BLOCKS " << blocks.size() << "\n";
         for(auto b : blocks){
+
             int v0 = m_node_ids_mapping[b->getVertex(0)->getName()];
             int v1 = m_node_ids_mapping[b->getVertex(1)->getName()];
             int v2 = m_node_ids_mapping[b->getVertex(2)->getName()];