diff --git a/SBOLCanvasFrontend/src/app/download-graph/download-graph.component.html b/SBOLCanvasFrontend/src/app/download-graph/download-graph.component.html index 5d77787e..ec9e59ef 100644 --- a/SBOLCanvasFrontend/src/app/download-graph/download-graph.component.html +++ b/SBOLCanvasFrontend/src/app/download-graph/download-graph.component.html @@ -1,6 +1,6 @@ -

Download

+

Load

Server diff --git a/SBOLCanvasFrontend/src/app/graph.service.ts b/SBOLCanvasFrontend/src/app/graph.service.ts index ad6b9f77..10a3d435 100644 --- a/SBOLCanvasFrontend/src/app/graph.service.ts +++ b/SBOLCanvasFrontend/src/app/graph.service.ts @@ -504,6 +504,14 @@ export class GraphService { return this.graph.getView().getScale(); } + sendSelectionToFront() { + this.graph.orderCells(false) + } + + sendSelectionToBack() { + this.graph.orderCells(true) + } + fitCamera() { // graph.fit() does most of the work. however by default it will zoom in far too much. // Instead, it makes sense to stay at the user's zoom level unless it is too small to diff --git a/SBOLCanvasFrontend/src/app/info-editor/info-editor.component.html b/SBOLCanvasFrontend/src/app/info-editor/info-editor.component.html index 22420624..152db178 100644 --- a/SBOLCanvasFrontend/src/app/info-editor/info-editor.component.html +++ b/SBOLCanvasFrontend/src/app/info-editor/info-editor.component.html @@ -60,7 +60,7 @@ - +
diff --git a/SBOLCanvasFrontend/src/app/load-graph/load-graph.component.html b/SBOLCanvasFrontend/src/app/load-graph/load-graph.component.html index c3d9cabb..4e451508 100644 --- a/SBOLCanvasFrontend/src/app/load-graph/load-graph.component.html +++ b/SBOLCanvasFrontend/src/app/load-graph/load-graph.component.html @@ -1,5 +1,5 @@ -

Load Graph

+

Upload

@@ -9,4 +9,4 @@

Load Graph

-
\ No newline at end of file +
diff --git a/SBOLCanvasFrontend/src/app/save-graph/save-graph.component.html b/SBOLCanvasFrontend/src/app/save-graph/save-graph.component.html index 871adcb2..e35ce5c6 100644 --- a/SBOLCanvasFrontend/src/app/save-graph/save-graph.component.html +++ b/SBOLCanvasFrontend/src/app/save-graph/save-graph.component.html @@ -1,5 +1,5 @@ -

Save Graph

+

Download

Enter file name...

diff --git a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.css b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.css index 7dbfefc0..6906574e 100644 --- a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.css +++ b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.css @@ -16,6 +16,14 @@ margin-left: 8px; } +.zoom-input { + text-align: right; + padding-left: 10px; + padding-right: 10px; + max-width: 50px; + font-size: .8em; +} + /* There is a bug with vertical dividers in toolbar rows so you have to manually fix the styling for the divider. diff --git a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.html b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.html index 29c6d653..d73185a0 100644 --- a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.html +++ b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.html @@ -1,31 +1,33 @@ - - - - - - - + SynBioHub + + [matTooltip]="'Save module to SynBioHub'" + (click)="openSaveDialog()">Save + [matTooltip]="'Load module from SynBioHub'" + (click)="openLoadDialog()">Load + + Local Device + [matTooltip]="'Download module as xml'" + (click)="openDownloadDialog()">Download + [matTooltip]="'Upload module from xml'" + (click)="openUploadDialog()">Upload @@ -33,48 +35,72 @@ - - + [matTooltip]="'Show or hide scar glyphs'" + (click)="graphService.toggleScars()">Toggle Scar Visibility - + + + + + + + + + + [matTooltip]="'Bring selected part to front'" + (click)="graphService.sendSelectionToFront()">flip_to_back + [matTooltip]="'Send selected part to back'" + (click)="graphService.sendSelectionToBack()">flip_to_front + + + + diff --git a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.ts b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.ts index 65feb23c..d3d09c00 100644 --- a/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.ts +++ b/SBOLCanvasFrontend/src/app/toolbar/toolbar.component.ts @@ -28,7 +28,9 @@ export class ToolbarComponent implements OnInit, AfterViewInit { popupOpen: boolean; users: {}; - constructor(public graphService: GraphService, private filesService: FilesService, public dialog: MatDialog) { } + constructor(public graphService: GraphService, private filesService: FilesService, + public dialog: MatDialog) { + } ngOnInit() { } @@ -44,17 +46,17 @@ export class ToolbarComponent implements OnInit, AfterViewInit { this.filesService.loadLocal(file, this.graphService); } - openUploadDialog(): void { + openSaveDialog(): void { this.dialog.open(UploadGraphComponent, {}); } - openDownloadDialog(): void{ + openLoadDialog(): void{ this.dialog.open(DownloadGraphComponent, { data: null }); } - openSaveDialog(): void { + openDownloadDialog(): void { const dialogRef = this.dialog.open(SaveGraphComponent, { data: { filename: this.filename } }); @@ -68,7 +70,7 @@ export class ToolbarComponent implements OnInit, AfterViewInit { }); } - openLoadDialog(): void { + openUploadDialog(): void { const dialogRef = this.dialog.open(LoadGraphComponent, { data: { file: null } }); diff --git a/SBOLCanvasFrontend/src/app/upload-graph/upload-graph.component.html b/SBOLCanvasFrontend/src/app/upload-graph/upload-graph.component.html index f4766572..f4e29b3f 100644 --- a/SBOLCanvasFrontend/src/app/upload-graph/upload-graph.component.html +++ b/SBOLCanvasFrontend/src/app/upload-graph/upload-graph.component.html @@ -1,5 +1,5 @@ -

Upload

+

Save

@@ -60,4 +60,4 @@

Upload

-
\ No newline at end of file + diff --git a/resources/flip_glyph.svg b/resources/flip_glyph.svg new file mode 100755 index 00000000..4a3ba2b6 --- /dev/null +++ b/resources/flip_glyph.svg @@ -0,0 +1,292 @@ + +image/svg+xml \ No newline at end of file