diff --git a/doc/devel/uml/class128005.html b/doc/devel/uml/class128005.html index 646e844c8..971e0c8ea 100644 --- a/doc/devel/uml/class128005.html +++ b/doc/devel/uml/class128005.html @@ -18,10 +18,11 @@

Implementation class for the Session interface

Declaration :

Artifact : sessionimpl, Component(s) : Session

-
Relation edls (<directional composition>)

Declaration :

+
Relation sequences (<directional composition>)

Declaration :

Relation theFixture (<unidirectional association>)

Declaration :

Relation pipes (<directional aggregation>)

the global ports (busses) of the session

Declaration :

Stereotype: vector

-
-

All public operations : currEDL , getFixture

+ +
Relation timelines (<directional composition>)

Declaration :

+

All public operations : getFixture

diff --git a/doc/devel/uml/class128901.html b/doc/devel/uml/class128901.html index 3b1c46b47..947a8c5c6 100644 --- a/doc/devel/uml/class128901.html +++ b/doc/devel/uml/class128901.html @@ -16,8 +16,7 @@ -

Declaration :

Directly inherited by : CompoundClip SimpleClip

-

Artifact : clip

+

Declaration :

Artifact : clip

Relation source (<unidirectional association>)

the media source this clip referes to

Declaration :

All public operations : apply , apply , dispatchOp

diff --git a/doc/devel/uml/class129157.html b/doc/devel/uml/class129157.html index f4d84f14f..6be2c5b5d 100644 --- a/doc/devel/uml/class129157.html +++ b/doc/devel/uml/class129157.html @@ -16,7 +16,7 @@ -

Declaration :

Directly inherited by : Auto Label Track

+

Declaration :

Directly inherited by : Auto Label Root Track

Artifact : meta

All public operations : apply , apply , dispatchOp

diff --git a/doc/devel/uml/class129413.html b/doc/devel/uml/class129413.html index 5c0d8e925..e70987225 100644 --- a/doc/devel/uml/class129413.html +++ b/doc/devel/uml/class129413.html @@ -23,6 +23,7 @@

the kind of relation denoted by this Placement

Declaration :

Attribut offset

Offset the actual position by this (time) value relative to the anchor point. TODO: Representation?

Declaration :

Class RelType
-
+ +
Relation <unidirectional association>

Declaration :

diff --git a/doc/devel/uml/class136709.html b/doc/devel/uml/class136709.html index 07f4ded09..ae91cfd90 100644 --- a/doc/devel/uml/class136709.html +++ b/doc/devel/uml/class136709.html @@ -16,7 +16,7 @@ -

key abstraction: media-like assets

Declaration :

Directly inherited by : Clip CompoundMedia Unknown

+

key abstraction: media-like assets

Declaration :

Directly inherited by : CompoundMedia Unknown

Artifact : media

Operation createClip

create a (possibly compound) Clip refering to this media, ready to be added to the EDL.

Declaration :

diff --git a/doc/devel/uml/class136965.html b/doc/devel/uml/class136965.html index 6d8310a27..74b84abab 100644 --- a/doc/devel/uml/class136965.html +++ b/doc/devel/uml/class136965.html @@ -16,7 +16,7 @@ -

key abstraction: structural asset

Declaration :

Directly inherited by : Pipe ProcPatt Track

+

key abstraction: structural asset

Declaration :

Directly inherited by : Pipe ProcPatt Sequence Timeline

Artifact : struct

All public operations : enable , getDependant , getParents , isActive

diff --git a/doc/devel/uml/class137093.html b/doc/devel/uml/class137093.html index c57edd68a..750e698dc 100644 --- a/doc/devel/uml/class137093.html +++ b/doc/devel/uml/class137093.html @@ -16,7 +16,7 @@ -

key abstraction: metadata and organisational asset

Declaration :

Directly inherited by : Dataset

+

key abstraction: metadata and organisational asset

Declaration :

Directly inherited by : Dataset Inventory

Artifact : meta

All public operations : enable , getDependant , getParents , isActive

diff --git a/doc/devel/uml/class138501.html b/doc/devel/uml/class138501.html index 420f671ef..6a8c7a7ff 100644 --- a/doc/devel/uml/class138501.html +++ b/doc/devel/uml/class138501.html @@ -16,9 +16,10 @@ -

compound of several elementary media tracks,
e.g. the individual media streams found in one media file

Declaration :

Artifact : compoundmedia

+

compound of several elementary media tracks,
e.g. the individual media streams found in one media file

Declaration :

Directly inherited by : VirtualMedia

+

Artifact : compoundmedia

-
Relation tracks (<directional aggregation>)

elementary media assets comprising this compound

Declaration :

  • Uml : # tracks : Media, multiplicity : 1..*
  • C++ : protected: vector<Media *> tracks

Stereotype: vector

+
Relation channels (<directional aggregation>)

elementary media assets comprising this compound

Declaration :

  • Uml : # channels : Media, multiplicity : 1..*
  • C++ : protected: vector<Media *> channels

Stereotype: vector

All public operations : createClip , enable , getDependant , getParents , howtoProc , isActive

diff --git a/doc/devel/uml/class138629.html b/doc/devel/uml/class138629.html deleted file mode 100644 index 07422105d..000000000 --- a/doc/devel/uml/class138629.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - -Class CompoundClip - - - - - -
Class CompoundClip
-

- - - - -

Clip MObject which is actually a compound of several elementary clips,
e.g. the several streams found within multichannels media.

Declaration :

Artifact : compoundclip, Diagram : Session structure

- -
Relation components (<directional aggregation>)

Declaration :

  • Uml : # components : Clip, multiplicity : 1..*
  • C++ : protected: Clip* components
-

All public operations : apply , apply , dispatchOp

- - diff --git a/doc/devel/uml/class139653.html b/doc/devel/uml/class139653.html index c5d179e40..400289bb0 100644 --- a/doc/devel/uml/class139653.html +++ b/doc/devel/uml/class139653.html @@ -18,11 +18,10 @@

Primary Interface for all editing tasks.
The session contains defaults, all the assets being edited, and a set of EDL with the individual MObjects to be manipulated and rendered.

Declaration :

Directly inherited by : SessionImpl

Artifact : session

- -
Operation currEDL

The EDL currently in focus. In most cases, Session and EDL are almost the same, just EDL emphasizes the collection aspect. But generally (for larger editing projects) one Session can contain several EDLs, which may even be nested. At any given time, only one of these EDLs has focus and recieves the editing commands.

Declaration :

  • Uml : + currEDL() : Seq
  • C++ : public: Seq currEDL ()
+
Operation getFixture

While the session can be comprised of several EDLs,
there is only one Fixture, which represents the actual
configuration of all Objects to be rendered

Declaration :

  • Uml : + getFixture() : Fixture&
  • C++ : public: Fixture& getFixture ()
Relation current (<unidirectional association>)

Standard access path to get at the current session via the Session Manager, which acts as a "PImpl" smart pointer

Declaration :

Relation defaults (<unidirectional association>)

Declaration :

-

All public operations : currEDL , getFixture

+

All public operations : getFixture

diff --git a/doc/devel/uml/class139781.html b/doc/devel/uml/class139781.html index f731b1ac4..061f137e6 100644 --- a/doc/devel/uml/class139781.html +++ b/doc/devel/uml/class139781.html @@ -21,7 +21,8 @@
Operation clear

clear current session contents
without resetting overall session config.
Afterwards, the session will contain only one
empty EDL, while all Assets are retained.

Declaration :

Operation reset

reset all session config and
start with a pristine default session.

Declaration :

Operation load

replace the current session by a new
session loaded from serialized state.

Declaration :

-
Operation save

create a complete, serialized representation
of the current session config and contents.
@todo how to serialize, prameters, return value?

Declaration :

+
Operation save

create a complete, serialized representation
of the current session config and contents.
@todo how to serialize, prameters, return value?

Declaration :

+
Relation current (<unidirectional association>)

Declaration :

All public operations : clear , load , reset , save

diff --git a/doc/devel/uml/class145541.html b/doc/devel/uml/class145541.html index 842eae98c..01c7d8549 100644 --- a/doc/devel/uml/class145541.html +++ b/doc/devel/uml/class145541.html @@ -24,6 +24,7 @@
Relation <unidirectional association>

Declaration :

Relation globalBusses (<directional composition>)

Declaration :

Stereotype: list

- + +
Relation <unidirectional association>

Declaration :

diff --git a/doc/devel/uml/class152197.html b/doc/devel/uml/class152197.html index 3bc899ed8..7122d9e3b 100644 --- a/doc/devel/uml/class152197.html +++ b/doc/devel/uml/class152197.html @@ -16,5 +16,8 @@ -

Declaration :

+

Declaration :

+
+

All public operations : enable , getDependant , getParents , isActive

+ diff --git a/doc/devel/uml/class137349.html b/doc/devel/uml/class160389.html similarity index 54% rename from doc/devel/uml/class137349.html rename to doc/devel/uml/class160389.html index 5239eaf48..b5ac2cfb6 100644 --- a/doc/devel/uml/class137349.html +++ b/doc/devel/uml/class160389.html @@ -4,21 +4,20 @@ -Class Clip +Class VirtualMedia -
Class Clip
+
Class VirtualMedia

- -

bookkeeping (asset) view of a media clip.

Declaration :

Artifact : clip

- -
Relation source (<unidirectional association>)

media source of this clip

Declaration :

+ +

Declaration :

+

All public operations : createClip , enable , getDependant , getParents , howtoProc , isActive

diff --git a/doc/devel/uml/class138885.html b/doc/devel/uml/class160517.html similarity index 64% rename from doc/devel/uml/class138885.html rename to doc/devel/uml/class160517.html index efb3765a6..5df5eae18 100644 --- a/doc/devel/uml/class138885.html +++ b/doc/devel/uml/class160517.html @@ -4,19 +4,19 @@ -Class SimpleClip +Class Root -
Class SimpleClip
+
Class Root

- -

Elementary clip consisting of only one media stream

Declaration :

Artifact : simpleclip

+ +

Declaration :

All public operations : apply , apply , dispatchOp

diff --git a/doc/devel/uml/class160645.html b/doc/devel/uml/class160645.html new file mode 100644 index 000000000..b2d4551c9 --- /dev/null +++ b/doc/devel/uml/class160645.html @@ -0,0 +1,20 @@ + + + + + + +Class EntryID + + + + + +
Class EntryID
+

+ + + + +

Declaration :

+ diff --git a/doc/devel/uml/class137989.html b/doc/devel/uml/class160773.html similarity index 67% rename from doc/devel/uml/class137989.html rename to doc/devel/uml/class160773.html index 95d34e58f..492b8f15f 100644 --- a/doc/devel/uml/class137989.html +++ b/doc/devel/uml/class160773.html @@ -4,19 +4,19 @@ -Class Track +Class Inventory -
Class Track
+
Class Inventory

- -

structural asset holding the configuration of a track in the EDL

Declaration :

Artifact : track

+ +

Declaration :

All public operations : enable , getDependant , getParents , isActive

diff --git a/doc/devel/uml/class160901.html b/doc/devel/uml/class160901.html new file mode 100644 index 000000000..8c0e21e0c --- /dev/null +++ b/doc/devel/uml/class160901.html @@ -0,0 +1,23 @@ + + + + + + +Class Timeline + + + + + +
Class Timeline
+

+ + + + +

Declaration :

+
+

All public operations : enable , getDependant , getParents , isActive

+ + diff --git a/doc/devel/uml/classdiagrams.html b/doc/devel/uml/classdiagrams.html index 73a9e7f73..f76cda8f3 100644 --- a/doc/devel/uml/classdiagrams.html +++ b/doc/devel/uml/classdiagrams.html @@ -29,6 +29,7 @@ interface components Layer Separation Interface Media-Asset Relations +Meta-Asset Relations MObjectRef Proc-Asset Relations Query Interface diff --git a/doc/devel/uml/classes.html b/doc/devel/uml/classes.html index 7254ced2b..da2c30b21 100644 --- a/doc/devel/uml/classes.html +++ b/doc/devel/uml/classes.html @@ -38,14 +38,12 @@ C_Interface Caller Categorytree like classification of Assets -Clipbookkeeping (asset) view of a media clip. Clip Closure CmdClosure Codecdescription of some media data decoder or encoder facility CodecAdapter CommandinterfaceKey abstraction for all proc/edit operations and UNDO management -CompoundClipClip MObject which is actually a compound of several elementary clips,
e.g. the several streams found within multichannels media. CompoundMediacompound of several elementary media tracks,
e.g. the individual media streams found in one media file ConditionI provided a reworked Condition class in my Cinelerra2 repository Config @@ -64,6 +62,7 @@ DoSync EffectEffect or media processing component Effect +EntryID Error ExitNodeThe output of the render pipeline. Pulling from such exit nodes actually ivokes the render process ExplicitPlacementinterface @@ -93,6 +92,7 @@ InstanceHandle InterpolatorProvides the implementation for getting the acutal value of a time varying or automated effect/plugin parameter Invalid +Inventory Invocation IterAdapter Label @@ -162,6 +162,7 @@ ResolvingFacility Result ResultSet +Root Scheduler Scope ScopeLocatorsingleton @@ -178,7 +179,6 @@ SessionImplImplementation class for the Session interface SessManager shared_ptr -SimpleClipElementary clip consisting of only one media stream SmartPointerauxiliary SourceSource Node: represents a media source to pull data from. Stateinterface @@ -193,11 +193,11 @@ STypeManager ThreadWe can basically reuse the Thread class design from Cinelerra2, Thread becomes a baseclass for all Threads Timedenotes a temporal position (time point), based on timeline start.

investigate posix.4 realtime timers, wrap these here +Timeline Timeline TimelineView Tool ToolFactory -Trackstructural asset holding the configuration of a track in the EDL Track Trafo TypeHandlerinterface @@ -207,6 +207,7 @@ Unknownplaceholder for unknown or unavailable media source Useractor VFrame +VirtualMedia Visitable WiringDescriptor Wish diff --git a/doc/devel/uml/classes_list.html b/doc/devel/uml/classes_list.html index ab8b6e948..b78832adf 100644 --- a/doc/devel/uml/classes_list.html +++ b/doc/devel/uml/classes_list.html @@ -39,14 +39,12 @@ C_Interface
Caller
Category
-Clip
Clip
Closure
CmdClosure
Codec
CodecAdapter
Command
-CompoundClip
CompoundMedia
Condition
Config
@@ -65,6 +63,7 @@ DoSync
Effect
Effect
+EntryID
Error
ExitNode
ExplicitPlacement
@@ -94,6 +93,7 @@ InstanceHandle
Interpolator
Invalid
+Inventory
Invocation
IterAdapter
Label
@@ -163,6 +163,7 @@ ResolvingFacility
Result
ResultSet
+Root
Scheduler
Scope
ScopeLocator
@@ -179,7 +180,6 @@ SessionImpl
SessManager
shared_ptr
-SimpleClip
SmartPointer
Source
State
@@ -194,11 +194,11 @@ STypeManager
Thread
Time
+Timeline
Timeline
TimelineView
Tool
ToolFactory
-Track
Track
Trafo
TypeHandler
@@ -208,6 +208,7 @@ Unknown
User
VFrame
+VirtualMedia
Visitable
WiringDescriptor
Wish
diff --git a/doc/devel/uml/fig128133.png b/doc/devel/uml/fig128133.png index bd2f6fca4..a88ba5dbb 100644 Binary files a/doc/devel/uml/fig128133.png and b/doc/devel/uml/fig128133.png differ diff --git a/doc/devel/uml/fig128309.png b/doc/devel/uml/fig128309.png deleted file mode 100644 index 7baed24d4..000000000 Binary files a/doc/devel/uml/fig128309.png and /dev/null differ diff --git a/doc/devel/uml/fig128437.png b/doc/devel/uml/fig128437.png deleted file mode 100644 index 7baed24d4..000000000 Binary files a/doc/devel/uml/fig128437.png and /dev/null differ diff --git a/doc/devel/uml/fig130309.png b/doc/devel/uml/fig130309.png index 13a1d2dce..cdace7325 100644 Binary files a/doc/devel/uml/fig130309.png and b/doc/devel/uml/fig130309.png differ diff --git a/doc/devel/uml/fig130437.png b/doc/devel/uml/fig130437.png index 395b02299..e774171fb 100644 Binary files a/doc/devel/uml/fig130437.png and b/doc/devel/uml/fig130437.png differ diff --git a/doc/devel/uml/fig131205.png b/doc/devel/uml/fig131205.png index b1007060f..17826d19b 100644 Binary files a/doc/devel/uml/fig131205.png and b/doc/devel/uml/fig131205.png differ diff --git a/doc/devel/uml/fig131333.png b/doc/devel/uml/fig131333.png deleted file mode 100644 index ddb047862..000000000 Binary files a/doc/devel/uml/fig131333.png and /dev/null differ diff --git a/doc/devel/uml/fig134021.png b/doc/devel/uml/fig134021.png index 5405d2010..ae328758b 100644 Binary files a/doc/devel/uml/fig134021.png and b/doc/devel/uml/fig134021.png differ diff --git a/doc/devel/uml/fig136325.png b/doc/devel/uml/fig136325.png index d3247b41e..e8ba3fb7c 100644 Binary files a/doc/devel/uml/fig136325.png and b/doc/devel/uml/fig136325.png differ diff --git a/doc/devel/uml/fig136581.png b/doc/devel/uml/fig136581.png index f94911df8..8351d4cab 100644 Binary files a/doc/devel/uml/fig136581.png and b/doc/devel/uml/fig136581.png differ diff --git a/doc/devel/uml/fig137733.png b/doc/devel/uml/fig137733.png index df4eb2a81..dee6b1364 100644 Binary files a/doc/devel/uml/fig137733.png and b/doc/devel/uml/fig137733.png differ diff --git a/doc/devel/uml/fig138885.png b/doc/devel/uml/fig138885.png new file mode 100644 index 000000000..161e146c8 Binary files /dev/null and b/doc/devel/uml/fig138885.png differ diff --git a/doc/devel/uml/fig139141.png b/doc/devel/uml/fig139141.png new file mode 100644 index 000000000..6bd93838b Binary files /dev/null and b/doc/devel/uml/fig139141.png differ diff --git a/doc/devel/uml/index.html b/doc/devel/uml/index.html index a7d15c3ef..c70d7b296 100644 --- a/doc/devel/uml/index.html +++ b/doc/devel/uml/index.html @@ -147,7 +147,7 @@ Documentation
Artifact Lumiera

the main executable to be built

Depends on common

Depends on gui

Depends on proc

Depends on backend

Stereotype: executable

-

executable associated with : aframe, assembler, trafo, allocation, vframe, toolfactory, hub, buildable, abstractmo, exitnode, pathmanager, track, meta, fixedlocation, relativelocation, controllerfacade, rendergraph, pluginadapter, explicitplacement, auto, glrender, arender, renderstate, label, nodecreatertool, projector, interpolator, paramprovider, mask, mobject, source, frame, effect, buildertool, segmentationtool, link, parameter, renderengine, glbuf, procnode, stateproxy, edl, fixture, glpipe, main, conmanager, clip, vrender, placement, sessionimpl, builderfacade

+

executable associated with : link, parameter, renderengine, glbuf, procnode, stateproxy, edl, fixture, glpipe, main, conmanager, clip, vrender, placement, sessionimpl, builderfacade, aframe, assembler, trafo, allocation, vframe, toolfactory, hub, buildable, abstractmo, exitnode, pathmanager, track, meta, fixedlocation, relativelocation, controllerfacade, rendergraph, pluginadapter, explicitplacement, auto, glrender, arender, renderstate, label, nodecreatertool, projector, interpolator, paramprovider, mask, mobject, source, frame, effect, buildertool, segmentationtool

Artifact main

Stereotype: source

@@ -300,7 +300,7 @@ Documentation
Artifact clip

bookkeeping (asset) view of a media clip.

Stereotype: source

-

Artifact source associated with : Clip

+

Artifact source

Artifact compoundmedia

a special clip as a compound of several elementary media tracks,
e.g. the individual media streams found in one media file

@@ -335,7 +335,7 @@ Documentation
Artifact track

structural asset holding the configuration of a track in the EDL

Stereotype: source

-

Artifact source associated with : Track

+

Artifact source

Artifact procpatt

template for building some render processing network

@@ -492,12 +492,12 @@ Documentation
Artifact simpleclip

Elementary clip (single media stream only)

Stereotype: source

-

Artifact source associated with : SimpleClip

+

Artifact source

Artifact compoundclip

compound of several clips (multichannel)

Stereotype: source

-

Artifact source associated with : CompoundClip

+

Artifact source

Artifact effect

EDL representation of a pluggable and automatable effect.

@@ -748,21 +748,25 @@ Documentation

Struct-Asset Relations



+ +

+

Meta-Asset Relations



Class Asset
Class AssetManager
Class Media
Class MediaFactory
Class CompoundMedia
+
Class VirtualMedia
Class Proc
Class Struct
Class Meta
Class Category
-
Class Clip
Class Unknown
Class Preview
Class Effect
Class Codec
-
Class Track
+
Class Sequence
+
Class Timeline
Class Pipe
Class ProcPatt
Class Dataset
@@ -770,6 +774,12 @@ Documentation
Class BuildInstruct
Class DoAttach
Class DoRecurse
+
Class Inventory
+
+ +

2.1.2 Class View Types

+
+
Class EntryID
@@ -967,14 +977,14 @@ undo
Class Fixture
Class Segmentation
Class Segment
+
Class Root
Class Track
+
Class Binding
Class MObject
Class Placement
Class ExplicitPlacement
Class AbstractMO
Class Clip
-
Class SimpleClip
-
Class CompoundClip
Class Effect
Class Meta
Class FixedLocation
@@ -1008,9 +1018,37 @@ undo

Session backbone



Class PlacementIndex
-
Class Sequence
-
Class Binding
-
+ +

+

ModelAssetRelations



+ +
Class instance

type :Root

+
Class instance

type :Track

+
Class instance

type :Track

+
Class instance

type :Track

+
Class instance

type :Track

+
Class instance

type :Track

+
Class instance

type :Binding

+
Class instance

type :Sequence

+
Class instance

type :Binding

+
Class instance

type :Sequence

+
Class instance

type :Clip

+
Class instance

type :Effect

+
Class instance

type :Effect

+
Class instance

type :Effect

+
Class instance

type :Clip

+
Class instance

type :Track

+
Class instance

type :Media

+
Class instance

type :Media

+
Class instance

type :VirtualMedia

+
Class instance

type :EntryID

+
Class instance

type :Track

+
Class instance

type :Label

+
Class instance

type :EntryID

+
Class instance

type :EntryID

+
Class instance plugin1

type :Effect

+
Class instance plugin2

type :Effect

+
Class instance

type :Timeline

2.3.2 Package Placement

@@ -1128,21 +1166,6 @@ undo

2.3.4 Use Case View config examples

-
- -

-

multichannel clip



- -
Class instance

type :Clip

-
Class instance

type :CompoundMedia

-
Class instance

type :Media

-
Class instance

type :Media

-
Class instance

type :Media

-
Class instance

type :CompoundClip

-
Class instance

type :SimpleClip

-
Class instance

type :SimpleClip

-
Class instance

type :SimpleClip

-
Class instance

type :Placement

2.4 Package RenderEngine

diff --git a/doc/devel/uml/index_60.html b/doc/devel/uml/index_60.html index 5fa958d5f..f34d521d4 100644 --- a/doc/devel/uml/index_60.html +++ b/doc/devel/uml/index_60.html @@ -37,27 +37,27 @@ <flow>transition <flow>transition <flow>transition -<transition>transition <transition>transition +<transition>transition <transition>transition <transition>transition <transition>transition <transition>transition <transition>transition <transition>transition -<transition>transition <transition>transition +<transition>transition +<transition>transition +<transition>transition +<transition>transition +<transition>transition +<transition>transition +<transition>transition <transition>transition <transition>transition -<transition>transition -<transition>transition <transition>transition -<transition>transition -<transition>transition -<transition>transition -<transition>transition -<transition>transition <transition>transition +<transition>transition <transition>transition diff --git a/doc/devel/uml/index_65.html b/doc/devel/uml/index_65.html index 4afe9874b..1b805be3d 100644 --- a/doc/devel/uml/index_65.html +++ b/doc/devel/uml/index_65.html @@ -60,8 +60,8 @@ aud_Aclass instance aud_aclass instance audioclass instance -audio1class instance audio1class instance +audio1class instance audio1class instance autoartifactMedia Object holding automation data AutoclassAutomation data for some parameter (i.e. a time varying function) diff --git a/doc/devel/uml/index_66.html b/doc/devel/uml/index_66.html index bb6bceff8..36ad84a5e 100644 --- a/doc/devel/uml/index_66.html +++ b/doc/devel/uml/index_66.html @@ -38,8 +38,8 @@ buildableartifactmarker interface denoting any MObject able to be treated by Tools buildEngineoperationMain Operation of the Builder: create a render engine for a given part of the timeline Buildercomponent -Builderpackage builderpackagesourcecode package

The Builder creating the Render Engine,
located within the MObject Subsystem +Builderpackage Builder Entitiesclass diagram Builder Tool (Visitor)class diagram Builder Workingsclass view diff --git a/doc/devel/uml/index_67.html b/doc/devel/uml/index_67.html index 573a61e0e..54a9de861 100644 --- a/doc/devel/uml/index_67.html +++ b/doc/devel/uml/index_67.html @@ -29,42 +29,57 @@ Categoryclasstree like classification of Assets categoryartifacttree like classification of Assets causeattributea copy of the first exception encountered in this exception chain -chainoperationcreate and add another Placement for this media object, thus increasingly constraining the (possible) position of this object. chainrelationChain of additional Placements further constraining the position of this MObject +chainoperationcreate and add another Placement for this media object, thus increasingly constraining the (possible) position of this object. +channelsrelationelementary media assets comprising this compound checked_inrelationchecked_in objects are subject of cache aging and must be not in use checked_outrelationthis list keeps all mappings which are in use, and thus prevents them from Cache aging choice pseudo statechoice pseudo state -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance class instanceclass instance -class instanceclass instance -class instanceclass instance class instanceclass instance -class instanceclass instance -class instanceclass instance -class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance class instanceclass instance +class instanceclass instance class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance +class instanceclass instance clearoperationclear current session contents
without resetting overall session config.
Afterwards, the session will contain only one
empty EDL, while all Assets are retained.
client codecomponent -Clipclassbookkeeping (asset) view of a media clip. clipartifacta Media Clip clipartifactbookkeeping (asset) view of a media clip. Clipclass @@ -87,10 +102,8 @@ CommonLibcomponent CommonLibpackage complete Render Engineactivity object -componentsrelation componentscomponent diagram compoundclipartifactcompound of several clips (multichannel) -CompoundClipclassClip MObject which is actually a compound of several elementary clips,
e.g. the several streams found within multichannels media. CompoundMediaclasscompound of several elementary media tracks,
e.g. the individual media streams found in one media file compoundmediaartifacta special clip as a compound of several elementary media tracks,
e.g. the individual media streams found in one media file ConditionclassI provided a reworked Condition class in my Cinelerra2 repository @@ -121,9 +134,9 @@ create ProcNodeopaque activity action create specific objectuse case createClipoperationcreate a (possibly compound) Clip refering to this media, ready to be added to the EDL. -currEDLoperationThe EDL currently in focus. In most cases, Session and EDL are almost the same, just EDL emphasizes the collection aspect. But generally (for larger editing projects) one Session can contain several EDLs, which may even be nested. At any given time, only one of these EDLs has focus and recieves the editing commands. currentclass instance currentrelationStandard access path to get at the current session via the Session Manager, which acts as a "PImpl" smart pointer +currentrelation currFramerelation Cursorclass Custom holdersclass view diff --git a/doc/devel/uml/index_69.html b/doc/devel/uml/index_69.html index 3c4e4f7af..f2006f6ac 100644 --- a/doc/devel/uml/index_69.html +++ b/doc/devel/uml/index_69.html @@ -21,10 +21,9 @@ EDLcomponent EDL Example1object diagramA simple example showing how the actual objects are placed in the Fixture (=definitive playlist). It shows a Video and Audio clip placed on two tracks EDL Example2object diagramMore complex example showing the Object graph in the EDL and how it is linked into the Fixture to yield the actual locations. In this example, an HUE Effect is applied on a part of the Clip -edlsrelation EffectclassEffect or media processing component -effectartifactEDL representation of a pluggable and automatable effect. effectartifactEffect or media processing component +effectartifactEDL representation of a pluggable and automatable effect. Effectclass effective timeline (Fixture)node effectiveTimelinerelation @@ -37,6 +36,7 @@ Engine Example2object diagramExample2 (from EDL) continued: notably in this RenderEngine the Effect has been partitioned into 2 segments with constant configuration. Engine Partsdeployment view Engine Workingsclass view +EntryIDclass errorpackageNamespace for Exception Kinds errorclass view Errorclass diff --git a/doc/devel/uml/index_73.html b/doc/devel/uml/index_73.html index bc3749d4b..60618f2bc 100644 --- a/doc/devel/uml/index_73.html +++ b/doc/devel/uml/index_73.html @@ -25,9 +25,9 @@ ImplFacadeclass In Memory Databaseclass diagram inFixtureactivity action pin -inputclass instance inputclass instance inputclass instance +inputclass instance instanceoperation InstanceHandleclass instructionsrelation @@ -38,6 +38,7 @@ interpolatorartifactdenotes a facility to get (continuously interpolated) parameter values InterpolatorclassProvides the implementation for getting the acutal value of a time varying or automated effect/plugin parameter Invalidclass +Inventoryclass Invocationclass iporelation isActiveoperationweather this asset is swithced on and consequently included in the fixture and participates in rendering diff --git a/doc/devel/uml/index_77.html b/doc/devel/uml/index_77.html index c54b8ea8c..fd63eeb6b 100644 --- a/doc/devel/uml/index_77.html +++ b/doc/devel/uml/index_77.html @@ -34,17 +34,18 @@ MediaKindclass merge activity nodemerge activity node Metaclasskey abstraction: metadata and organisational asset -metaartifactkey abstraction: metadata and organisational asset metaartifactabstract base class of all MObjects representing meta data or processing instructions +metaartifactkey abstraction: metadata and organisational asset Metaclass +Meta-Asset Relationsclass diagram mobjectartifactKey Abstraction: A Media Object in the Session mobjectpackagesourcecode package

MObject Subsystem
including the Session (EDL), Builder and Processing Controller MObjectpackage MObjectclass MObjectRefclass diagram MObjectRefclass +ModelAssetRelationsobject diagram Monitorclass -multichannel clipobject diagram Mutationclass MutexclassI provided a reworked Mutex class in my Cinelerra2 repository diff --git a/doc/devel/uml/index_80.html b/doc/devel/uml/index_80.html index 1c5804224..4593a9e60 100644 --- a/doc/devel/uml/index_80.html +++ b/doc/devel/uml/index_80.html @@ -45,6 +45,8 @@ plugartifactLocatingPin for requesting connection to some Port Plugclass pluginattributeIdentifier of the Plugin to be used +plugin1class instance +plugin2class instance PluginAdapterclassAdapter used to integrage an effects processor in the render pipeline pluginadapterartifactAdapter for integrating various Effect processors in the render pipeline pnodenode diff --git a/doc/devel/uml/index_82.html b/doc/devel/uml/index_82.html index 827043e15..c00a2cf07 100644 --- a/doc/devel/uml/index_82.html +++ b/doc/devel/uml/index_82.html @@ -25,8 +25,8 @@ relativelocationartifactPlacement implemnetaion providing various ways of attaching a MObject to another one RelativeLocationclass releaseBufferoperation -relTypeattributethe kind of relation denoted by this Placement RelTypeclassthe possible kinds of RelativePlacements +relTypeattributethe kind of relation denoted by this Placement removeoperationremove the given asset <i>together with all its dependants</i> from the internal DB Render Entitiesclass diagram Render Mechanicsclass diagram @@ -55,6 +55,7 @@ Resultclass ResultSetclass retrieveoperation +Rootclass rootCauseoperationIf this exception was caused by a chain of further exceptions,
return the first one registered in this throw sequence.
This works only, if every exceptions thrown as a consequence
of another exception is propperly constructed by passing
the original exception to the constructor Rule Basecomponent Rules accessclass diagram diff --git a/doc/devel/uml/index_83.html b/doc/devel/uml/index_83.html index f519ce594..ad18077c0 100644 --- a/doc/devel/uml/index_83.html +++ b/doc/devel/uml/index_83.html @@ -24,7 +24,6 @@ ScopeLocatorclass ScopePathclass Scopesclass view -scopesrelation scratchstate segmentartifactSegment of the Timeline.
Used at the moment (7/07) for partitioning the timeline/fixture into segments
to be rendered by a specialized render node network for each, without the need
to change any connections within a given segment.
Note this concept may be superfluos alltogether; is a draft and the real
use still needs to be worked out... Segmentclass @@ -38,13 +37,14 @@ Seqclass Sequenceclass Sequenceclass +sequencesrelation Serializerclass Service Componentsclass view ServiceImplclass Sessioncomponent sessionartifactInterface: the session edited by the user -sessionpackagesourcecode package

Everything concerning the EDL and Session, within the MObject Subsystem Sessionpackage +sessionpackagesourcecode package

Everything concerning the EDL and Session, within the MObject Subsystem SessionclassPrimary Interface for all editing tasks.
The session contains defaults, all the assets being edited, and a set of EDL with the individual MObjects to be manipulated and rendered. Session backboneclass diagram Session partsclass view @@ -58,11 +58,9 @@ shared_ptrclass shortDescattributeuser visible Name-ID. To be localized. simpleclipartifactElementary clip (single media stream only) -SimpleClipclassElementary clip consisting of only one media stream SmartPointerclass SmartPointersclass view sourcerelationthe media source this clip referes to -sourcerelationmedia source of this clip SourceclassSource Node: represents a media source to pull data from. sourceartifactRepresentation of a Media source Source Overviewdeployment diagram @@ -73,15 +71,15 @@ Statenode Stateclass staterelation -state actionstate actiontry to fetch existing definition -state actionstate action -state actionstate action state actionstate action -state actionstate action state actionstate action -state actionstate action state actionstate action +state actionstate action state actionstate action +state actionstate action +state actionstate actiontry to fetch existing definition +state actionstate action +state actionstate action StateAdapterclass StateAdapter compositionclass diagram StateProxyclass diff --git a/doc/devel/uml/index_84.html b/doc/devel/uml/index_84.html index 5ca78a2ce..299cb526b 100644 --- a/doc/devel/uml/index_84.html +++ b/doc/devel/uml/index_84.html @@ -24,35 +24,36 @@ timeattribute timeartifactunified representation of a time point, including conversion functions Timeclassdenotes a temporal position (time point), based on timeline start.

investigate posix.4 realtime timers, wrap these here +Timelineclass Timelineclass +timelinesrelation TimelineSequencesclass diagram TimelineViewclass toolpackagesourcecode package

Tools and Utilities
(separate from the main cinelrra binary) Toolclass ToolFactoryclass toolfactoryartifactsupply of Tool implementations for the Builder -Trackclassstructural asset holding the configuration of a track in the EDL trackattribute trackrelation trackartifactstructural asset holding the configuration of a track in the EDL trackartifactA grouping device within the EDL. The corresponding Placement
by which this Track object is refered defines fallback placing
properties to be used by all objects placed on this track in
case they don't specify more concrete placements.
Typically, tracks are used do make default Port connections,
define a layer or pan for sound and for for disabling groups
of clips. Note tracks are grouped in a tree like fashion.
trackrelation Trackclass -tracksrelationelementary media assets comprising this compound trackTreerelation Trafoclass trafoartifacttransforming processing Node treatoperation treatoperationThis operation is to be overloaded for the specific MObject subclasses to be treated. treatoperation -treatoperation treatoperation +treatoperation treatoperation -treatoperation treatoperation treatoperation +treatoperation TypeHandlerclass TypeHandler<Pipe>class +Typesclass view diff --git a/doc/devel/uml/index_86.html b/doc/devel/uml/index_86.html index ada782f0a..4f864b5c0 100644 --- a/doc/devel/uml/index_86.html +++ b/doc/devel/uml/index_86.html @@ -21,21 +21,22 @@ VFrameclass vframeartifacta buffer and render process holding a Video frame vid1class instance -vid_aclass instance +vid_Aclass instance vid_aclass instance vid_Aclass instance +vid_aclass instance vid_Aclass instance -vid_Aclass instance videoclass instance +videoclass instance videoclass instance videoclass instance -videoclass instance -video1class instance video1class instance video1class instance +video1class instance video1class instance -video1class instance video1class instance +video1class instance +VirtualMediaclass Visitableclass visitorpackagesub-namespace for visitor library implementation visitorartifactAcyclic Visitor library diff --git a/doc/devel/uml/objectdiagrams.html b/doc/devel/uml/objectdiagrams.html index e45e944d2..cb1f81a95 100644 --- a/doc/devel/uml/objectdiagrams.html +++ b/doc/devel/uml/objectdiagrams.html @@ -20,7 +20,7 @@ EDL Example2More complex example showing the Object graph in the EDL and how it is linked into the Fixture to yield the actual locations. In this example, an HUE Effect is applied on a part of the Clip Engine Example1Example1 (from EDL) continued: here the RenderEngine to be created by the Builder from the Input shown in Example1 Engine Example2Example2 (from EDL) continued: notably in this RenderEngine the Effect has been partitioned into 2 segments with constant configuration. -multichannel clip +ModelAssetRelations diff --git a/doc/devel/uml/public_operations.html b/doc/devel/uml/public_operations.html index 02e32e775..4b969b1fe 100644 --- a/doc/devel/uml/public_operations.html +++ b/doc/devel/uml/public_operations.html @@ -29,7 +29,6 @@ clearSessManagerclear current session contents
without resetting overall session config.
Afterwards, the session will contain only one
empty EDL, while all Assets are retained.
configureToolFactory createClipMediacreate a (possibly compound) Clip refering to this media, ready to be added to the EDL. -currEDLSessionThe EDL currently in focus. In most cases, Session and EDL are almost the same, just EDL emphasizes the collection aspect. But generally (for larger editing projects) one Session can contain several EDLs, which may even be nested. At any given time, only one of these EDLs has focus and recieves the editing commands. dispatchOpVisitable enableAssetchange the enabled status of this asset. Note the corresponding #isActive predicate may depend on the enablement status of parent assets as well executeCommand diff --git a/uml/lumiera/128133 b/uml/lumiera/128133 index 345e6551d..2a4a4292e 100644 --- a/uml/lumiera/128133 +++ b/uml/lumiera/128133 @@ -1,6 +1,6 @@ format 58 "Asset" // ProcessingLayer::Asset - revision 19 + revision 20 modified_by 5 "hiv" // class settings //class diagram settings @@ -62,6 +62,11 @@ format 58 size A4 end + classdiagram 139141 "Meta-Asset Relations" + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + size A4 + end + class 136453 "Asset" abstract visibility public stereotype "interface" cpp_decl "${comment}${template}class ${name}${inherit} @@ -505,18 +510,40 @@ e.g. the individual media streams found in one media file" b parent class_ref 136709 // Media end - classrelation 142341 // tracks () + classrelation 142341 // channels () relation 140549 o--> stereotype "vector" - a role_name "tracks" multiplicity "1..*" protected + a role_name "channels" multiplicity "1..*" protected comment "elementary media assets comprising this compound" cpp default " ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type} *> ${name}${value}; " - classrelation_ref 142341 // tracks () + classrelation_ref 142341 // channels () b multiplicity "*" parent class_ref 136709 // Media end end + class 160389 "VirtualMedia" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 194181 // + relation 183813 ---|> + a public + cpp default "${type}" + classrelation_ref 194181 // + b parent class_ref 138501 // CompoundMedia + end + end + class 136837 "Proc" visibility public cpp_decl "${comment}${template}class ${name}${inherit} @@ -602,40 +629,6 @@ ${inlines} comment "tree like classification of Assets" end - class 137349 "Clip" - visibility package - cpp_decl "${comment}${template}class ${name}${inherit} - { -${members} }; -${inlines} -" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - - comment "bookkeeping (asset) view of a media clip." - classrelation 140549 // - relation 138757 ---|> - a public - cpp default "${type}" - classrelation_ref 140549 // - b parent class_ref 136709 // Media - end - - classrelation 141957 // source () - relation 140165 ---> - a role_name "source" multiplicity "1" const_relation protected - comment "media source of this clip" - cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; -" - classrelation_ref 141957 // source () - b multiplicity "*" parent class_ref 136709 // Media - association_type class_ref 136709 // Media - end - end - class 137477 "Unknown" visibility package cpp_decl "${comment}${template}class ${name}${inherit} @@ -728,7 +721,7 @@ ${inlines} end end - class 137989 "Track" + class 152197 "Sequence" visibility package cpp_decl "${comment}${template}class ${name}${inherit} { @@ -741,12 +734,33 @@ ${inlines} idl_decl "" explicit_switch_type "" - comment "structural asset holding the configuration of a track in the EDL" - classrelation 141317 // - relation 139525 ---|> + classrelation 195717 // + relation 185221 ---|> a public cpp default "${type}" - classrelation_ref 141317 // + classrelation_ref 195717 // + b parent class_ref 136965 // Struct + end + end + + class 160901 "Timeline" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 195845 // + relation 185349 ---|> + a public + cpp default "${type}" + classrelation_ref 195845 // b parent class_ref 136965 // Struct end end @@ -952,5 +966,59 @@ ${inlines} b multiplicity "*" parent class_ref 138757 // ProcPatt end end + + class 160773 "Inventory" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 195589 // + relation 185093 ---|> + a public + cpp default "${type}" + classrelation_ref 195589 // + b parent class_ref 137093 // Meta + end + end + end + + classview 133381 "Types" + //class diagram settings + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + //collaboration diagram settings + show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default + //object diagram settings + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default + //sequence diagram settings + show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default + //state diagram settings + package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default + show_activities default region_horizontally default drawing_language default show_stereotype_properties default + //class settings + //activity diagram settings + package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default + show_infonote default drawing_language default show_stereotype_properties default + class 160645 "EntryID" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + end end end diff --git a/uml/lumiera/128133.diagram b/uml/lumiera/128133.diagram index d7efe1012..ff767ee0a 100644 --- a/uml/lumiera/128133.diagram +++ b/uml/lumiera/128133.diagram @@ -24,33 +24,29 @@ classcanvas 129669 class_ref 128645 // Placement draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default xyz 636 55 2000 end -classcanvas 129925 class_ref 128389 // Track - draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 359 925 2000 -end classcanvas 130949 class_ref 128773 // AbstractMO draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default xyz 319 192 2000 end classcanvas 131461 class_ref 128901 // Clip draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 281 302 2000 + xyz 281 300 2000 end classcanvas 131717 class_ref 129029 // Effect draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 334 302 2000 + xyz 332 299 2000 end classcanvas 131973 class_ref 129157 // Meta draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 391 302 2000 + xyz 394 302 2000 end classcanvas 132229 class_ref 129285 // FixedLocation draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 610 247 2005 + xyz 495 262 2005 end classcanvas 132869 class_ref 129413 // RelativeLocation draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 493 247 2000 + xyz 613 262 2000 end classcanvas 134149 class_ref 129541 // Allocation draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default @@ -60,17 +56,13 @@ classcanvas 134405 class_ref 129669 // Label draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default xyz 459 410 2000 end -classcanvas 135429 class_ref 129797 // ExplicitPlacement - draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 724 169 2004 -end classcanvas 135813 class_ref 129797 // ExplicitPlacement draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 468 742 2000 + xyz 729 819 2000 end classcanvas 136581 class_ref 129925 // Auto draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 377 400 2005 + xyz 304 403 2005 end note 136837 "Placement \"locates\" a Media Object" xyzwh 393 12 3005 207 36 @@ -86,11 +78,7 @@ classcanvas 137349 class_ref 130181 // Constraint end classcanvas 138629 class_ref 135173 // Segment draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 668 665 2000 -end -classcanvas 139013 class_ref 138629 // CompoundClip - draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 274 400 2000 + xyz 492 743 2000 end classcanvas 139269 class_ref 139653 // Session draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default @@ -114,17 +102,25 @@ classcanvas 146437 class_ref 140421 // Plug end classcanvas 146949 class_ref 145541 // Timeline draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 116 480 2000 + xyz 151 523 2000 +end +classcanvas 148101 class_ref 160517 // Root + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + xyz 384 427 2005 +end +classcanvas 148613 class_ref 152453 // PlacementRef + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + xyz 685 342 2005 end relationcanvas 128389 relation_ref 128005 // from ref 128005 z 1999 to ref 128133 - role_a_pos 202 610 3000 no_role_b - multiplicity_a_pos 206 643 3000 no_multiplicity_b + role_a_pos 171 615 3000 no_role_b + multiplicity_a_pos 206 638 3000 no_multiplicity_b end relationcanvas 128517 relation_ref 128133 // from ref 128005 z 1999 to ref 128261 - role_a_pos 232 804 3000 no_role_b - multiplicity_a_pos 206 804 3000 no_multiplicity_b + role_a_pos 237 811 3000 no_role_b + multiplicity_a_pos 211 811 3000 no_multiplicity_b end relationcanvas 128645 relation_ref 128261 // geometry VHr @@ -137,7 +133,7 @@ relationcanvas 130821 relation_ref 128517 // geometry VH from ref 128133 z 1999 stereotype "<>" xyz 257 587 3000 to point 253 95 line 132357 z 1999 to ref 129413 - role_a_pos 282 79 3000 no_role_b + role_a_pos 280 83 3000 no_role_b multiplicity_a_pos 300 112 3000 no_multiplicity_b end relationcanvas 131077 relation_ref 129285 // @@ -162,41 +158,24 @@ relationcanvas 132101 relation_ref 129669 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 132997 relation_ref 129925 // - from ref 132869 z 1999 to point 457 263 - line 133893 z 1999 to point 432 186 - line 144389 z 1999 to ref 129413 - role_a_pos 419 157 3000 no_role_b - multiplicity_a_pos 408 142 3000 multiplicity_b_pos 476 277 3000 -end relationcanvas 134533 relation_ref 130309 // - from ref 134405 z 1999 to ref 131973 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 135685 relation_ref 130949 // - geometry VHV - from ref 135429 z 1999 to point 772 151 - line 141445 z 1999 to point 672 151 - line 141573 z 1999 to ref 129669 + geometry VHV unfixed + from ref 134405 z 1999 to point 479 369 + line 147589 z 1999 to point 414 369 + line 147717 z 1999 to ref 131973 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 135941 relation_ref 131077 // - from ref 128261 z 1999 stereotype "<>" xyz 327 814 3000 to ref 135813 - role_a_pos 373 787 3000 no_role_b - multiplicity_a_pos 453 811 3000 no_multiplicity_b -end -relationcanvas 136069 relation_ref 131205 // - from ref 135813 z 1999 to point 399 833 - line 136197 z 1999 to ref 129925 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b + from ref 128261 z 1999 stereotype "<>" xyz 578 844 3000 to ref 135813 + role_a_pos 642 844 3000 no_role_b + multiplicity_a_pos 714 866 3000 no_multiplicity_b end relationcanvas 136709 relation_ref 131333 // - geometry HV - from ref 136581 z 1999 to point 411 429 - line 138373 z 1999 to ref 131973 + geometry VHV + from ref 136581 z 1999 to point 332 369 + line 147333 z 1999 to point 414 369 + line 147461 z 1999 to ref 131973 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -211,32 +190,21 @@ relationcanvas 138245 relation_ref 131717 // no_multiplicity_a no_multiplicity_b end relationcanvas 138757 relation_ref 137093 // - geometry VHr - from ref 138629 z 1999 stereotype "<>" xyz 613 701 3000 to point 516 695 - line 138885 z 1999 to ref 135813 - role_a_pos 531 717 3000 no_role_b - multiplicity_a_pos 507 717 3000 no_multiplicity_b -end -relationcanvas 139141 relation_ref 140805 // - from ref 139013 z 1999 to ref 131461 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b + geometry HVH + from ref 138629 z 1999 to point 635 773 + line 149125 z 1999 to point 635 858 + line 149253 z 1999 stereotype "<>" xyz 642 803 3000 to ref 135813 + role_a_pos 642 813 3000 no_role_b + multiplicity_a_pos 714 866 3000 no_multiplicity_b end relationcanvas 139525 relation_ref 142725 // - from ref 128005 z 1999 stereotype "<>" xyz 58 528 3000 to ref 139269 + from ref 128005 z 1999 stereotype "<>" xyz 74 472 3000 to ref 139269 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 139781 relation_ref 142853 // - geometry HV - from ref 139269 z 1999 to point 140 422 - line 139909 z 1999 to ref 139653 - role_a_pos 154 360 3000 no_role_b - multiplicity_a_pos 128 360 3000 no_multiplicity_b -end relationcanvas 140165 relation_ref 142981 // from ref 129669 z 1999 to ref 129413 - role_a_pos 401 79 3000 no_role_b + role_a_pos 407 83 3000 no_role_b multiplicity_a_pos 401 102 3000 multiplicity_b_pos 609 102 3000 end relationcanvas 142213 relation_ref 143237 // @@ -246,24 +214,24 @@ relationcanvas 142213 relation_ref 143237 // end relationcanvas 142981 relation_ref 143493 // geometry VHV - from ref 132869 z 1999 to point 538 215 - line 143493 z 1999 to point 562 215 + from ref 132869 z 1999 to point 658 223 + line 143493 z 1999 to point 562 223 line 143621 z 1999 to ref 141317 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 143109 relation_ref 143621 // - geometry VHV - from ref 132229 z 1999 to point 648 215 - line 143749 z 1999 to point 562 215 + geometry VHV unfixed + from ref 132229 z 1999 to point 533 223 + line 143749 z 1999 to point 562 223 line 143877 z 1999 to ref 141317 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 143237 relation_ref 143749 // geometry VHV unfixed - from ref 134149 z 1999 to point 597 215 - line 144005 z 1999 to point 562 215 + from ref 134149 z 1999 to point 597 223 + line 144005 z 1999 to point 562 223 line 144133 z 1999 to ref 141317 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -272,30 +240,20 @@ relationcanvas 144517 relation_ref 143877 // from ref 141317 z 1999 to point 499 150 line 144645 z 1999 to point 499 180 line 144773 z 1999 to ref 141317 - role_a_pos 503 161 3000 no_role_b + role_a_pos 498 156 3000 no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 144901 relation_ref 144901 // - from ref 129029 z 1999 to point 447 423 - line 145029 z 1999 to ref 131973 + geometry VHV unfixed + from ref 129029 z 1999 to point 447 369 + line 147845 z 1999 to point 414 369 + line 147973 z 1999 to ref 131973 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 145285 relation_ref 145029 // - from ref 129029 z 1999 stereotype "<>" xyz 391 666 3000 to point 447 683 - line 145413 z 1999 to point 371 683 - line 145541 z 1999 to ref 129029 - role_a_pos 369 622 3000 no_role_b - multiplicity_a_pos 412 645 3000 no_multiplicity_b -end relationcanvas 145669 relation_ref 145157 // from ref 128133 z 1999 to ref 129029 - role_a_pos 394 606 3000 no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 145925 relation_ref 145413 // - from ref 128261 z 1999 to ref 129925 - role_a_pos 321 916 3000 no_role_b + role_a_pos 394 615 3000 no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 146565 relation_ref 145669 // @@ -309,8 +267,56 @@ relationcanvas 146693 relation_ref 145797 // no_multiplicity_a no_multiplicity_b end relationcanvas 147077 relation_ref 155653 // - from ref 146949 z 1999 stereotype "<>" xyz 187 493 3000 to ref 146053 - role_a_pos 268 533 3000 no_role_b - multiplicity_a_pos 331 544 3000 multiplicity_b_pos 180 510 3000 + from ref 146949 z 1999 stereotype "<>" xyz 204 515 3000 to ref 146053 + role_a_pos 273 525 3000 no_role_b + multiplicity_a_pos 331 548 3000 multiplicity_b_pos 215 548 3000 +end +relationcanvas 148229 relation_ref 183941 // + geometry VHV unfixed + from ref 148101 z 1999 to point 404 369 + line 148357 z 1999 to point 414 369 + line 148485 z 1999 to ref 131973 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 148741 relation_ref 130949 // + geometry VHV unfixed + from ref 135813 z 1999 to point 777 170 + line 148869 z 1999 to point 672 170 + line 148997 z 1999 to ref 129669 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 149509 relation_ref 184325 // + geometry VH + from ref 132869 z 1999 to point 658 366 + line 149637 z 1999 to ref 148613 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 149765 relation_ref 184453 // + geometry HVr + from ref 148613 z 1999 to point 723 94 + line 150021 z 1999 to ref 129669 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 150149 relation_ref 184581 // + from ref 146949 z 1999 to ref 128133 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 150277 relation_ref 184709 // + from ref 128005 z 1999 to point 137 602 + line 150405 z 1999 to ref 146949 + role_a_pos 171 567 3000 no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 151045 relation_ref 142853 // + geometry HV + from ref 139269 z 1999 to point 140 414 + line 151173 z 1999 to ref 139653 + role_a_pos 101 418 3000 no_role_b + multiplicity_a_pos 126 337 3000 no_multiplicity_b end end diff --git a/uml/lumiera/128261 b/uml/lumiera/128261 index 699fc9f00..2d6b81579 100644 --- a/uml/lumiera/128261 +++ b/uml/lumiera/128261 @@ -1,6 +1,6 @@ format 58 "MObject" // ProcessingLayer::MObject - revision 38 + revision 39 modified_by 5 "hiv" // class settings //class diagram settings @@ -47,89 +47,5 @@ format 58 //activity diagram settings package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default show_infonote default drawing_language default show_stereotype_properties default - objectdiagram 131333 "multichannel clip" - write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default - size A4 - end - - classinstance 134661 "" - type class_ref 137349 // Clip - attributes - end - relations - end - end - - classinstance 134789 "" - type class_ref 138501 // CompoundMedia - attributes - end - relations - end - end - - classinstance 134917 "" - type class_ref 136709 // Media - attributes - end - relations - end - end - - classinstance 135045 "" - type class_ref 136709 // Media - attributes - end - relations - end - end - - classinstance 135173 "" - type class_ref 136709 // Media - attributes - end - relations - end - end - - classinstance 135301 "" - type class_ref 138629 // CompoundClip - attributes - end - relations - end - end - - classinstance 135429 "" - type class_ref 138885 // SimpleClip - attributes - end - relations - end - end - - classinstance 135557 "" - type class_ref 138885 // SimpleClip - attributes - end - relations - end - end - - classinstance 135685 "" - type class_ref 138885 // SimpleClip - attributes - end - relations - end - end - - classinstance 135813 "" - type class_ref 128645 // Placement - attributes - end - relations - end - end end end diff --git a/uml/lumiera/130053 b/uml/lumiera/130053 index 9e872a275..73525fbea 100644 --- a/uml/lumiera/130053 +++ b/uml/lumiera/130053 @@ -1,30 +1,30 @@ -format 40 +format 58 "asset" // design::codegen::proc::asset - revision 8 + revision 9 modified_by 5 "hiv" // class settings //class diagram settings - draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default //use case diagram settings - package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + package_name_in_tab default show_context default auto_label_position default draw_all_relations default class_drawing_mode default shadow default show_stereotype_properties default //sequence diagram settings - show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default + show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default //collaboration diagram settings - show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default + show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default //object diagram settings - write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default //component diagram settings package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default - draw_component_as_icon default show_component_req_prov default show_component_rea default + draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default //deployment diagram settings package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default - draw_component_as_icon default show_component_req_prov default show_component_rea default + draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default //state diagram settings package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default - show_activities default region_horizontally default drawing_language default + show_activities default region_horizontally default drawing_language default show_stereotype_properties default //activity diagram settings package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default - show_infonote default drawing_language default + show_infonote default drawing_language default show_stereotype_properties default stereotype "src" cpp_h_dir "proc/asset" @@ -36,7 +36,7 @@ Asset Management" deploymentview 128645 "gen" //deployment diagram settings package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default - draw_component_as_icon default show_component_req_prov default show_component_rea default + draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default comment "defines source files to be generated by BOUML" artifact 137733 "dataset" stereotype "source" @@ -307,7 +307,6 @@ ${namespace_start} ${members} ${namespace_end}" associated_classes - class_ref 137349 // Clip end comment "bookkeeping (asset) view of a media clip." end @@ -581,7 +580,6 @@ ${namespace_start} ${members} ${namespace_end}" associated_classes - class_ref 137989 // Track end comment "structural asset holding the configuration of a track in the EDL" end diff --git a/uml/lumiera/130309.diagram b/uml/lumiera/130309.diagram index 52ca9572d..3f9868b95 100644 --- a/uml/lumiera/130309.diagram +++ b/uml/lumiera/130309.diagram @@ -10,7 +10,7 @@ classcanvas 128133 class_ref 136581 // AssetManager end packagecanvas 128517 package_ref 128133 // Asset - show_context_mode namespace xyzwh 214 182 1994 610 571 + show_context_mode namespace xyzwh 204 182 1994 620 571 end classcanvas 128645 class_ref 136709 // Media draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default @@ -18,51 +18,43 @@ classcanvas 128645 class_ref 136709 // Media end classcanvas 128773 class_ref 136837 // Proc draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 502 330 2005 + xyz 428 330 2005 end classcanvas 128901 class_ref 136965 // Struct draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 654 330 2005 + xyz 581 330 2005 end classcanvas 129029 class_ref 137093 // Meta draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 760 330 2005 + xyz 724 330 2005 end classcanvas 130821 class_ref 137221 // Category draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default xyz 276 233 2004 end -classcanvas 131077 class_ref 137349 // Clip - draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 318 444 2000 -end classcanvas 131333 class_ref 137477 // Unknown draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 374 445 2000 + xyz 313 418 2000 end classcanvas 131461 class_ref 137605 // Preview draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 376 522 2005 + xyz 315 467 2005 end classcanvas 131973 class_ref 137733 // Effect draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 476 445 2000 + xyz 412 416 2000 end classcanvas 132101 class_ref 137861 // Codec draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 537 445 2000 -end -classcanvas 132485 class_ref 137989 // Track - draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 614 445 2000 + xyz 464 417 2000 end classcanvas 132613 class_ref 138117 // Pipe draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 682 445 2000 + xyz 622 465 2000 end classcanvas 132997 class_ref 138245 // Dataset draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 756 445 2000 + xyz 723 443 2000 end classcanvas 133253 class_ref 138373 // DB draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default @@ -74,19 +66,35 @@ classcanvas 133765 class_ref 138501 // CompoundMedia end classcanvas 135813 class_ref 138757 // ProcPatt draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 637 506 2000 + xyz 541 518 2000 end classcanvas 136709 class_ref 139141 // DoAttach draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 569 687 2000 + xyz 495 686 2000 end classcanvas 136837 class_ref 139013 // BuildInstruct draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 604 620 2000 + xyz 531 619 2000 end classcanvas 136965 class_ref 139269 // DoRecurse draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 638 687 2000 + xyz 565 686 2000 +end +classcanvas 138885 class_ref 160389 // VirtualMedia + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + xyz 255 594 2000 +end +classcanvas 139141 class_ref 160773 // Inventory + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + xyz 756 493 2000 +end +classcanvas 140677 class_ref 152197 // Sequence + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + xyz 622 379 2005 +end +classcanvas 140805 class_ref 160901 // Timeline + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + xyz 622 419 2000 end relationcanvas 129157 relation_ref 138117 // geometry VHV @@ -98,7 +106,7 @@ relationcanvas 129157 relation_ref 138117 // end relationcanvas 129285 relation_ref 138245 // geometry VHV - from ref 128773 z 1999 to point 522 293 + from ref 128773 z 1999 to point 448 293 line 130053 z 1999 to point 135 293 line 130181 z 1999 to ref 128005 no_role_a no_role_b @@ -106,7 +114,7 @@ relationcanvas 129285 relation_ref 138245 // end relationcanvas 129413 relation_ref 138373 // geometry VHV - from ref 128901 z 1999 to point 674 293 + from ref 128901 z 1999 to point 601 293 line 130309 z 1999 to point 135 293 line 130437 z 1999 to ref 128005 no_role_a no_role_b @@ -114,7 +122,7 @@ relationcanvas 129413 relation_ref 138373 // end relationcanvas 129541 relation_ref 138501 // geometry VHV - from ref 129029 z 1999 to point 780 293 + from ref 129029 z 1999 to point 744 293 line 130565 z 1999 to point 135 293 line 130693 z 1999 to ref 128005 no_role_a no_role_b @@ -125,31 +133,26 @@ relationcanvas 130949 relation_ref 138629 // role_a_pos 225 223 3000 no_role_b multiplicity_a_pos 259 246 3000 multiplicity_b_pos 189 188 3000 end -relationcanvas 131205 relation_ref 138757 // - geometry VHV - from ref 131077 z 1999 to point 338 417 - line 134277 z 1999 to point 289 417 - line 134405 z 1999 to ref 128645 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end relationcanvas 132229 relation_ref 139269 // - from ref 131973 z 1999 to ref 128773 + geometry VHV + from ref 131973 z 1999 to point 432 390 + line 139269 z 1999 to point 448 390 + line 139397 z 1999 to ref 128773 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 132357 relation_ref 139397 // - from ref 132101 z 1999 to ref 128773 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 132741 relation_ref 139525 // - from ref 132485 z 1999 to ref 128901 + geometry VHV + from ref 132101 z 1999 to point 484 390 + line 139525 z 1999 to point 448 390 + line 139653 z 1999 to ref 128773 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 132869 relation_ref 139653 // - from ref 132613 z 1999 to ref 128901 + geometry VHr + from ref 132613 z 1999 to point 601 482 + line 140549 z 1999 to ref 128901 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end @@ -174,26 +177,29 @@ relationcanvas 134917 relation_ref 140549 // from ref 133765 z 2004 stereotype "<>" xyz 226 505 3000 to point 220 539 line 135301 z 2004 to point 220 360 line 135173 z 2004 to ref 128645 - role_a_pos 220 345 3000 no_role_b + role_a_pos 208 347 3000 no_role_b multiplicity_a_pos 231 368 3000 multiplicity_b_pos 230 547 3000 end relationcanvas 136069 relation_ref 141189 // - from ref 135813 z 1999 to ref 128901 + geometry VHV unfixed + from ref 135813 z 1999 to point 566 482 + line 140293 z 1999 to point 601 482 + line 140421 z 1999 to ref 128901 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 136197 relation_ref 141317 // from ref 128645 z 1999 to point 322 382 - line 136581 z 1999 to point 431 382 - line 136453 z 1999 to point 471 525 + line 136581 z 1999 to point 382 382 + line 136453 z 1999 to point 405 521 line 136325 z 1999 to ref 135813 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 137093 relation_ref 141701 // - from ref 135813 z 1999 stereotype "<>" xyz 631 569 3000 to ref 136837 - role_a_pos 656 602 3000 no_role_b - multiplicity_a_pos 620 600 3000 multiplicity_b_pos 643 545 3000 + from ref 135813 z 1999 stereotype "<>" xyz 575 589 3000 to ref 136837 + role_a_pos 574 599 3000 no_role_b + multiplicity_a_pos 542 601 3000 multiplicity_b_pos 552 562 3000 end relationcanvas 137221 relation_ref 141829 // from ref 136709 z 1999 to ref 136837 @@ -206,22 +212,22 @@ relationcanvas 137349 relation_ref 141957 // no_multiplicity_a no_multiplicity_b end relationcanvas 137477 relation_ref 142085 // - from ref 136965 z 1999 to point 728 656 - line 137605 z 1999 to point 728 562 + from ref 136965 z 1999 to point 668 684 + line 137605 z 1999 to point 668 558 line 137733 z 1999 to ref 135813 - role_a_pos 699 521 3000 no_role_b - multiplicity_a_pos 703 556 3000 multiplicity_b_pos 703 685 3000 + role_a_pos 616 670 3000 no_role_b + multiplicity_a_pos 603 548 3000 multiplicity_b_pos 641 699 3000 end relationcanvas 137861 relation_ref 142213 // - from ref 136709 z 1999 stereotype "<>" xyz 534 665 3000 to point 595 388 - line 137989 z 1999 to ref 128773 - role_a_pos 556 343 3000 no_role_b - multiplicity_a_pos 556 376 3000 no_multiplicity_b + from ref 136709 z 1999 stereotype "<>" xyz 459 643 3000 to point 520 346 + line 139781 z 1999 to ref 128773 + role_a_pos 482 331 3000 no_role_b + multiplicity_a_pos 482 354 3000 no_multiplicity_b end relationcanvas 138117 relation_ref 144005 // geometry VHV - from ref 131333 z 1999 to point 400 417 - line 138245 z 1999 to point 289 417 + from ref 131333 z 1999 to point 339 404 + line 138245 z 1999 to point 289 404 line 138373 z 1999 to ref 128645 no_role_a no_role_b no_multiplicity_a no_multiplicity_b @@ -232,11 +238,38 @@ relationcanvas 138501 relation_ref 144133 // no_multiplicity_a no_multiplicity_b end relationcanvas 138629 relation_ref 145925 // - from ref 132613 z 1999 to point 714 509 + from ref 132613 z 1999 to point 638 508 line 138757 z 1999 to ref 135813 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end +relationcanvas 139013 relation_ref 183813 // + from ref 138885 z 1999 to ref 133765 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 139909 relation_ref 185093 // + geometry VHV unfixed + from ref 139141 z 1999 to point 783 399 + line 140037 z 1999 to point 744 399 + line 140165 z 1999 to ref 129029 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 140933 relation_ref 185221 // + geometry VHr + from ref 140677 z 2004 to point 601 396 + line 141061 z 2004 to ref 128901 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 141189 relation_ref 185349 // + geometry VHr + from ref 140805 z 1999 to point 601 436 + line 141317 z 1999 to ref 128901 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end line 128261 -_-_ geometry HV from ref 128005 z 1999 to point 328 149 line 128389 z 1999 to ref 128133 diff --git a/uml/lumiera/130437 b/uml/lumiera/130437 index 2bad861ba..0ef0e8662 100644 --- a/uml/lumiera/130437 +++ b/uml/lumiera/130437 @@ -1,30 +1,30 @@ -format 40 +format 58 "session" // design::codegen::proc::mobject::session - revision 12 + revision 13 modified_by 5 "hiv" // class settings //class diagram settings - draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default //use case diagram settings - package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + package_name_in_tab default show_context default auto_label_position default draw_all_relations default class_drawing_mode default shadow default show_stereotype_properties default //sequence diagram settings - show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default + show_full_operations_definition default write_horizontally default class_drawing_mode default drawing_language default draw_all_relations default shadow default show_stereotype_properties default //collaboration diagram settings - show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default + show_full_operations_definition default show_hierarchical_rank default write_horizontally default drawing_language default package_name_in_tab default show_context default draw_all_relations default shadow default show_stereotype_properties default //object diagram settings - write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default //component diagram settings package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default - draw_component_as_icon default show_component_req_prov default show_component_rea default + draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default //deployment diagram settings package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default - draw_component_as_icon default show_component_req_prov default show_component_rea default + draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default //state diagram settings package_name_in_tab default show_context default auto_label_position default write_trans_label_horizontally default show_trans_definition default draw_all_relations default shadow default - show_activities default region_horizontally default drawing_language default + show_activities default region_horizontally default drawing_language default show_stereotype_properties default //activity diagram settings package_name_in_tab default show_context default show_opaque_action_definition default auto_label_position default write_flow_label_horizontally default draw_all_relations default shadow default - show_infonote default drawing_language default + show_infonote default drawing_language default show_stereotype_properties default stereotype "src" cpp_h_dir "proc/mobject/session" @@ -36,7 +36,7 @@ Everything concerning the EDL and Session, within the MObject Subsystem" deploymentview 128901 "gen" //deployment diagram settings package_name_in_tab default show_context default write_horizontally default auto_label_position default draw_all_relations default shadow default - draw_component_as_icon default show_component_req_prov default show_component_rea default + draw_component_as_icon default show_component_req_prov default show_component_rea default show_stereotype_properties default comment "defines source files to be generated by BOUML" artifact 128517 "sessionimpl" stereotype "source" @@ -150,7 +150,7 @@ ${namespace_start} ${members} ${namespace_end}" associated_classes - class_ref 128133 // EDL + class_ref 128133 // Seq end comment "the (high level) Edit Decision List within the current Session" end @@ -396,7 +396,6 @@ ${namespace_start} ${members} ${namespace_end}" associated_classes - class_ref 138885 // SimpleClip end comment "Elementary clip (single media stream only)" end @@ -435,7 +434,6 @@ ${namespace_start} ${members} ${namespace_end}" associated_classes - class_ref 138629 // CompoundClip end comment "compound of several clips (multichannel)" end diff --git a/uml/lumiera/130437.diagram b/uml/lumiera/130437.diagram index 9601230cc..a3ef53d96 100644 --- a/uml/lumiera/130437.diagram +++ b/uml/lumiera/130437.diagram @@ -1,20 +1,16 @@ format 58 -classcanvas 128005 class_ref 137349 // Clip - draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 463 147 2000 -end classcanvas 128133 class_ref 136709 // Media draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default xyz 527 41 2005 end classcanvas 128261 class_ref 137477 // Unknown draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 530 147 2000 + xyz 532 147 2000 end classcanvas 128389 class_ref 137605 // Preview draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 535 215 2005 + xyz 534 215 2005 end classcanvas 128901 class_ref 128901 // Clip draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default @@ -60,11 +56,7 @@ note 136837 "the Builder implements each Clip by a source node and maybe some co xyzwh 59 390 2000 209 46 classcanvas 137221 class_ref 138501 // CompoundMedia draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 600 147 3005 -end -classcanvas 138373 class_ref 138629 // CompoundClip - draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 114 293 2000 + xyz 594 147 3005 end classcanvas 138885 class_ref 136965 // Struct draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default @@ -74,10 +66,6 @@ classcanvas 139013 class_ref 138757 // ProcPatt draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default xyz 730 113 2000 end -classcanvas 140293 class_ref 138885 // SimpleClip - draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default - xyz 32 293 3005 -end classcanvas 140805 class_ref 139013 // BuildInstruct draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default xyz 694 231 2000 @@ -102,10 +90,9 @@ classcanvas 142981 class_ref 137861 // Codec draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default xyz 618 480 2004 end -relationcanvas 128645 relation_ref 138757 // - from ref 128005 z 1999 to ref 128133 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b +classcanvas 143621 class_ref 160389 // VirtualMedia + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + xyz 604 215 2004 end relationcanvas 129541 relation_ref 129413 // from ref 128901 z 1999 to ref 129157 @@ -131,7 +118,7 @@ relationcanvas 132741 relation_ref 135429 // from ref 130309 z 1999 to point 235 278 line 132869 z 1999 to point 235 314 line 132997 z 1999 to ref 130309 - role_a_pos 220 294 3000 no_role_b + role_a_pos 220 299 3000 no_role_b no_multiplicity_a multiplicity_b_pos 248 306 3000 end relationcanvas 133125 relation_ref 136965 // @@ -154,23 +141,16 @@ relationcanvas 135941 relation_ref 139909 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 136965 relation_ref 140165 // - geometry VH - from ref 128005 z 1999 to point 483 71 - line 137093 z 1999 to ref 128133 - role_a_pos 482 59 3000 no_role_b - multiplicity_a_pos 507 72 3000 multiplicity_b_pos 471 129 3000 -end relationcanvas 137349 relation_ref 140421 // from ref 137221 z 1999 to ref 128133 no_role_a no_role_b no_multiplicity_a no_multiplicity_b end relationcanvas 137477 relation_ref 140549 // - from ref 137221 z 1999 to point 644 71 - line 137733 z 1999 stereotype "<>" xyz 641 123 3000 to ref 128133 - role_a_pos 603 56 3000 no_role_b - multiplicity_a_pos 603 79 3000 multiplicity_b_pos 634 131 3000 + from ref 137221 z 1999 to point 638 70 + line 137733 z 1999 stereotype "<>" xyz 636 118 3000 to ref 128133 + role_a_pos 603 55 3000 no_role_b + multiplicity_a_pos 603 78 3000 multiplicity_b_pos 626 129 3000 end relationcanvas 137861 relation_ref 140677 // from ref 128901 z 1999 to point 220 223 @@ -180,11 +160,6 @@ relationcanvas 137861 relation_ref 140677 // role_a_pos 386 50 3000 no_role_b multiplicity_a_pos 512 38 3000 multiplicity_b_pos 149 231 3000 end -relationcanvas 138501 relation_ref 140805 // - from ref 138373 z 1999 to ref 128901 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end relationcanvas 139141 relation_ref 141189 // from ref 139013 z 1999 to ref 138885 no_role_a no_role_b @@ -197,17 +172,6 @@ relationcanvas 139397 relation_ref 141317 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end -relationcanvas 140421 relation_ref 141445 // - from ref 140293 z 1999 to ref 128901 - no_role_a no_role_b - no_multiplicity_a no_multiplicity_b -end -relationcanvas 140549 relation_ref 141573 // - from ref 138373 z 1999 to point 152 263 - line 140677 z 1999 to ref 128901 - role_a_pos 150 243 3000 no_role_b - multiplicity_a_pos 158 254 3000 multiplicity_b_pos 145 274 3000 -end relationcanvas 140933 relation_ref 141701 // from ref 139013 z 1999 stereotype "<>" xyz 713 174 3000 to ref 140805 role_a_pos 745 213 3000 no_role_b @@ -266,5 +230,10 @@ relationcanvas 143493 relation_ref 156421 // no_role_a no_role_b no_multiplicity_a no_multiplicity_b end +relationcanvas 143749 relation_ref 183813 // + from ref 143621 z 2003 to ref 137221 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end preferred_whz 859 632 1 end diff --git a/uml/lumiera/132229 b/uml/lumiera/132229 index e3e0d4b38..1f50000aa 100644 --- a/uml/lumiera/132229 +++ b/uml/lumiera/132229 @@ -1,6 +1,6 @@ format 58 "Session" // ProcessingLayer::MObject::Session - revision 1 + revision 2 modified_by 5 "hiv" // class settings //class diagram settings @@ -62,24 +62,6 @@ ${inlines} comment "Primary Interface for all editing tasks. The session contains defaults, all the assets being edited, and a set of EDL with the individual MObjects to be manipulated and rendered." - operation 133509 "currEDL" - public return_type class_ref 128133 // Seq - nparams 0 - cpp_decl " ${comment}${friend}${static}${inline}${virtual}${type} ${name} ${(}${)}${const}${volatile} ${throw}${abstract};" - cpp_def "${comment}${inline}${type} -${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl} -{ - ${body} -} - -" - - - - - comment "The EDL currently in focus. In most cases, Session and EDL are almost the same, just EDL emphasizes the collection aspect. But generally (for larger editing projects) one Session can contain several EDLs, which may even be nested. At any given time, only one of these EDLs has focus and recieves the editing commands." - end - operation 133637 "getFixture" public explicit_return_type "Fixture&" nparams 0 @@ -118,6 +100,7 @@ configuration of all Objects to be rendered" classrelation_ref 150917 // defaults () b parent class_ref 141445 // DefaultsManager end + end class 128005 "SessionImpl" @@ -134,12 +117,12 @@ ${inlines} explicit_switch_type "" comment "Implementation class for the Session interface" - classrelation 128005 // edls () + classrelation 128005 // sequences () relation 128005 *--> - a role_name "edls" multiplicity "1..*" protected + a role_name "sequences" multiplicity "1..*" protected cpp default " ${comment}${static}${mutable}${volatile}${const}${stereotype}<${type}> ${name}${value}; " - classrelation_ref 128005 // edls () + classrelation_ref 128005 // sequences () b parent class_ref 128133 // Seq end @@ -171,6 +154,15 @@ ${inlines} classrelation_ref 147717 // pipes () b parent class_ref 138117 // Pipe end + + classrelation 195205 // timelines () + relation 184709 *--> + a role_name "timelines" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type} ${name}${value}; +" + classrelation_ref 195205 // timelines () + b parent class_ref 145541 // Timeline + end end class 139781 "SessManager" @@ -265,6 +257,15 @@ ${class}::${name} ${(}${)}${const}${volatile} ${throw}${staticnl} of the current session config and contents. @todo how to serialize, prameters, return value?" end + + classrelation 195333 // current () + relation 184837 ---> + a role_name "current" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 195333 // current () + b parent class_ref 139653 // Session + end end class 145541 "Timeline" @@ -312,6 +313,15 @@ ${inlines} classrelation_ref 160005 // globalBusses () b multiplicity "1" parent class_ref 138117 // Pipe end + + classrelation 195077 // + relation 184581 ---> + a role_name "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 195077 // + b parent class_ref 128133 // Seq + end end class 145797 "TimelineView" @@ -554,6 +564,29 @@ ${inlines} end end + class 160517 "Root" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + classrelation 194309 // + relation 183941 ---|> + a public + cpp default "${type}" + classrelation_ref 194309 // + b parent class_ref 129157 // Meta + end + + end + class 128389 "Track" visibility package cpp_decl "${comment}${template}class ${name}${inherit} @@ -597,6 +630,21 @@ ${inlines} end end + class 152325 "Binding" + visibility package + cpp_decl "${comment}${template}class ${name}${inherit} + { +${members} }; +${inlines} +" + java_decl "" + php_decl "" + python_2_2 python_decl "" + idl_decl "" + explicit_switch_type "" + + end + class 128517 "MObject" abstract visibility public stereotype "interface" cpp_decl "${comment}${template}class ${name}${inherit} @@ -848,63 +896,6 @@ ${inlines} end end - class 138885 "SimpleClip" - visibility package - cpp_decl "${comment}${template}class ${name}${inherit} - { -${members} }; -${inlines} -" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - - comment "Elementary clip consisting of only one media stream" - classrelation 143365 // - relation 141445 ---|> - a public - cpp default "${type}" - classrelation_ref 143365 // - b parent class_ref 128901 // Clip - end - end - - class 138629 "CompoundClip" - visibility package - cpp_decl "${comment}${template}class ${name}${inherit} - { -${members} }; -${inlines} -" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - - associated_diagram classdiagram_ref 128133 // Session structure - comment "Clip MObject which is actually a compound of several elementary clips, -e.g. the several streams found within multichannels media." - classrelation 142597 // - relation 140805 ---|> - a public - cpp default "${type}" - classrelation_ref 142597 // - b parent class_ref 128901 // Clip - end - - classrelation 143493 // components () - relation 141573 o--> - a role_name "components" multiplicity "1..*" protected - cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; -" - classrelation_ref 143493 // components () - b multiplicity "*" parent class_ref 128901 // Clip - end - end - class 129029 "Effect" visibility package cpp_decl "${comment}${template}class ${name}${inherit} @@ -1083,6 +1074,23 @@ ${items}}; classrelation_ref 145669 // b parent class_ref 139909 // LocatingPin end + + classrelation 194693 // + relation 184197 -_-> + a default + cpp default "#include in source" + classrelation_ref 194693 // + b parent class_ref 152453 // PlacementRef + end + + classrelation 194821 // + relation 184325 ---> + a role_name "" protected + cpp default " ${comment}${static}${mutable}${volatile}${const}${type}* ${name}${value}; +" + classrelation_ref 194821 // + b parent class_ref 152453 // PlacementRef + end end class 129541 "Allocation" @@ -1508,6 +1516,14 @@ ${inlines} classrelation_ref 177029 // b parent class_ref 152069 // PlacementIndex end + + classrelation 194949 // + relation 184453 -_-> + a default + cpp default "#include in source" + classrelation_ref 194949 // + b parent class_ref 128645 // Placement + end end class 152581 "Id" @@ -1635,34 +1651,225 @@ ${inlines} end end - class 152197 "Sequence" - visibility package - cpp_decl "${comment}${template}class ${name}${inherit} - { -${members} }; -${inlines} -" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - + objectdiagram 138885 "ModelAssetRelations" + write_horizontally default package_name_in_tab default show_context default auto_label_position default draw_all_relations default shadow default show_stereotype_properties default + size A4 end - class 152325 "Binding" - visibility package - cpp_decl "${comment}${template}class ${name}${inherit} - { -${members} }; -${inlines} -" - java_decl "" - php_decl "" - python_2_2 python_decl "" - idl_decl "" - explicit_switch_type "" - + classinstance 138373 "" + type class_ref 160517 // Root + attributes + end + relations + end + end + + classinstance 138501 "" + type class_ref 128389 // Track + attributes + end + relations + end + end + + classinstance 138629 "" + type class_ref 128389 // Track + attributes + end + relations + end + end + + classinstance 138757 "" + type class_ref 128389 // Track + attributes + end + relations + end + end + + classinstance 138885 "" + type class_ref 128389 // Track + attributes + end + relations + end + end + + classinstance 139013 "" + type class_ref 128389 // Track + attributes + end + relations + end + end + + classinstance 139141 "" + type class_ref 152325 // Binding + attributes + end + relations + end + end + + classinstance 139269 "" + type class_ref 152197 // Sequence + attributes + end + relations + end + end + + classinstance 139397 "" + type class_ref 152325 // Binding + attributes + end + relations + end + end + + classinstance 139525 "" + type class_ref 152197 // Sequence + attributes + end + relations + end + end + + classinstance 139653 "" + type class_ref 128901 // Clip + attributes + end + relations + end + end + + classinstance 139781 "" + type class_ref 129029 // Effect + attributes + end + relations + end + end + + classinstance 139909 "" + type class_ref 129029 // Effect + attributes + end + relations + end + end + + classinstance 140037 "" + type class_ref 129029 // Effect + attributes + end + relations + end + end + + classinstance 140165 "" + type class_ref 128901 // Clip + attributes + end + relations + end + end + + classinstance 140293 "" + type class_ref 128389 // Track + attributes + end + relations + end + end + + classinstance 140421 "" + type class_ref 136709 // Media + attributes + end + relations + end + end + + classinstance 140549 "" + type class_ref 136709 // Media + attributes + end + relations + end + end + + classinstance 140677 "" + type class_ref 160389 // VirtualMedia + attributes + end + relations + end + end + + classinstance 140805 "" + type class_ref 160645 // EntryID + attributes + end + relations + end + end + + classinstance 141061 "" + type class_ref 128389 // Track + attributes + end + relations + end + end + + classinstance 141189 "" + type class_ref 129669 // Label + attributes + end + relations + end + end + + classinstance 141317 "" + type class_ref 160645 // EntryID + attributes + end + relations + end + end + + classinstance 141445 "" + type class_ref 160645 // EntryID + attributes + end + relations + end + end + + classinstance 141573 "plugin1" + type class_ref 137733 // Effect + attributes + end + relations + end + end + + classinstance 141701 "plugin2" + type class_ref 137733 // Effect + attributes + end + relations + end + end + + classinstance 141829 "" + type class_ref 145541 // Timeline + attributes + end + relations + end end end end diff --git a/uml/lumiera/138885.diagram b/uml/lumiera/138885.diagram new file mode 100644 index 000000000..cd9870895 --- /dev/null +++ b/uml/lumiera/138885.diagram @@ -0,0 +1,182 @@ +format 58 + +classinstancecanvas 128005 classinstance_ref 138373 // + xyz 32 157 2000 +end +classinstancecanvas 128133 classinstance_ref 138501 // + xyz 200 157 2000 +end +classinstancecanvas 128261 classinstance_ref 138629 // + xyz 200 211 2000 +end +classinstancecanvas 128389 classinstance_ref 138757 // + xyz 236 252 2000 +end +classinstancecanvas 128517 classinstance_ref 138885 // + xyz 236 279 2000 +end +classinstancecanvas 128645 classinstance_ref 139013 // + xyz 236 307 2000 +end +classinstancecanvas 128773 classinstance_ref 139141 // + xyz 33 211 2000 +end +classinstancecanvas 128901 classinstance_ref 139269 // + xyz 96 211 2000 +end +classinstancecanvas 130693 classinstance_ref 139397 // + xyz 319 251 2000 +end +classinstancecanvas 130949 classinstance_ref 139525 // + xyz 313 211 2000 +end +classinstancecanvas 131333 classinstance_ref 139653 // + xyz 319 308 2000 +end +classinstancecanvas 131461 classinstance_ref 139781 // + xyz 276 346 2000 +end +classinstancecanvas 131589 classinstance_ref 139909 // + xyz 393 343 2000 +end +classinstancecanvas 131717 classinstance_ref 140037 // + xyz 393 274 2005 +end +classinstancecanvas 132741 classinstance_ref 140165 // + xyz 319 91 2004 +end +classinstancecanvas 133125 classinstance_ref 140293 // + xyz 236 129 2009 +end +classinstancecanvas 133637 classinstance_ref 140421 // + xyz 503 308 2000 +end +classinstancecanvas 133893 classinstance_ref 140677 // + xyz 492 211 2000 +end +classinstancecanvas 134021 classinstance_ref 140805 // + xyz 562 129 2000 +end +classinstancecanvas 134789 classinstance_ref 141189 // + xyz 319 53 2000 +end +classinstancecanvas 135173 classinstance_ref 141317 // + xyz 562 91 2000 +end +classinstancecanvas 135301 classinstance_ref 141445 // + xyz 562 53 2005 +end +fragment 135813 "TypedLookup" + xyzwh 532 22 1994 151 138 +end +classinstancecanvas 136197 classinstance_ref 141573 // plugin1 + xyz 490 342 2000 +end +classinstancecanvas 136325 classinstance_ref 141701 // plugin2 + xyz 490 396 2000 +end +classinstancecanvas 137221 classinstance_ref 141829 // + xyz 32 263 2000 +end +packagecanvas 137477 + package_ref 128133 // Asset + xyzwh 470 183 1989 213 250 +end +packagecanvas 137605 + package_ref 132229 // Session + xyzwh 15 25 1994 456 408 +end +note 137733 "top-level Timeline" + xyzwh 91 263 2000 64 45 +note 137861 "virtual clip" + xyzwh 379 233 2010 69 35 +objectlinkcanvas 129029 norel + from ref 128773 z 1999 to ref 128901 + no_role_a no_role_b +objectlinkcanvas 129157 norel + from ref 128005 z 1999 to ref 128773 + no_role_a no_role_b +objectlinkcanvas 129285 norel + from ref 128005 z 1999 to ref 128133 + no_role_a no_role_b +objectlinkcanvas 129413 norel + from ref 128005 z 1999 to ref 128261 + no_role_a no_role_b +objectlinkcanvas 129541 norel + geometry VH + from ref 128261 z 1999 to point 223 260 + line 130181 z 1999 to ref 128389 + no_role_a no_role_b +objectlinkcanvas 129669 norel + geometry VH + from ref 128261 z 1999 to point 223 287 + line 130053 z 1999 to ref 128517 + no_role_a no_role_b +objectlinkcanvas 129797 norel + geometry VH + from ref 128261 z 1999 to point 223 315 + line 130437 z 1999 to ref 128645 + no_role_a no_role_b +objectlinkcanvas 130821 norel + from ref 128389 z 1999 to ref 130693 + no_role_a no_role_b +objectlinkcanvas 131077 norel + from ref 130693 z 1999 to ref 130949 + no_role_a no_role_b +objectlinkcanvas 131845 norel + from ref 128645 z 1999 to ref 131333 + no_role_a no_role_b +objectlinkcanvas 131973 norel + geometry VH + from ref 128645 z 1999 to point 259 354 + line 132101 z 1999 to ref 131461 + no_role_a no_role_b +objectlinkcanvas 132229 norel + geometry VH + from ref 131333 z 1999 to point 342 351 + line 132357 z 1999 to ref 131589 + no_role_a no_role_b +objectlinkcanvas 132485 norel + geometry VH + from ref 130693 z 1999 to point 342 282 + line 132613 z 1999 to ref 131717 + no_role_a no_role_b +objectlinkcanvas 133253 norel + geometry VH + from ref 128133 z 1999 to point 223 137 + line 133381 z 1999 to ref 133125 + no_role_a no_role_b +objectlinkcanvas 133509 norel + geometry VH + from ref 133125 z 2003 to point 259 99 + line 134661 z 2003 to ref 132741 + no_role_a no_role_b +objectlinkcanvas 134917 norel + geometry VH + from ref 133125 z 1999 to point 259 61 + line 135045 z 1999 to ref 134789 + no_role_a no_role_b +line 130565 -_-_ + from ref 128901 z 1999 to ref 128261 +line 131205 -_-_ + from ref 130949 z 1999 to ref 128133 +line 135429 -_-_ + from ref 134789 z 1999 to ref 135301 +line 135557 -_-_ + from ref 132741 z 1999 to ref 135173 +line 135685 -_-_ + from ref 133125 z 1999 to ref 134021 +line 135941 -_-_ + from ref 131333 z 1999 to ref 133637 +line 136069 -_-_ + from ref 130949 z 1999 to ref 133893 +line 136581 -_-_ + from ref 131589 z 1999 to ref 136197 +line 136965 -_-_ decenter_end 181 + from ref 131717 z 1999 to ref 136197 +line 137093 -_-_ + from ref 131461 z 1999 to ref 136325 +line 137349 -_-_ + from ref 137221 z 1999 to ref 128773 +preferred_whz 730 488 1 +end diff --git a/uml/lumiera/139141.diagram b/uml/lumiera/139141.diagram new file mode 100644 index 000000000..35e103cf9 --- /dev/null +++ b/uml/lumiera/139141.diagram @@ -0,0 +1,33 @@ +format 58 + +classcanvas 128005 class_ref 138245 // Dataset + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + xyz 76 173 2000 +end +classcanvas 128133 class_ref 160773 // Inventory + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + xyz 124 229 2000 +end +classcanvas 128261 class_ref 137093 // Meta + draw_all_relations default hide_attributes default hide_operations default show_members_full_definition default show_members_visibility default show_members_stereotype default show_members_multiplicity default show_members_initialization default member_max_width 0 show_parameter_dir default show_parameter_name default package_name_in_tab default class_drawing_mode default drawing_language default show_context_mode default auto_label_position default show_infonote default shadow default show_stereotype_properties default + xyz 77 60 2005 +end +packagecanvas 128645 + package_ref 128133 // Asset + xyzwh 44 32 1994 234 328 +end +relationcanvas 128389 relation_ref 185093 // + geometry VHV unfixed + from ref 128133 z 1999 to point 151 139 + line 128773 z 1999 to point 97 139 + line 128901 z 1999 to ref 128261 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +relationcanvas 128517 relation_ref 139781 // + from ref 128005 z 1999 to ref 128261 + no_role_a no_role_b + no_multiplicity_a no_multiplicity_b +end +preferred_whz 469 451 1 +end diff --git a/uml/lumiera/5.session b/uml/lumiera/5.session index 9a72a4c41..9784f7ccf 100644 --- a/uml/lumiera/5.session +++ b/uml/lumiera/5.session @@ -1,34 +1,39 @@ -window_sizes 1302 1004 270 1022 856 71 +window_sizes 1324 1020 270 1044 872 71 diagrams - active classdiagram_ref 136325 // Focus of Query - 582 515 100 4 0 0 + classdiagram_ref 136453 // Session backbone + 631 352 100 4 0 0 + active objectdiagram_ref 138885 // ModelAssetRelations + 730 488 100 4 0 0 + classdiagram_ref 139141 // Meta-Asset Relations + 469 451 100 4 0 0 end show_stereotypes selected - package_ref 129 // lumiera +package_ref 129 // lumiera open - classview_ref 129413 // Project Entities - package_ref 128645 // codegen - - package_ref 128133 // Asset +package_ref 128005 // design + class_ref 160389 // VirtualMedia + class_ref 136837 // Proc + class_ref 160901 // Timeline + class_ref 139269 // DoRecurse + class_ref 160645 // EntryID classview_ref 128389 // Controller Workings - classview_ref 131973 // Object ref - class_ref 152069 // PlacementIndex + class_ref 139653 // Session + class_ref 128133 // Seq + class_ref 160517 // Root + class_ref 128389 // Track + class_ref 152325 // Binding + class_ref 129797 // ExplicitPlacement + class_ref 152453 // PlacementRef + classrelation_ref 178437 // class_ref 153733 // QueryFocusStack classview_ref 128261 // Builder Workings usecaseview_ref 128261 // config examples class_ref 133253 // Frame - classview_ref 129541 // InterfaceSystem classview_ref 129285 // StreamType - classdiagram_ref 137733 // Query Interface - operation_ref 140037 // isValid - operation_ref 140165 // nextResult - class_ref 156933 // Result - classrelation_ref 181765 // - class_ref 155141 // Query - class_ref 155525 // ResolvingFacility - class_ref 158085 // ResultSet + +package_ref 131077 // ConfigQuery class_ref 152965 // Handle classview_ref 128266 // SmartPointers end diff --git a/uml/lumiera/lumiera.prj b/uml/lumiera/lumiera.prj index 51da44dac..727f234a4 100644 --- a/uml/lumiera/lumiera.prj +++ b/uml/lumiera/lumiera.prj @@ -1,6 +1,6 @@ format 58 "lumiera" - revision 59 + revision 60 modified_by 5 "hiv" cpp_root_dir "../../src/" diff --git a/wiki/renderengine.html b/wiki/renderengine.html index 4c20ccd68..12f70dc1d 100644 --- a/wiki/renderengine.html +++ b/wiki/renderengine.html @@ -900,12 +900,12 @@ With regard to the build process, the wiring of data connections translates into In many cases, the parameter values provided by these connections aren't frame based data, rather, the processing function needs a call interface to get the current value (value for a given time), which is provided by the parameter object. Here, the wiring needs to link to the suitable parameter instance, which is located within the high-level model (!). As an additional complication, calculating the actual parameter value may require a context data frame (typically for caching purposes to speed up the interpolation). While these parameter context data frames are completely opaque for the render node, they have to be passed in and out similar to the state needed by the node itself, and the wiring has to prepare for accessing these frames too. -
+
The Builder takes some MObject/[[Placement]] information (called Timeline) and generates out of this a Render Engine configuration able to render this Objects. It does all decisions and retrieves the current configuration of all objects and plugins, so the Render Engine can just process them stright forward.
 
 The Builder is the central part of the [[Builder Pattern|http://en.wikipedia.org/wiki/Builder_pattern]]
 <br/>
-As the builder has to create a render node network implementing most of the features and wiring possible with the various MObject kinds and placement types, it is a rather complicated piece of software. In order to keep it manageable, it is broken down into several specialized sub components:
+As the builder [[has to create a render node network|BuilderModelRelation]] implementing most of the features and wiring possible with the various MObject kinds and placement types, it is a rather complicated piece of software. In order to keep it manageable, it is broken down into several specialized sub components:
 * clients access builder functionality via the BuilderFacade
 * the [[Proc-Layer-Controller|Controller]] initiates the BuildProcess and does the overall coordination of scheduling edit operations, rebuilding the fixture and triggering the Builder
 * to carry out the building, we use several primary tools (SegmentationTool, NodeCreatorTool,...),  together with a BuilderToolKit to be supplied by the [[tool factory|BuilderToolFactory]]
@@ -928,6 +928,9 @@ The working pattern of this builder mechanics can be described as triggering, en
 After preparing the tools with the context state of this build process, the assembler drives the visitation process in the right order. The functions embedded within the visitor (NodeCreatorTool) for treating specific kinds of objects in turn use the toolkit (=the fully configured tool factory) to get the mould(s) for the individual steps they need to carry out. This involves preparing the mould (with the high-level object currently in-the-works, a suitable processing pattern and additional references), followed by operating the mould. The latter "plays" the processing pattern in the context of the mould, which, especially with the help of the operation point, carries out the actual building and/or connecting step. While doing so, the node factory will be invoked, which in turn invokes the wiring factory and thus pre-determines the node's prospective mode of operation when later called for rendering.
+
+
[>img[Builder creating the Model|uml/fig132868.png]]
+
The [[Builder]] uses different kinds of tools for creating a network of render nodes from a given high-level model. When breaking down this (necessarily complex) process into small manageable chunks, we arrive at [[elementary building situations|BuilderPrimitives]]. For each of these there is a specialized tool. We denote these tools as "moulds" because they are a rather passive holder for the objects to be attached and wired up. They are shaped according to the basic form the connections have to follow for each of these basic situations:
 * attaching an effect to a pipe