BRAYNS-643 Fix mesh loader. (#1265)

BlueBrain · Jun 12, 2024 · c0dd7b9 · c0dd7b9
1 parent 7cf4165
commit c0dd7b9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/brayns/io/loaders/mesh/MeshLoader.cpp b/brayns/io/loaders/mesh/MeshLoader.cpp
@@ -42,6 +42,7 @@
 #include <filesystem>
 #include <fstream>
 #include <sstream>
+#include "MeshLoader.h"
 
 namespace
 {
@@ -191,6 +192,11 @@ std::vector<std::string> MeshLoader::getExtensions() const
     return _parsers.getAllSupportedExtensions();
 }
 
+bool MeshLoader::canLoadBinary() const
+{
+    return true;
+}
+
 std::vector<std::shared_ptr<Model>> MeshLoader::loadBinary(const BinaryRequest &request)
 {
     auto format = std::string(request.format);

diff --git a/brayns/io/loaders/mesh/MeshLoader.h b/brayns/io/loaders/mesh/MeshLoader.h
@@ -124,6 +124,13 @@ class MeshLoader : public Loader<EmptyLoaderParams>
      */
     std::vector<std::string> getExtensions() const override;
 
+    /**
+     * @brief Supports binary
+     *
+     * @return true
+     */
+    bool canLoadBinary() const override;
+
     /**
      * @brief Import the mesh in the given scene from the given binary data.
      *

diff --git a/plugins/CircuitExplorer/io/bbploader/CellLoader.cpp b/plugins/CircuitExplorer/io/bbploader/CellLoader.cpp
@@ -175,7 +175,7 @@ std::vector<CellCompartments> CellLoader::load(
 
     auto colorData = ColorDataFactory::create(context);
 
-    if (loadSoma && !loadAxon && !loadDend)
+    if (!loadSoma && !loadAxon && !loadDend)
     {
         return SomaImporter::import(context, model, std::move(colorData));
     }

diff --git a/plugins/CircuitExplorer/io/bbploader/ParameterCheck.cpp b/plugins/CircuitExplorer/io/bbploader/ParameterCheck.cpp
@@ -114,29 +114,12 @@ class ReportChecker
         }
     }
 };
-
-class NeuronSectionsChecker
-{
-public:
-    static void check(const BBPLoaderParameters &input)
-    {
-        const auto &morphSettings = input.neuron_morphology_parameters;
-        const auto loadSoma = morphSettings.load_soma;
-        const auto loadAxon = morphSettings.load_axon;
-        const auto loadDend = morphSettings.load_dendrites;
-        if (!loadSoma && !loadAxon && !loadDend)
-        {
-            throw std::invalid_argument("All neuron sections cannot be disabled");
-        }
-    }
-};
 } // namespace
 
 void ParameterCheck::checkInput(const brion::BlueConfig &config, const BBPLoaderParameters &input)
 {
     InputGidSettingsChecker::check(input);
     TargetChecker::check(config, input);
     ReportChecker::check(config, input);
-    NeuronSectionsChecker::check(input);
 }
 } // namespace bbploader