+
+
- {{i == 0 && "Top" || i}}
-
+
\ No newline at end of file
diff --git a/SBOLCanvasFrontend/src/app/hierarchy-preview/hierarchy-preview.component.ts b/SBOLCanvasFrontend/src/app/hierarchy-preview/hierarchy-preview.component.ts
index f9eef3aa..098e259e 100644
--- a/SBOLCanvasFrontend/src/app/hierarchy-preview/hierarchy-preview.component.ts
+++ b/SBOLCanvasFrontend/src/app/hierarchy-preview/hierarchy-preview.component.ts
@@ -1,26 +1,35 @@
-import { Component } from '@angular/core'
+import { Component, Input, OnInit } from '@angular/core'
import { GraphService } from '../graph.service'
-
-
+import { GlyphService } from '../glyph.service';
+import { DomSanitizer } from '@angular/platform-browser';
@Component({
selector: 'app-hierarchy-preview',
templateUrl: './hierarchy-preview.component.html',
styleUrls: ['./hierarchy-preview.component.css']
})
-export class HierarchyPreviewComponent {
+export class HierarchyPreviewComponent {
+
+
+ constructor(private graphService: GraphService, private glyphService: GlyphService, private sanitizer : DomSanitizer) { }
- constructor(private graphService: GraphService) { }
+ glyphName: string;
+ selectedStack = [];
+ selectedHTMLStack = [];
+
+ getViewStack() {
+ this.glyphName = this.graphService.getSelectedGlyphName();
+ this.selectedStack = this.graphService.getSelectedGlyphNameSet();
+ this.selectedHTMLStack = this.graphService.getSelectedHTMLSet();
- getViewStack() {
- // console.log(this.glyphMenu.sequenceFeatureDict)
return this.graphService.viewStack
}
switchView(depth) {
let levels = this.graphService.viewStack.length - depth - 1
-
- for (let i = 0; i < levels; i++)
+
+ for (let i = 0; i < levels; i++){
this.graphService.exitGlyph()
+ }
}
}
diff --git a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.css b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.css
index 4743a67d..fca409f2 100644
--- a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.css
+++ b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.css
@@ -28,4 +28,5 @@
.toolbar-row-section.grow {
flex-grow: 1;
-}
\ No newline at end of file
+}
+
diff --git a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.html b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.html
index d33ee609..4edb46ab 100644
--- a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.html
+++ b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.html
@@ -107,9 +107,10 @@
-
+
+
-
\ No newline at end of file
+
diff --git a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.ts b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.ts
index f596c5c5..64c8cf24 100644
--- a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.ts
+++ b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, ElementRef, OnInit, QueryList, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnInit, QueryList, Sanitizer, ViewChild } from '@angular/core';
import { GraphService } from '../graph.service';
import { FilesService } from '../files.service';
import { MatDialog } from '@angular/material/dialog';
@@ -9,6 +9,8 @@ import { ExportDesignComponent } from '../export-design/export-design.component'
import { ConfirmComponent } from '../confirm/confirm.component';
import { LoadGraphComponent } from '../load-graph/load-graph.component';
import { EmbeddedService } from '../embedded.service';
+import { GlyphService } from '../glyph.service';
+
export interface SaveDialogData {
filename: string;
@@ -25,16 +27,21 @@ export interface LoadDialogData {
export class ToolbarComponent implements OnInit, AfterViewInit {
@ViewChild('backbone') backbone: ElementRef;
+
filename: string;
popupOpen: boolean;
users: {};
-
+ newGlyphName: string;
+ newHTML: string;
+ sequenceFeatureDict = {};
+
constructor(public graphService: GraphService, private filesService: FilesService,
- public dialog: MatDialog, public embeddedService: EmbeddedService) {
+ public dialog: MatDialog, public embeddedService: EmbeddedService, private glyphService: GlyphService) {
}
ngOnInit() {
+
}
ngAfterViewInit() {
@@ -129,4 +136,7 @@ export class ToolbarComponent implements OnInit, AfterViewInit {
this.graphService.addMolecularSpecies("replacement-glyph");
this.graphService.addInteractionNode("replacement-glyph");
}
+
+
+
}