Skip to content
Snippets Groups Projects
Commit 018bd53c authored by Michael Hartung's avatar Michael Hartung
Browse files

merge issues

parents b444945d 75f7fd5c
No related branches found
No related tags found
No related merge requests found
Source diff could not be displayed: it is too large. Options to address this: view the blob.
Source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -181,8 +181,8 @@
</div>
</div>
</ng-container>
<app-toggle class="footer-buttons explorer-footer-element" textOn="Drugs On" textOff="Off"
<app-toggle class="footer-buttons" textOn="Drugs On" textOff="Off"
tooltipOn="Display adjacent drugs ON."
tooltipOff="Display adjacent drugs OFF."
[smallStyle]="smallStyle"
......@@ -205,12 +205,12 @@
<div *ngIf="myConfig.showItemSelector" class="card bar-large">
<header class="card-header" [ngClass]="{'b-text-small':smallStyle}">
<p class="card-header-title">
<span class="icon">
<i *ngIf="!selectedWrapper" class="fas fa-info" aria-hidden="true"></i>
<span *ngIf="!selectedWrapper" class="icon">
<i class="fas fa-info" aria-hidden="true"></i>
</span>
<!-- <i *ngIf="selectedWrapper && selectedWrapper.data.netexId && selectedWrapper.data.netexId.startsWith('p')" class="fas fa-dna" aria-hidden="true"></i>
<i *ngIf="selectedWrapper && selectedWrapper.data.netexId && selectedWrapper.data.netexId.startsWith('d')" class="fas fa-capsules"
aria-hidden="true"></i> -->
</span>
<span *ngIf="!selectedWrapper">No item selected</span>
<span *ngIf="selectedWrapper">
<span>{{ selectedWrapper.data.type }}</span>
......
......@@ -23,7 +23,7 @@ import {NetworkSettings} from '../../network-settings';
import {defaultConfig, EdgeGroup, IConfig, InteractionDatabase, NodeGroup} from '../../config';
import {NetexControllerService} from 'src/app/services/netex-controller/netex-controller.service';
import {rgbaToHex, rgbToHex, standardize_color} from '../../utils'
import * as merge from 'lodash/fp/merge';
import * as merge from 'lodash/fp/merge';
// import * as 'vis' from 'vis-network';
// import {DataSet} from 'vis-data';
......@@ -341,7 +341,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
const options = NetworkSettings.getOptions('main');
this.networkInternal = new vis.Network(container, this.nodeData, options);
this.networkInternal.on('doubleClick', (properties) => {
const nodeIds: Array<string> = properties.nodes;
if (nodeIds.length > 0) {
......@@ -620,7 +619,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
node.x = pos[item.id].x;
node.y = pos[item.id].y;
Object.assign(
node,
node,
NetworkSettings.getNodeStyle(
node,
this.myConfig,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment