jgeorgi/GlModelViewer
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Annotation sequence in editor skips unused in set

Browse Source 
Signed-off-by: Justin Georgi <justin.georgi@gmail.com>
This commit is contained in:
Justin Georgi
2025-05-05 21:28:11 -07:00
parent 846106a1a8
commit 8294edc1d1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/glmv-mvconfig.js
View File

@@ -42,7 +42,7 @@ readMvconfig = function() {
let mvconfig let mvconfig
let slotNum = 1 let slotNum = 1
createHotspot = function(hsLabel, hsSlot, hsTag) { createHotspot = function(hsLabel, hsSlot, hsTag, hsSkip) {
let newHs = document.createElement('button') let newHs = document.createElement('button')
newHs.classList.add('Hotspot') newHs.classList.add('Hotspot')
newHs.setAttribute('slot',`hotspot-${hsSlot}`) newHs.setAttribute('slot',`hotspot-${hsSlot}`)
@@ -50,6 +50,7 @@ readMvconfig = function() {
newHs.setAttribute('onclick', 'onAnnotation(event)') newHs.setAttribute('onclick', 'onAnnotation(event)')
newHs.setAttribute('onmousedown', 'grabAnnotation(event)') newHs.setAttribute('onmousedown', 'grabAnnotation(event)')
newHs.setAttribute('onmouseup', 'releaseAnnotation(event)') newHs.setAttribute('onmouseup', 'releaseAnnotation(event)')
newHs.toggleAttribute('seq-skip', !!hsSkip)
Object.keys(mvconfig.annotations[hsLabel]).forEach((prop) => { Object.keys(mvconfig.annotations[hsLabel]).forEach((prop) => {
newHs.setAttribute(prop, mvconfig.annotations[hsLabel][prop]) newHs.setAttribute(prop, mvconfig.annotations[hsLabel][prop])
}) })
@@ -81,7 +82,7 @@ readMvconfig = function() {
return return
} }
let label = (currentSet != 'default' && mvconfig.annotationSets[currentSet]) ? '-' : null let label = (currentSet != 'default' && mvconfig.annotationSets[currentSet]) ? '-' : null
createHotspot(hs, slotNum, label) createHotspot(hs, slotNum, label, true)
slotNum += 1 slotNum += 1
}) })

4
modules/glmv.js
View File

@@ -72,7 +72,7 @@ selectAnnotation = function(mView, annotId) {
*/ */
nextAnnotation = function(mView) { nextAnnotation = function(mView) {
let incrAnnotation = 0 let incrAnnotation = 0
const numSpots = [...mView.querySelectorAll('Button')].length const numSpots = [...mView.querySelectorAll('Button:not([seq-skip])')].length
const currentAnnotation = mView.querySelectorAll('Button:has(.HotspotAnnotation:not(.HiddenAnnotation))')[0] const currentAnnotation = mView.querySelectorAll('Button:has(.HotspotAnnotation:not(.HiddenAnnotation))')[0]
if (!currentAnnotation) { if (!currentAnnotation) {
incrAnnotation = 1 incrAnnotation = 1
@@ -95,7 +95,7 @@ nextAnnotation = function(mView) {
*/ */
prevAnnotation = function(mView) { prevAnnotation = function(mView) {
let decrAnnotation = 0 let decrAnnotation = 0
const numSpots = [...mView.querySelectorAll('Button')].length const numSpots = [...mView.querySelectorAll('Button:not([seq-skip])')].length
const currentAnnotation = mView.querySelectorAll('Button:has(.HotspotAnnotation:not(.HiddenAnnotation))')[0] const currentAnnotation = mView.querySelectorAll('Button:has(.HotspotAnnotation:not(.HiddenAnnotation))')[0]
if (!currentAnnotation) { if (!currentAnnotation) {
decrAnnotation = numSpots decrAnnotation = numSpots