@rocketshow/designer 1.62.0 → 1.64.0

package/index.d.ts

@@ -1,29 +1,29 @@
 import * as i0 from '@angular/core';
 import { NgZone, OnDestroy, AfterViewInit, OnInit, ElementRef, ChangeDetectorRef, PipeTransform, EventEmitter } from '@angular/core';
-import * as i45 from '@ngx-translate/core';
+import * as i46 from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import * as i50 from 'ngx-toastr';
+import * as i51 from 'ngx-toastr';
 import { ToastrService } from 'ngx-toastr';
 import { Observable, Subject } from 'rxjs';
-import * as i40 from '@angular/router';
+import * as i41 from '@angular/router';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as THREE from 'three';
 import WaveSurfer from 'wavesurfer.js';
 import { Options } from 'sortablejs';
-import * as i51 from '@ali-hm/angular-tree-component';
+import * as i52 from '@ali-hm/angular-tree-component';
 import { ITreeOptions } from '@ali-hm/angular-tree-component';
-import * as i49 from 'ngx-dropzone-wrapper';
+import * as i50 from 'ngx-dropzone-wrapper';
 import { DropzoneConfigInterface } from 'ngx-dropzone-wrapper';
-import * as i41 from '@angular/platform-browser';
-import * as i42 from '@angular/platform-browser/animations';
-import * as i43 from '@angular/forms';
-import * as i44 from 'ngx-bootstrap-slider';
-import * as i46 from 'ngx-bootstrap/accordion';
-import * as i47 from 'ngx-bootstrap/popover';
-import * as i48 from 'ngx-bootstrap/typeahead';
+import * as i42 from '@angular/platform-browser';
+import * as i43 from '@angular/platform-browser/animations';
+import * as i44 from '@angular/forms';
+import * as i45 from 'ngx-bootstrap-slider';
+import * as i47 from 'ngx-bootstrap/accordion';
+import * as i48 from 'ngx-bootstrap/popover';
+import * as i49 from 'ngx-bootstrap/typeahead';
 
 declare class DesignerService {
     constructor();
@@ -536,7 +536,7 @@ declare class FixtureService {
     getFixtureIconClass(profile: FixtureProfile): string;
     updateProfiles(): Observable<Object>;
     getNextFreeDmxChannel(fixturePool: Fixture[], neededChannels: number): number;
-    addFixture(profile: FixtureProfile, fixturePool: Fixture[]): Fixture;
+    addFixture(profile: FixtureProfile, fixturePool: Fixture[], channelPool?: Fixture[]): Fixture;
     static ɵfac: i0.ɵɵFactoryDeclaration<FixtureService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<FixtureService>;
 }
@@ -576,6 +576,17 @@ declare class AnimationService {
     static ɵprov: i0.ɵɵInjectableDeclaration<AnimationService>;
 }
 
+/**
+ * Lightweight configuration entry describing a universe that can
+ * be selected by the user inside the fixture pool. The actual
+ * runtime universe (with channel values, etc.) is represented by
+ * the `Universe` model.
+ */
+interface UniverseConfig {
+    uuid: string;
+    name: string;
+}
+
 declare class ConfigService {
     restUrl: string;
     enableMediaLibrary: boolean;
@@ -588,6 +599,8 @@ declare class ConfigService {
     intro: boolean;
     uniqueProjectNames: boolean;
     dropzoneChunking: boolean;
+    universes: UniverseConfig[];
+    freeUniverseEdit: boolean;
     menuHeightChanged: Subject<void>;
     constructor();
     static ɵfac: i0.ɵɵFactoryDeclaration<ConfigService, never>;
@@ -974,6 +987,8 @@ declare class DesignerComponent implements OnInit, AfterViewInit {
     set intro(value: boolean);
     set uniqueProjectNames(value: boolean);
     set dropzoneChunking(value: boolean);
+    set universes(value: UniverseConfig[]);
+    set freeUniverseEdit(value: boolean);
     private designerMenuSizePx;
     private splitGutterSizePx;
     totalMenuHeightPx: number;
@@ -999,7 +1014,7 @@ declare class DesignerComponent implements OnInit, AfterViewInit {
     handleKeyboardEvent(event: any): void;
     switchLanguage(language: string): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<DesignerComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<DesignerComponent, "lib-designer", never, { "menuHeightPx": { "alias": "menuHeightPx"; "required": false; }; "externalCompositionsAvailable": { "alias": "externalCompositionsAvailable"; "required": false; }; "restUrl": { "alias": "restUrl"; "required": false; }; "enableMediaLibrary": { "alias": "enableMediaLibrary"; "required": false; }; "loginAvailable": { "alias": "loginAvailable"; "required": false; }; "shareAvailable": { "alias": "shareAvailable"; "required": false; }; "languageSwitch": { "alias": "languageSwitch"; "required": false; }; "livePreview": { "alias": "livePreview"; "required": false; }; "localProfiles": { "alias": "localProfiles"; "required": false; }; "intro": { "alias": "intro"; "required": false; }; "uniqueProjectNames": { "alias": "uniqueProjectNames"; "required": false; }; "dropzoneChunking": { "alias": "dropzoneChunking"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<DesignerComponent, "lib-designer", never, { "menuHeightPx": { "alias": "menuHeightPx"; "required": false; }; "externalCompositionsAvailable": { "alias": "externalCompositionsAvailable"; "required": false; }; "restUrl": { "alias": "restUrl"; "required": false; }; "enableMediaLibrary": { "alias": "enableMediaLibrary"; "required": false; }; "loginAvailable": { "alias": "loginAvailable"; "required": false; }; "shareAvailable": { "alias": "shareAvailable"; "required": false; }; "languageSwitch": { "alias": "languageSwitch"; "required": false; }; "livePreview": { "alias": "livePreview"; "required": false; }; "localProfiles": { "alias": "localProfiles"; "required": false; }; "intro": { "alias": "intro"; "required": false; }; "uniqueProjectNames": { "alias": "uniqueProjectNames"; "required": false; }; "dropzoneChunking": { "alias": "dropzoneChunking"; "required": false; }; "universes": { "alias": "universes"; "required": false; }; "freeUniverseEdit": { "alias": "freeUniverseEdit"; "required": false; }; }, {}, never, never, false, never>;
 }
 
 declare class WarningDialogComponent implements OnInit {
@@ -1272,7 +1287,15 @@ declare class FixturePoolComponent implements OnInit {
     onClose: Subject<number>;
     searchExpression: string;
     updatingProfiles: boolean;
+    universes: UniverseConfig[];
+    selectedUniverse: UniverseConfig;
     constructor(bsModalRef: BsModalRef, fixtureService: FixtureService, uuidService: UuidService, projectService: ProjectService, previewService: PreviewService, translateService: TranslateService, toastrService: ToastrService, presetService: PresetService, configService: ConfigService, modalService: BsModalService, livePreviewService: LivePreviewService);
+    get freeUniverseEdit(): boolean;
+    /** Fixtures belonging to the currently selected universe. */
+    get currentUniverseFixtures(): Fixture[];
+    /** Fixtures used for channel-map calculations (same as currentUniverseFixtures). */
+    private get channelFixtures();
+    selectUniverse(universe: UniverseConfig): void;
     ngOnInit(): void;
     private loadProfiles;
     selectFixture(fixture: Fixture): void;
@@ -1284,6 +1307,7 @@ declare class FixturePoolComponent implements OnInit {
     channelOccupiedStart(index: number): boolean;
     channelOccupiedEnd(index: number): boolean;
     channelOverlapped(index: number): boolean;
+    private channelOverlappedInFixtures;
     channelMouseDown(event: any): void;
     channelSelected(index: number): boolean;
     mouseUp(event: any): void;
@@ -1291,6 +1315,7 @@ declare class FixturePoolComponent implements OnInit {
     ok(): void;
     cancel(): void;
     updateProfiles(): void;
+    openEditUniverses(): void;
     createFixtureFromProfileFile(): void;
     handleKeyboardEvent(event: any): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<FixturePoolComponent, never>;
@@ -1714,6 +1739,21 @@ declare class FixturePoolCreateFromFileComponent implements OnInit {
     static ɵcmp: i0.ɵɵComponentDeclaration<FixturePoolCreateFromFileComponent, "lib-fixture-pool-create-from-file", never, {}, {}, never, never, false, never>;
 }
 
+declare class FixturePoolEditUniversesComponent {
+    bsModalRef: BsModalRef;
+    private uuidService;
+    universes: UniverseConfig[];
+    newUniverseName: string;
+    onClose: Subject<UniverseConfig[] | undefined>;
+    constructor(bsModalRef: BsModalRef, uuidService: UuidService);
+    addUniverse(): void;
+    removeUniverse(universe: UniverseConfig): void;
+    ok(): void;
+    cancel(): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<FixturePoolEditUniversesComponent, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<FixturePoolEditUniversesComponent, "lib-fixture-pool-edit-universes", never, {}, {}, never, never, false, never>;
+}
+
 declare class DropzoneComponent {
     private translateService;
     private configService;
@@ -1756,7 +1796,7 @@ declare class SortablejsDirective implements AfterViewInit, OnDestroy {
 
 declare class DesignerModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<DesignerModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<DesignerModule, [typeof DesignerComponent, typeof WarningDialogComponent, typeof PreviewComponent, typeof EffectCurveComponent, typeof EffectPanTiltComponent, typeof SceneComponent, typeof TimelineComponent, typeof FixtureCapabilityColorComponent, typeof FixtureComponent, typeof FixtureSettingsPositionComponent, typeof FixtureCapabilityComponent, typeof FixtureSettingsComponent, typeof EffectComponent, typeof FixturePoolComponent, typeof PresetComponent, typeof MasterDimmerComponent, typeof FixtureCapabilityDimmerComponent, typeof TimelineGridComponent, typeof CompositionSettingsComponent, typeof ArraySortPipe, typeof FixtureCapabilityPanTiltComponent, typeof FixtureCapabilityChannelComponent, typeof FixtureChannelComponent, typeof FixtureCapabilityColorWheelComponent, typeof UserLoginComponent, typeof UserRegisterComponent, typeof ProjectBrowserComponent, typeof WaitDialogComponent, typeof ProjectImportComponent, typeof ProjectShareComponent, typeof ErrorDialogComponent, typeof FixtureSettingsStageComponent, typeof IntroComponent, typeof PresetSettingsComponent, typeof SceneSettingsComponent, typeof ProjectSaveComponent, typeof FixturePoolCreateFromFileComponent, typeof DropzoneComponent, typeof SortablejsDirective], [typeof i40.RouterModule, typeof i41.BrowserModule, typeof i42.BrowserAnimationsModule, typeof i43.FormsModule, typeof i44.NgxBootstrapSliderModule, typeof i45.TranslateModule, typeof i46.AccordionModule, typeof i47.PopoverModule, typeof i48.TypeaheadModule, typeof i49.DropzoneModule, typeof i50.ToastrModule, typeof i51.TreeModule], [typeof DesignerComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<DesignerModule, [typeof DesignerComponent, typeof WarningDialogComponent, typeof PreviewComponent, typeof EffectCurveComponent, typeof EffectPanTiltComponent, typeof SceneComponent, typeof TimelineComponent, typeof FixtureCapabilityColorComponent, typeof FixtureComponent, typeof FixtureSettingsPositionComponent, typeof FixtureCapabilityComponent, typeof FixtureSettingsComponent, typeof EffectComponent, typeof FixturePoolComponent, typeof PresetComponent, typeof MasterDimmerComponent, typeof FixtureCapabilityDimmerComponent, typeof TimelineGridComponent, typeof CompositionSettingsComponent, typeof ArraySortPipe, typeof FixtureCapabilityPanTiltComponent, typeof FixtureCapabilityChannelComponent, typeof FixtureChannelComponent, typeof FixtureCapabilityColorWheelComponent, typeof UserLoginComponent, typeof UserRegisterComponent, typeof ProjectBrowserComponent, typeof WaitDialogComponent, typeof ProjectImportComponent, typeof ProjectShareComponent, typeof ErrorDialogComponent, typeof FixtureSettingsStageComponent, typeof IntroComponent, typeof PresetSettingsComponent, typeof SceneSettingsComponent, typeof ProjectSaveComponent, typeof FixturePoolCreateFromFileComponent, typeof FixturePoolEditUniversesComponent, typeof DropzoneComponent, typeof SortablejsDirective], [typeof i41.RouterModule, typeof i42.BrowserModule, typeof i43.BrowserAnimationsModule, typeof i44.FormsModule, typeof i45.NgxBootstrapSliderModule, typeof i46.TranslateModule, typeof i47.AccordionModule, typeof i48.PopoverModule, typeof i49.TypeaheadModule, typeof i50.DropzoneModule, typeof i51.ToastrModule, typeof i52.TreeModule], [typeof DesignerComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<DesignerModule>;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocketshow/designer",
-  "version": "1.62.0",
+  "version": "1.64.0",
   "dependencies": {
     "tslib": "^2.0.0"
   },