StewKI/AIPS
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #43 from StewKI/hotfix-recent-bugs

Browse Source 
Fixing recent bugs
This commit is contained in:
Andrija Stevanović
2026-02-21 18:43:16 +01:00
committed by GitHub
parent 7030e76c03 ff7c0d58a7
commit 94ec4e7135
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dotnet/AipsRT/Model/Whiteboard/Shapes/Arrow.cs
View File

@@ -10,7 +10,7 @@ public class Arrow : Shape
public override void Move(Position newPosition) public override void Move(Position newPosition)
{ {
var difference = newPosition - EndPosition; var difference = newPosition - Position;
EndPosition += difference; EndPosition += difference;
base.Move(newPosition); base.Move(newPosition);
} }

2
dotnet/AipsRT/Model/Whiteboard/Shapes/Line.cs
View File

@@ -10,7 +10,7 @@ public class Line : Shape
public override void Move(Position newPosition) public override void Move(Position newPosition)
{ {
var difference = newPosition - EndPosition; var difference = newPosition - Position;
EndPosition += difference; EndPosition += difference;
base.Move(newPosition); base.Move(newPosition);
} }

46
front/src/components/whiteboard/shapes/SvgTextShape.vue
View File

@@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, watch, onMounted, nextTick } from 'vue' import { ref, computed, watch, onMounted, nextTick } from 'vue'
import type { TextShape } from '@/types/whiteboard.ts' import type { TextShape } from '@/types/whiteboard.ts'
const props = withDefaults(defineProps<{ textShape: TextShape; isSelected?: boolean }>(), { const props = withDefaults(defineProps<{ textShape: TextShape; isSelected?: boolean }>(), {
@@ -7,19 +7,31 @@ const props = withDefaults(defineProps<{ textShape: TextShape; isSelected?: bool
}) })
const textEl = ref<SVGTextElement>() const textEl = ref<SVGTextElement>()
const bbox = ref<{ x: number; y: number; width: number; height: number } | null>(null) const textMetrics = ref<{ width: number; height: number; offsetX: number; offsetY: number } | null>(null)
function updateBBox() { function measureText() {
if (textEl.value) { if (textEl.value) {
const b = textEl.value.getBBox() const b = textEl.value.getBBox()
bbox.value = { x: b.x, y: b.y, width: b.width, height: b.height } textMetrics.value = {
width: b.width,
height: b.height,
offsetX: b.x - props.textShape.position.x,
offsetY: b.y - props.textShape.position.y,
}
} }
} }
onMounted(updateBBox) onMounted(measureText)
watch(() => props.isSelected, (val) => { watch(
if (val) nextTick(updateBBox) () => [props.textShape.textValue, props.textShape.textSize],
}, { flush: 'post' }) () => { nextTick(measureText) },
{ flush: 'post' },
)
const outlineX = computed(() => props.textShape.position.x + (textMetrics.value?.offsetX ?? 0) - 4)
const outlineY = computed(() => props.textShape.position.y + (textMetrics.value?.offsetY ?? 0) - 4)
const outlineW = computed(() => (textMetrics.value?.width ?? 0) + 8)
const outlineH = computed(() => (textMetrics.value?.height ?? 0) + 8)
</script> </script>
<template> <template>
@@ -35,21 +47,21 @@ watch(() => props.isSelected, (val) => {
> >
{{ props.textShape.textValue }} {{ props.textShape.textValue }}
</text> </text>
<template v-if="isSelected && bbox"> <template v-if="isSelected && textMetrics">
<rect <rect
:x="bbox.x - 4" :x="outlineX"
:y="bbox.y - 4" :y="outlineY"
:width="bbox.width + 8" :width="outlineW"
:height="bbox.height + 8" :height="outlineH"
stroke="#4f9dff" stroke="#4f9dff"
stroke-width="1" stroke-width="1"
stroke-dasharray="4 2" stroke-dasharray="4 2"
fill="none" fill="none"
/> />
<circle :cx="bbox.x - 4" :cy="bbox.y - 4" r="4" fill="white" stroke="#4f9dff" stroke-width="1.5" /> <circle :cx="outlineX" :cy="outlineY" r="4" fill="white" stroke="#4f9dff" stroke-width="1.5" />
<circle :cx="bbox.x + bbox.width + 4" :cy="bbox.y - 4" r="4" fill="white" stroke="#4f9dff" stroke-width="1.5" /> <circle :cx="outlineX + outlineW" :cy="outlineY" r="4" fill="white" stroke="#4f9dff" stroke-width="1.5" />
<circle :cx="bbox.x - 4" :cy="bbox.y + bbox.height + 4" r="4" fill="white" stroke="#4f9dff" stroke-width="1.5" /> <circle :cx="outlineX" :cy="outlineY + outlineH" r="4" fill="white" stroke="#4f9dff" stroke-width="1.5" />
<circle :cx="bbox.x + bbox.width + 4" :cy="bbox.y + bbox.height + 4" r="4" fill="white" stroke="#4f9dff" stroke-width="1.5" /> <circle :cx="outlineX + outlineW" :cy="outlineY + outlineH" r="4" fill="white" stroke="#4f9dff" stroke-width="1.5" />
</template> </template>
</g> </g>
</template> </template>