Skip to content
Snippets Groups Projects
Commit cd5d9e97 authored by AndiMajore's avatar AndiMajore
Browse files

merged

parents bb503368 d79587c5
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<span class="is-capitalized"> {{ wrapper.data.groupName }}</span> <span class="is-capitalized"> {{ wrapper.data.groupName }}</span>
</p> </p>
<p *ngIf="wrapper.data.uniprotAc" [ngClass]="{'text-normal':smallStyle}"> <p *ngIf="wrapper.data.uniprotAc" [ngClass]="{'text-normal':smallStyle}">
<b><span>Access:</span></b> <b><span>Uniprot:</span></b>
<a href="https://www.uniprot.org/uniprot/{{ wrapper.data.uniprotAc }}" target="_blank"> <a href="https://www.uniprot.org/uniprot/{{ wrapper.data.uniprotAc }}" target="_blank">
<span class="is-capitalized"> {{ wrapper.data.uniprotAc }}</span> <span class="is-capitalized"> {{ wrapper.data.uniprotAc }}</span>
</a> </a>
......
...@@ -650,17 +650,23 @@ ...@@ -650,17 +650,23 @@
class="seed-selection" class="seed-selection"
[ngClass]="{ 'text-normal': 'smallStyle' }" [ngClass]="{ 'text-normal': 'smallStyle' }"
> >
<!-- <div class="card-content overflow"> <div class="card-content overflow">
<table class="table selection-table" *ngIf="analysis.getCount() > 0"> <table class="table selection-table" *ngIf="analysis.getCount() > 0">
<thead> <thead>
<tr> <tr>
<td>Label</td> <td>Label</td>
<td>Group</td>
<td *ngIf="myConfig.identifier !== 'symbol'">Symbol</td>
<td *ngIf="myConfig.identifier !== 'uniprot'">Uniprot</td>
<td>Actions</td> <td>Actions</td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let p of analysis.getSelection()"> <tr *ngFor="let p of analysis.getSelection()">
<td><p class="is-capitalized">{{p.data.label}}</p></td> <td><p class="is-capitalized">{{p.data.label}}</p></td>
<td><p>{{myConfig.nodeGroups[p.data.group]['groupName']}}</p></td>
<td *ngIf="myConfig.identifier !== 'symbol'"><p>{{p.data.symbol}}</p></td>
<td *ngIf="myConfig.identifier !== 'uniprot'"><p>{{p.data.uniprotAc}}</p></td>
<td> <td>
<button (click)="analysis.removeItems([p])" class="button is-small is-danger is-outlined has-tooltip" <button (click)="analysis.removeItems([p])" class="button is-small is-danger is-outlined has-tooltip"
tooltipPosition="top" pTooltip="Remove from selection."> tooltipPosition="top" pTooltip="Remove from selection.">
...@@ -671,11 +677,11 @@ ...@@ -671,11 +677,11 @@
</tbody> </tbody>
</table> </table>
<i *ngIf="analysis.getCount() === 0"> <i *ngIf="analysis.getCount() === 0">
Double-click on a protein to select it for the analysis. Double-click on a node to select it for the analysis.
</i> </i>
</div> </div>
<footer class="card-footer" *ngIf="selectedAnalysisToken"> <!-- <footer class="card-footer" *ngIf="selectedAnalysisToken">
<a (click)="analysis.addSeeds(currentViewNodes)" <a (click)="analysis.addSeeds(currentViewNodes)"
class="card-footer-item has-text-success" tooltipPosition="top" pTooltip="Add all visible seeds."> class="card-footer-item has-text-success" tooltipPosition="top" pTooltip="Add all visible seeds.">
...@@ -741,7 +747,7 @@ ...@@ -741,7 +747,7 @@
</a> </a>
</footer> --> </footer> -->
<!-- </div> --> <!-- </div> -->
<!-- </div> --> <!-- </div> -->
</div> </div>
</div> </div>
......
...@@ -365,6 +365,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -365,6 +365,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
this.proteinData.linkNodes(); this.proteinData.linkNodes();
const {nodes, edges} = this.proteinData.mapDataToNetworkInput(this.myConfig); const {nodes, edges} = this.proteinData.mapDataToNetworkInput(this.myConfig);
console.log('first item nodes', nodes[0])
this.nodeData.nodes = new vis.DataSet(nodes); this.nodeData.nodes = new vis.DataSet(nodes);
this.nodeData.edges = new vis.DataSet(edges); this.nodeData.edges = new vis.DataSet(edges);
...@@ -372,6 +373,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -372,6 +373,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
const options = NetworkSettings.getOptions('main'); const options = NetworkSettings.getOptions('main');
this.networkInternal = new vis.Network(container, this.nodeData, options); this.networkInternal = new vis.Network(container, this.nodeData, options);
this.networkInternal.on('doubleClick', (properties) => { this.networkInternal.on('doubleClick', (properties) => {
const nodeIds: Array<string> = properties.nodes; const nodeIds: Array<string> = properties.nodes;
if (nodeIds.length > 0) { if (nodeIds.length > 0) {
...@@ -381,6 +383,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -381,6 +383,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
// skip if node is not a protein mapped to backend // skip if node is not a protein mapped to backend
return; return;
} }
console.log(node)
const wrapper = getWrapperFromNode(node); const wrapper = getWrapperFromNode(node);
if (this.analysis.inSelection(node)) { if (this.analysis.inSelection(node)) {
this.analysis.removeItems([wrapper]); this.analysis.removeItems([wrapper]);
......
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
margin-left: 15px; margin-left: 15px;
} }
div.covex.sidebar { div.covex.sidebar {
height: $height; height: $height;
overflow-y: auto; overflow-y: auto;
...@@ -148,11 +149,13 @@ ...@@ -148,11 +149,13 @@
max-height: 600px; max-height: 600px;
} }
div.card-content.overflow { div.card-content.overflow {
overflow: auto; overflow: auto;
max-height: 350px; max-height: 350px;
} }
div.covex.network { div.covex.network {
height: 100%; height: 100%;
float: left; float: left;
......
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