Changeset c8cb0d for src/Shapes

Timestamp:

Dec 26, 2025, 9:40:14 PM (4 days ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.1, stable

Children:

033646

Parents:

f2d5ce

git-author:

Frederik Heber <frederik.heber@…> (12/10/25 16:15:28)

git-committer:

Frederik Heber <frederik.heber@…> (12/26/25 21:40:14)

Message:

Streamlines channel creation in Observables.

• CodePatterns is now version 1.3.4.
• we no longer need to add the channels manually in the cstor of a class that derives from Observable. Instead, we just need to pass the maximum number of channels (as they are typically enumerated anyway) and they are generated and added.
• added mutex protection when inserting.
• adjusted class Relay to forward similar convenience cstors.
• adjusted all call sites in molecuilder.

Location:

src/Shapes

Files:

• ShapeRegistry.cpp (modified) (1 diff)
• unittests/stubs/WorldSelectedMoleculesStub.cpp (modified) (2 diffs)

src/Shapes/ShapeRegistry.cpp

@@ -45 +45 @@
 
 ShapeRegistry::ShapeRegistry() :
-  Observable::Observable("ShapeRegistry")
+  Observable::Observable("ShapeRegistry", NotificationType_MAX)
 {
-  Channels *OurChannel = new Channels;
-  Observable::insertNotificationChannel( std::make_pair(static_cast<Observable *>(this), OurChannel) );
-  // add instance for each notification type
-  for (size_t type = 0; type < NotificationType_MAX; ++type)
-    OurChannel->addChannel(type);
-
   _lastchanged = NULL;
 }

src/Shapes/unittests/stubs/WorldSelectedMoleculesStub.cpp

@@ -61 +61 @@
 
 World::World() :
-    Observable("World"),
+    Observable("World", { World::AtomInserted, World::AtomRemoved }),
     atoms(this),
     selectedAtoms(this),
@@ -68 +68 @@
     selectedMolecules(this),
     moleculeIdPool(0, 20,100)
-{
-  // observable stuff
-  Channels *OurChannel = new Channels;
-  Observable::insertNotificationChannel( std::make_pair(static_cast<Observable *>(this), OurChannel) );
-  // add instance for each notification type
-  OurChannel->addChannel(World::AtomInserted);
-  OurChannel->addChannel(World::AtomRemoved);
-}
+{}
 
 World::~World()