Skip to content
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

feat(EvConfigCanvas): added button to reset view #94

Merged
merged 1 commit into from
Mar 19, 2024
+40 −8
Merged

feat(EvConfigCanvas): added button to reset view #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 25 additions & 2 deletions src/components/EvConfigCanvas.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,21 @@
<!-- <v-sheet id="config-stage-info" class="pa-2" height="100" width="200" elevation="2" v-if="selected_interface">
{{ selected_interface }} <v-btn color="primary" x-small @click="discard_selected_terminal">Discard</v-btn>
</v-sheet> -->
<v-btn id="config-save-button" icon="mdi-content-save" color="primary" @click="save_config" v-if="current_config"></v-btn>
<div id="stage-controls">
<v-tooltip location="left">
<template v-slot:activator="{ props }">
<v-btn id="reset-view-button" icon="mdi-undo" color="primary" @click="reset_view" v-bind="props"></v-btn>
</template>
<span>Reset View</span>
</v-tooltip>
<v-tooltip location="left" v-if="current_config">
<template v-slot:activator="{ props }">
<v-btn id="config-save-button" icon="mdi-content-save" color="primary" @click="save_config"
v-bind="props"></v-btn>
</template>
<span>Save Config</span>
</v-tooltip>
</div>
</v-sheet>
</template>

Expand Down Expand Up @@ -45,6 +59,10 @@ export default defineComponent({

const current_config: ComputedRef<EVConfigModel> = computed(evbcStore.get_current_config);

const reset_view = () => {
stage.reset_view();
};

const save_config = () => {
if (!current_config.value) return;
evbc
Expand All @@ -69,6 +87,7 @@ export default defineComponent({
selected_interface,
stage,
current_config,
reset_view,
save_config,
};
},
Expand All @@ -89,9 +108,13 @@ export default defineComponent({
top: 6px;
right: 6px;
}
#config-save-button {

#stage-controls {
position: absolute;
bottom: 12px;
right: 12px;
display: flex;
flex-direction: column;
gap: 0.5rem;
}
</style>
21 changes: 15 additions & 6 deletions src/modules/evconf_konva/config_stage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {KonvaEventObject} from "konva/lib/Node";
import {Vector2d} from "konva/lib/types";
import {currentTheme} from "@/plugins/vuetify";
import Stage = Konva.Stage;
import Layer = Konva.Layer;

export default class ConfigStage {
// view part
Expand Down Expand Up @@ -109,16 +110,11 @@ export default class ConfigStage {

const newScale = oldScale * scaleBy;

static_layer.scale({ x: newScale, y: newScale });
const newPos = {
x: pointer.x - mousePointTo.x * newScale,
y: pointer.y - mousePointTo.y * newScale,
};
static_layer.position(newPos);
this._bg.width(this._stage.width() / newScale);
this._bg.height(this._stage.height() / newScale);
this._bg.setAbsolutePosition({x: 0, y: 0});
static_layer.batchDraw();
this.setNewPosAndScale(static_layer, newPos, newScale);
});

this._stage.add(static_layer);
Expand All @@ -138,6 +134,15 @@ export default class ConfigStage {
this.resizeStage();
}

private setNewPosAndScale(static_layer: Layer, newPos: { x: number; y: number }, newScale: number) {
static_layer.scale({x: newScale, y: newScale});
static_layer.position(newPos);
this._bg.width(this._stage.width() / newScale);
this._bg.height(this._stage.height() / newScale);
this._bg.setAbsolutePosition({x: 0, y: 0});
static_layer.batchDraw();
}

private registerListeners() {
window.addEventListener('resize', () => this.resizeStage());
}
Expand All @@ -159,6 +164,10 @@ export default class ConfigStage {
this._stage.height(containerHeight);
}

public reset_view(): void {
this.setNewPosAndScale(this._konva.static_layer, {x: 0, y: 0}, 1);
}

set_model(model: EVConfigModel) {
if (this._model) {
// FIXME (aw): what to do here, cleanup?
Expand Down
Loading