diff --git a/src/steam/fixture/segment.hpp b/src/steam/fixture/segment.hpp index 4312802ea..ac58c00d5 100644 --- a/src/steam/fixture/segment.hpp +++ b/src/steam/fixture/segment.hpp @@ -83,7 +83,7 @@ namespace fixture { // default copy acceptable Time start() const { return span_.start(); } - Time end() const { return span_.end(); } + Time after() const { return span_.end(); } engine::JobTicket const& jobTicket() const diff --git a/src/steam/fixture/segmentation.cpp b/src/steam/fixture/segmentation.cpp index ba4b094fd..58c4793a7 100644 --- a/src/steam/fixture/segmentation.cpp +++ b/src/steam/fixture/segmentation.cpp @@ -29,7 +29,9 @@ #include "lib/error.hpp" #include "steam/fixture/segmentation.hpp" //#include "steam/mobject/builder/fixture-change-detector.hpp" ///////////TODO +#include "lib/time/timevalue.hpp" +#include namespace steam { @@ -48,20 +50,79 @@ namespace fixture { Segmentation::~Segmentation() { } // emit VTable here... - /** access the globally valid registry instance. - * @throw error::State if this global registry is - * already closed or not yet initialised. */ -//ModelPortRegistry& -//ModelPortRegistry::globalInstance() -//{ -// LockRegistry global_lock; -// if (theGlobalRegistry.isValid()) -// return theGlobalRegistry(); -// -// throw error::State ("global model port registry is not accessible" -// , LERR_(BUILDER_LIFECYCLE)); -//} - + namespace {// Implementation of Split-Splice algorithm + + using lib::time::Time; + using OptTime = std::optional