@mxtommy/kip 1.2.3 → 2.0.0

package/src/app/data-set.service.spec.ts

@@ -1,15 +0,0 @@
-import { TestBed, inject } from '@angular/core/testing';
-
-import { DataSetService } from './data-set.service';
-
-describe('DataSetService', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [DataSetService]
-    });
-  });
-
-  it('should be created', inject([DataSetService], (service: DataSetService) => {
-    expect(service).toBeTruthy();
-  }));
-});

package/src/app/data-set.service.ts

@@ -1,273 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Subscription ,  Observable ,  BehaviorSubject, interval } from 'rxjs';
-import { AppSettingsService } from './app-settings.service';
-import { SignalKService } from './signalk.service';
-
-
-export interface dataPoint {
-  timestamp: number;
-  average: number;
-  minValue: number;
-  maxValue: number;
-}
-
-interface dataCache {
-  runningTotal: number;
-  numberOfPoints: number;
-  minValue: number;
-  maxValue: number;
-}
-
-export interface IDataSet {
-  uuid: string;
-  path: string;
-  signalKSource: string;
-  updateTimer: number; //number of seconds between new dataPoints
-  dataPoints: number; // how many datapoints do we keep?
-  name?:  string; // sometimes used for display purposes
-};
-
-
-interface DataSetSub {
-  uuid: string;
-  pathSub: Subscription;
-  updateTimerSub: Subscription;
-  data: dataPoint[];
-  dataCache: dataCache // running calculations
-};
-
-interface registration {
-  uuid: string;
-  dataSetUuid: string;
-  observable: BehaviorSubject<Array<dataPoint>>;
-}
-
-@Injectable()
-export class DataSetService {
-
-  dataSets: IDataSet[] = [];
-  dataSetSub: DataSetSub[] = [];
-  dataSetRegister: registration[] = [];
-
-  constructor(
-    private AppSettingsService: AppSettingsService,
-    private SignalKService: SignalKService,
-  ) {
-      this.dataSets = AppSettingsService.getDataSets();
-  }
-
-  startAllDataSets() {
-    console.log("Starting " + this.dataSets.length.toString() + " DataSets");
-    for (let i = 0; i < this.dataSets.length; i++) {
-      this.startDataSet(this.dataSets[i].uuid);
-    }
-  }
-
-  private newUuid() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-        var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
-        return v.toString(16);
-    });
-  }
-
-  subscribeDataSet(uuid, dataSetUuid) {
-    //see if already subscribed, if yes return that...
-    let registerIndex = this.dataSetRegister.findIndex(registration => (registration.uuid == uuid) && (registration.dataSetUuid == dataSetUuid));
-    if (registerIndex >= 0) { // exists
-      return this.dataSetRegister[registerIndex].observable.asObservable();
-    }
-
-
-    //find if we already have a value for this dataSet to return.
-    let currentDataSet: dataPoint[];
-    let dataIndex = this.dataSetSub.findIndex(dataSet => dataSet.uuid == dataSetUuid);
-    if (dataIndex >= 0) { // exists
-      currentDataSet = this.dataSetSub[dataIndex].data;
-    } else {
-      currentDataSet = null;
-    }
-
-    //register
-    this.dataSetRegister.push({
-      uuid: uuid,
-      dataSetUuid: dataSetUuid,
-      observable: new BehaviorSubject<Array<dataPoint>>(currentDataSet)
-    });
-    // should be subscribed now, use search now as maybe someone else adds something and it's no longer last in array :P
-    registerIndex = this.dataSetRegister.findIndex(registration => (registration.uuid == uuid) && (registration.dataSetUuid == dataSetUuid));
-    return this.dataSetRegister[registerIndex].observable.asObservable();
-  }
-
-
-
-  stopDataSet(uuid: string) {
-    // stop any registrations to this dataset...
-    for (let i=this.dataSetRegister.length-1; i >= 0; i--) { //backwards because lengh will change...
-      if (this.dataSetRegister[i].uuid == uuid) {
-        this.dataSetRegister.splice(i,1);
-      }
-    }
-
-     //delete current DataSetSub if it exists...
-    let dataSubIndex = this.dataSetSub.findIndex(dataSub => dataSub.uuid == uuid);
-    if (dataSubIndex >= 0) {
-      // stop pathSub
-      this.dataSetSub[dataSubIndex].pathSub.unsubscribe();
-      //stop TimerSub
-      this.dataSetSub[dataSubIndex].updateTimerSub.unsubscribe();
-      //delete DataSub
-      this.dataSetSub.splice(dataSubIndex,1);
-     }
-  }
-
-  startDataSet(uuid: string) {
-    let dataIndex = this.dataSets.findIndex(dataSet => dataSet.uuid == uuid);
-    if (dataIndex < 0) { return; }//not found...
-
-    //delete current DataSetSub if it exists...
-    let dataSubIndex = this.dataSetSub.findIndex(dataSub => dataSub.uuid == uuid);
-    if (dataSubIndex >= 0) {
-      this.dataSetSub.splice(dataSubIndex,1);
-    }
-
-    this.dataSetSub.push({
-      uuid: uuid,
-      pathSub: null,
-      updateTimerSub: null,
-      data: null,
-      dataCache: null,
-    });
-    dataSubIndex = this.dataSetSub.findIndex(dataSub => dataSub.uuid == uuid);
-
-
-    // initialize data
-    this.dataSetSub[dataSubIndex].data = [];
-    //for (let i=0; i<this.dataSets[dataIndex].dataPoints; i++) {
-    //    this.dataSetSub[dataSubIndex].data.push(null);
-    //}
-
-    // inistialize dataCache
-    this.dataSetSub[dataSubIndex].dataCache = {
-        runningTotal: 0,
-        numberOfPoints: 0,
-        minValue: null,
-        maxValue: null
-    }
-
-    //Subscribe to path data
-    this.dataSetSub[dataSubIndex].pathSub = this.SignalKService.subscribePath(this.dataSets[dataIndex].uuid, this.dataSets[dataIndex].path, this.dataSets[dataIndex].signalKSource).subscribe(
-      newValue => {
-        this.updateDataCache(uuid, newValue.value);
-    });
-
-    // start update timer
-    this.dataSetSub[dataSubIndex].updateTimerSub = interval (1000 * this.dataSets[dataIndex].updateTimer).subscribe(x => {
-        this.aggregateDataCache(uuid);
-    });
-
-  }
-
-  addDataSet(path: string, source: string, updateTimer: number, dataPoints: number ) {
-    let uuid = this.newUuid();
-
-    let newSub: IDataSet = {
-      uuid: uuid,
-      path: path,
-      signalKSource: source,
-      updateTimer: updateTimer,
-      dataPoints: dataPoints
-    };
-    this.dataSets.push(newSub);
-
-    this.startDataSet(uuid);
-    this.AppSettingsService.saveDataSets(this.dataSets);
-  }
-
-  deleteDataSet(uuid: string) {
-    //get index
-    let dataSetIndex = this.dataSetSub.findIndex(sub => sub.uuid == uuid);
-    if (dataSetIndex < 0) { return; } // uuid doesn't exist...
-
-    this.stopDataSet(uuid);
-    // deleteSubscription
-    this.dataSets.splice(dataSetIndex,1);
-
-    this.AppSettingsService.saveDataSets(this.dataSets);
-
-  }
-
-  getDataSets(): IDataSet[] {
-    let result = [];
-    for (let i=0;i<this.dataSets.length; i++) {
-
-      let name = this.dataSets[i].path + ' - Interval:' + this.dataSets[i].updateTimer.toString() + ' - DataPoints:' + this.dataSets[i].dataPoints.toString()
-      result.push({
-        uuid: this.dataSets[i].uuid,
-        path: this.dataSets[i].path,
-        updateTimer: this.dataSets[i].updateTimer,
-        dataPoints: this.dataSets[i].dataPoints,
-        name: name
-      });
-    }
-    return result;
-  }
-
-  aggregateDataCache(uuid: string) {
-    let avg: number = null;
-
-    //get index
-    let dataSetIndex = this.dataSets.findIndex(sub => sub.uuid == uuid);
-    let dataSubIndex = this.dataSetSub.findIndex(sub => sub.uuid == uuid);
-
-    // update average
-    if (this.dataSetSub[dataSubIndex].dataCache.numberOfPoints > 0) { // if it's still 0, we had no update this timeperiod so leave it as null...
-      avg = this.dataSetSub[dataSubIndex].dataCache.runningTotal / this.dataSetSub[dataSubIndex].dataCache.numberOfPoints;
-    }
-
-    // remove first item if we have dataPoints points.
-    if (this.dataSetSub[dataSubIndex].data.length >= this.dataSets[dataSetIndex].dataPoints) {
-      this.dataSetSub[dataSubIndex].data.shift();
-    }
-
-    // add our new dataPoint to end of dataset.
-    let newDataPoint: dataPoint = {
-      timestamp: Date.now(),
-      average: avg,
-      minValue: this.dataSetSub[dataSubIndex].dataCache.minValue,
-      maxValue: this.dataSetSub[dataSubIndex].dataCache.maxValue
-    }
-    this.dataSetSub[dataSubIndex].data.push(newDataPoint);
-
-    // reset dataCache
-    this.dataSetSub[dataSubIndex].dataCache = {
-          runningTotal: 0,
-          numberOfPoints: 0,
-          minValue: null,
-          maxValue: null
-      }
-    // ... push to registered graphs...
-
-    for (let i = 0; i < this.dataSetRegister.length;  i++) {
-      if (this.dataSetRegister[i].dataSetUuid == uuid) {
-        this.dataSetRegister[i].observable.next(this.dataSetSub[dataSubIndex].data);
-      }
-    }
-  }
-
-  updateDataCache(uuid: string, newValue: number) {
-    //get index
-    let dsIndex = this.dataSetSub.findIndex(sub => sub.uuid == uuid);
-
-    this.dataSetSub[dsIndex].dataCache.runningTotal = this.dataSetSub[dsIndex].dataCache.runningTotal + newValue;
-    this.dataSetSub[dsIndex].dataCache.numberOfPoints = this.dataSetSub[dsIndex].dataCache.numberOfPoints + 1;
-
-    if ((this.dataSetSub[dsIndex].dataCache.minValue === null) || (this.dataSetSub[dsIndex].dataCache.minValue > newValue)) {
-      this.dataSetSub[dsIndex].dataCache.minValue = newValue;
-    }
-    if ((this.dataSetSub[dsIndex].dataCache.maxValue === null) || (this.dataSetSub[dsIndex].dataCache.maxValue < newValue)) {
-      this.dataSetSub[dsIndex].dataCache.maxValue = newValue;
-    }
-  }
-
-
-}

package/src/app/dynamic-widget.directive.spec.ts

@@ -1,8 +0,0 @@
-import { DynamicWidgetDirective } from './dynamic-widget.directive';
-
-describe('DynamicWidgetDirective', () => {
-  it('should create an instance', () => {
-    const directive = new DynamicWidgetDirective();
-    expect(directive).toBeTruthy();
-  });
-});

package/src/app/dynamic-widget.directive.ts

@@ -1,11 +0,0 @@
-import { Directive, ViewContainerRef } from '@angular/core';
-
-@Directive({
-  selector: '[dynamic-widget]'
-})
-export class DynamicWidgetDirective {
-
-  constructor(public viewContainerRef: ViewContainerRef) {
-    viewContainerRef.constructor.name === "ViewContainerRef"; // true
-   }
-}

package/src/app/filter-self.pipe.spec.ts

@@ -1,8 +0,0 @@
-import { FilterSelfPipe } from './filter-self.pipe';
-
-describe('FilterSelfPipe', () => {
-  it('create an instance', () => {
-    const pipe = new FilterSelfPipe();
-    expect(pipe).toBeTruthy();
-  });
-});

package/src/app/filter-self.pipe.ts

@@ -1,14 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core';
-
-@Pipe({
-  name: 'filterSelf'
-})
-export class FilterSelfPipe implements PipeTransform {
-
-  transform(values: string[], filterSelf: boolean): any[] {
-    if (!values || !values.length) return [];
-    if (!filterSelf) return values;
-    return values.filter(v =>  v.includes('self'));
-  }
-
-}

package/src/app/fit-text.directive.spec.ts

@@ -1,8 +0,0 @@
-import { FitTextDirective } from './fit-text.directive';
-
-describe('FitTextDirective', () => {
-  it('should create an instance', () => {
-    const directive = new FitTextDirective();
-    expect(directive).toBeTruthy();
-  });
-});

package/src/app/fit-text.directive.ts

@@ -1,61 +0,0 @@
-import {Directive, ElementRef, Input, AfterViewInit, HostListener} from '@angular/core';
-
-@Directive({
-  selector: '[fit-text]'
-})
-export class FitTextDirective {
-
-
-    @Input('fit-text') fittext: boolean = true;
-    @Input('container') container: HTMLDivElement;
-    @Input('activateOnResize') activateOnResize: boolean = true;
-    @Input('minFontSize') minFontSize: number = -1 / 0;
-    @Input('maxFontSize') maxFontSize: number = 1 / 0;
-    @Input('compression') compression: number = 1;
-
-    constructor(public el: ElementRef) {}
-
-    private setFontSize = (): void => {
-        if (this.fittext) {
- /*           let containerWidth, fontSize;
- 
-            const windowWidth = window.screen.width;
-            const parentWidth = this.container.parentElement.clientWidth;
-            console.log(this.el.nativeElement.parentElement.clientWidth);
-            console.log(this.el.nativeElement.parentElement.clientHeight);
-            parentWidth > windowWidth ? containerWidth = windowWidth : containerWidth = parentWidth;
-            fontSize = Math.max(Math.min(containerWidth / (this.compression * 10), this.maxFontSize), this.minFontSize); */
-
-            let fontSize;
-            let width = this.el.nativeElement.parentElement.clientWidth;
-            let height = this.el.nativeElement.parentElement.clientHeight;
-
-            fontSize = 
-                        Math.min(
-                            Math.max(
-                                Math.min(
-                                    width / (this.compression * 10), 
-                                    this.maxFontSize), 
-                                this.minFontSize),
-                            height); //TODO, does not take text width into consideration :(
-
-
-            return this.el.nativeElement.style.setProperty('font-size', (fontSize).toString() + 'px');
-        }
-    };
-
-    /*@HostListener('window:resize', ['$event'])
-    public onResize = (): void => { */
-    ngOnChanges(changes: any) {
-        if (this.activateOnResize) {
-            setTimeout(() => {
-                this.setFontSize();
-                 },10);
-        }
-    };
-
- /*   ngAfterViewInit() {
-        this.setFontSize();
-    }
-  */
-}

package/src/app/gauge-steel/gauge-steel.component.css

@@ -1,5 +0,0 @@
-.wrapper {
-    height: 100%;
-    width: 100%;
-    text-align: center;
-}

package/src/app/gauge-steel/gauge-steel.component.html

@@ -1,4 +0,0 @@
-<div class=wrapper #wrapperDiv (resized)="onResized($event)">
-        <canvas id="{{widgetUUID}}" width="201" height="201">No canvas in your browser...sorry...</canvas>
-</div>
-

package/src/app/gauge-steel/gauge-steel.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { GaugeSteelComponent } from './gauge-steel.component';
-
-describe('GaugeSteelComponent', () => {
-  let component: GaugeSteelComponent;
-  let fixture: ComponentFixture<GaugeSteelComponent>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ GaugeSteelComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(GaugeSteelComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should be created', () => {
-    expect(component).toBeTruthy();
-  });
-});