Skip to content

Update splitpanes library from 1.14.2 to 2.3.6 #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jarusified wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Update splitpanes library from 1.14.2 to 2.3.6 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
406901f
Move settings to the general folder
jarusified Jun 21, 2021
44677a8
Remove vuetify from lib
jarusified Jun 21, 2021
d311226
Remove this. from App.vue
jarusified Jun 21, 2021
fc22e4d
Fix the boxplot size issue
jarusified Jun 21, 2021
dd80b57
Add comparison run selection
jarusified Jun 22, 2021
f0290f0
Detect comparison on the CCT component
jarusified Jun 22, 2021
dd9e428
Implement splitpanes - But it breaks the other views.
jarusified Jun 22, 2021
bd61a17
Splitpanes for supergraph - Breaks even more
jarusified Jun 22, 2021
1f0a679
Merge branch 'stage' of https://github.com/LLNL/CallFlow into feature…
jarusified Jul 26, 2021
625661f
Merge branch 'develop' of https://github.com/LLNL/CallFlow into featu…
jarusified Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,445 changes: 1,021 additions & 1,424 deletions app/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"moment": "^2.29.1",
"robust-point-in-polygon": "^1.0.3",
"socket.io-client": "^2.3.1",
"splitpanes": "^1.14.2",
"splitpanes": "^2.3.6",
"vue": "^2.6.12",
"vue-material": "^1.0.0-beta-14",
"vue-router": "^3.4.6",
Expand Down
26 changes: 18 additions & 8 deletions app/src/components/CCT.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,21 @@
</v-navigation-drawer>

<v-main class="pt-0">
<splitpanes id="cct-dashboard">
<!-- Left column-->
<splitpanes horizontal :splitpanes-size="isComparisonMode ? 50 : 100">
<NodeLink ref="CCT1" />
<!-- <NodeLink ref="CCT2" /> -->
</splitpanes>
<splitpanes class="default-theme">
<pane>
<NodeLink ref="CCT1" />
</pane>
<!-- Surprise & delight -->
<!-- <pane :v-if="!isComparisonMode">
<NodeLink ref="CCT2" />
</pane> -->
</splitpanes>
</v-main>
</div>
</template>

<script>
import Splitpanes from "splitpanes";
import { Splitpanes, Pane } from "splitpanes";
import { mapGetters } from "vuex";
import "splitpanes/dist/splitpanes.css";

Expand All @@ -63,6 +65,7 @@ export default {
name: "CCT",
components: {
Splitpanes,
Pane,
NodeLink,
Toolbar,
Settings
Expand Down Expand Up @@ -97,6 +100,7 @@ export default {
},

mounted() {
console.log(this.isComparisonMode);
let self = this;
EventHandler.$on("reset-cct", () => {
self.reset();
Expand All @@ -111,7 +115,12 @@ export default {
summary: function (val) {
this.isDataReady = true;
this.init();
}
},

isComparisonMode: function(val) {
console.log(val);
},

},

methods: {
Expand Down Expand Up @@ -157,6 +166,7 @@ export default {
},

clear() {
console.log(this.currentComponents);
this.clearComponents(this.currentComponents);
},

Expand Down
64 changes: 36 additions & 28 deletions app/src/components/SuperGraph.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,28 @@

<template>
<div id="inspire">
<Toolbar ref="ToolBar" :isSettingsOpen.sync="isSettingsOpen"
v-if="Object.keys(metricTimeMap).length > 0" />
<Toolbar
ref="ToolBar"
:isSettingsOpen.sync="isSettingsOpen"
v-if="Object.keys(metricTimeMap).length > 0"
/>
<v-navigation-drawer v-model.lazy="isSettingsOpen" fixed>
<v-card fill-height>
<v-col>
<v-row>
<v-icon color="teal">settings</v-icon>
<v-col cols="9" class="center teal--text">SETTINGS</v-col>
<v-btn icon>
<v-icon v-on:click="closeSettings()">close</v-icon>
</v-btn>
</v-row>
<v-row align="center" justify="space-around">
<v-btn class="mx-0" icon>
Reload
<v-icon v-on:click="reset()">refresh</v-icon>
</v-btn>
</v-row>
</v-col>
<v-row>
<v-icon color="teal">settings</v-icon>
<v-col cols="9" class="center teal--text">SETTINGS</v-col>
<v-btn icon>
<v-icon v-on:click="closeSettings()">close</v-icon>
</v-btn>
</v-row>
<v-row align="center" justify="space-around">
<v-btn class="mx-0" icon>
Reload
<v-icon v-on:click="reset()">refresh</v-icon>
</v-btn>
</v-row>
</v-col>
</v-card>
<Settings ref="Settings"/>
</v-navigation-drawer>
Expand All @@ -34,28 +37,32 @@
<splitpanes id="callgraph-dashboard" class="default-theme">
<!-- Left column-->
<splitpanes horizontal :splitpanes-size="25">
<SingleHistogram ref="SingleHistogram" />
<SingleScatterplot ref="SingleScatterplot" />
<pane>
<SingleHistogram ref="SingleHistogram" />
</pane>
<pane>
<SingleScatterplot ref="SingleScatterplot" />
</pane>
</splitpanes>

<!-- Center column-->
<splitpanes horizontal :splitpanes-size="55">
<!-- <splitpanes horizontal :splitpanes-size="55">
<Sankey ref="Sankey" />
</splitpanes>
</splitpanes> -->

<!-- Right column-->
<splitpanes horizontal :splitpanes-size="20">
<!-- <splitpanes horizontal :splitpanes-size="20">
<CallsiteInformation ref="CallsiteInformation" />
</splitpanes>
</splitpanes> -->
</splitpanes>
</v-row>
</div>
</template>

<script>
// Library imports
import { mapGetters } from "vuex";
import Splitpanes from "splitpanes";
import {mapGetters} from "vuex";
import {Splitpanes, Pane} from "splitpanes";
import "splitpanes/dist/splitpanes.css";

// Local library imports
Expand All @@ -73,9 +80,10 @@ export default {
name: "SuperGraph",
components: {
Splitpanes,
Pane,
Toolbar,
// Generic components
Sankey,
// Sankey,
// Single supergraph components.
SingleScatterplot,
SingleHistogram,
Expand All @@ -89,10 +97,10 @@ export default {
}),

computed: {
...mapGetters({
...mapGetters({
summary: "getSummary",
metricTimeMap: "getMetricTimeMap",
})
}),
},

beforeCreate() {
Expand All @@ -118,7 +126,7 @@ export default {

selectedMode: function (val) {
this.selectedMode = val;
}
},
},

methods: {
Expand Down
19 changes: 11 additions & 8 deletions app/src/components/SuperGraphEnsemble.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,24 @@
<splitpanes id="callgraph-dashboard-2" class="default-theme">
<!-- Left column-->
<splitpanes horizontal splitpanes-size="25">
<ModuleHierarchy ref="ModuleHierarchy" />
<EnsembleScatterplot ref="EnsembleScatterplot" />
<EnsembleHistogram ref="EnsembleHistogram" />
<ModuleHierarchy ref="ModuleHierarchy" />
<EnsembleScatterplot ref="EnsembleScatterplot" />
<EnsembleHistogram ref="EnsembleHistogram" />
</splitpanes>

<!-- Center column-->
<splitpanes horizontal splitpanes-size="55">
<Sankey ref="Sankey" />
<Sankey ref="Sankey" />
</splitpanes>

<!-- Right column-->
<splitpanes horizontal splitpanes-size="20">
<GradientView ref="GradientView" />
<CallsiteCorrespondence ref="CallsiteCorrespondence" />
<ParameterProjection ref="ParameterProjection" />
<splitpanes horizontal splitpanes-size="20" :push-other-panes="true">
<pane size="65">
<CallsiteCorrespondence ref="CallsiteCorrespondence" />
</pane>
<pane size="35">
<ParameterProjection ref="ParameterProjection" />
</pane>
</splitpanes>
</splitpanes>
</v-main>
Expand Down
1 change: 1 addition & 0 deletions app/src/components/general/runSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
v-model="compareRun"
:menu-props="{maxHeight: '400'}"
@input="updateCompareRun"
:disabled={isComparisonMode}
>
<template slot="selection" slot-scope="{item}">
{{ datasets.indexOf(item) + 1 }}. {{ item }} -
Expand Down
18 changes: 15 additions & 3 deletions app/src/components/nodeLink/index_nl.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ export default {
},

data: () => ({
// Surprise & delight.
// compareId: "cct-overview-compare",
// targetId: "cct-overview-target",
id: "cct-overview",
margin: {
top: 20,
Expand Down Expand Up @@ -104,11 +107,20 @@ export default {

visualize() {
this.isDataReady = true;
this.width = this.$store.viewWidth - this.margin.right;
this.height = this.$store.viewHeight - this.margin.bottom;

this.svg = d3.select("#" + this.id);
// TODO: Assign the id based on the pane Key or ref.
if (this.isComparisonMode) {
this.width = this.$store.viewWidth / 2 - this.margin.right;
this.id = "cct-overview-compare";
}
else {
this.width = this.$store.viewWidth - this.margin.right;
this.id = "cct-overview";
}

this.height = this.$store.viewHeight - this.margin.bottom;

this.svg = d3.select("#" + this.id);
this.info = "Selected metric : " + this.selectedMetric;

this.g = this.createGraph();
Expand Down
1 change: 0 additions & 1 deletion server/provider_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ def request_general(self, operation):

time_columns = sg.time_columns


return {
**self.config,
"time_columns": time_columns,
Expand Down