Changeset 933 for cpp

Timestamp:

05/28/20 18:02:41 (5 years ago)

Author:

Maciej Komosinski

Message:

When constructing a neuron, check whether it supports the shape type of the model (BALL_AND_STICK / SOLIDS) and warn if it does not

File:

• cpp/frams/neuro/neurofactory.cpp (modified) (3 diffs)

cpp/frams/neuro/neurofactory.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -22 +22 @@
 }
 
-NeuroImpl* NeuroFactory::createNeuroImpl(NeuroClass *nc)
+NeuroImpl* NeuroFactory::createNeuroImpl(NeuroClass *nc, Model::ShapeType shape_type)
 {
         if (!nc) return 0;
         if (!nc->active) return 0;
+        if (!(nc->supported_shape_types & (1 << (int)shape_type)))
+        {
+                logPrintf("NeuroFactory", "createNeuroImpl", LOG_WARN,
+                        "Neuro class '%s' does not support shape type '%d'", nc->name.c_str(), (int)shape_type);
+                return NULL;
+        }
         NeuroImpl* ni = getImplementation(nc);
         if (!ni) return 0;
@@ -99 +105 @@
         if (removed.len())
                 logPrintf("NeuroFactory", "removeUninmplemented", LOG_INFO,
-                "Removed Neuro classes: %s", removed.c_str());
+                        "Removed Neuro classes: %s", removed.c_str());
 }