[Editor] Various bug fixes

janishutz · janishutz · commit 57f93b688adf · 2026-03-02T09:15:03.000+01:00
Fixed the following issues
- Double assignments
- Pre Annotation loading
- History undo &amp; redo doesn't unhighlight fixation
- preview algorithm annotations not working
- preview algorithm annotations colours config not applying
-
diff --git a/src/editor/config.ts b/src/editor/config.ts
@@ -24,7 +24,7 @@ export const autoSaveInterval = ref( 60000 );
 export const assignedLineColor = ref( rs.getPropertyValue( '--theme-information-shade' ) );
 
 // TODO: Do we want this setting?
-export const machineAssignedLineColor = ref( rs.getPropertyValue( '--theme-information-shade' ) );
+export const machineAssignedLineColor = ref( rs.getPropertyValue( '--theme-warning-shade' ) );
 
 export const cursorLineColor = ref( rs.getPropertyValue( '--theme-bg-4' ) );
 
@@ -76,8 +76,7 @@ export const selectedFixationRadius = ref( 8 );
 
 export const lineWidth = ref( 3 );
 
-// TODO: Do we want this setting?
-export const machineAssignedLineWidth = ref( 3 );
+export const machineAssignedLineWidth = ref( 1 );
 
 export const indicesFontSize = ref( 14 );
 
diff --git a/src/editor/loaders/backend.ts b/src/editor/loaders/backend.ts
@@ -105,19 +105,21 @@ export const loadEditorDataFromBackend = async ( renderer: Renderer ) => {
         const algos = Object.keys( additionalAnnotationLoad );
 
         algos.forEach( algo => {
-            const details = additionalAnnotationLoad[ algo ]! as AnnotationDto;
+            const details = additionalAnnotationLoad[ algo ]! as AnnotationDto[];
 
-            if ( details.fixation && details.characterBoundingBox ) {
-                const ann: EditorAnnotation = {
-                    'fixationIdx': getFixIdxFromId( details.fixation!.id! ),
-                    'boxIdx': getBoxIdxFromId( details.characterBoundingBox!.id! ),
-                    'algorithm': algo
-                };
+            details.forEach( annotation => {
+                if ( annotation.fixation && annotation.characterBoundingBox ) {
+                    const ann: EditorAnnotation = {
+                        'fixationIdx': getFixIdxFromId( annotation.fixation!.id! ),
+                        'boxIdx': getBoxIdxFromId( annotation.characterBoundingBox!.id! ),
+                        'algorithm': algo
+                    };
 
-                fixations.value[ ann.fixationIdx ]!.assigned = details.annotationType === 'ANNOTATED' ? 'assigned' : 'machine';
+                    fixations.value[ ann.fixationIdx ]!.assigned = annotation.annotationType === 'ANNOTATED' ? 'assigned' : 'machine';
 
-                annotations.value.push( ann );
-            }
+                    annotations.value.push( ann );
+                }
+            } );
         } );
     }
 
diff --git a/src/editor/manager/annotations.ts b/src/editor/manager/annotations.ts
@@ -46,7 +46,7 @@ export const annotationManager = ( renderer: Renderer ): AnnotationManager => {
 
             // Add to history
             if ( !skipHistory )
-                history.add( annotation, fixationIndex );
+                history.add( annotation, fixationIndex, fixations.value[ fixationIndex ]!.assigned );
 
             if ( highlight )
                 highlightBox( boundingBoxIndex, 1000 );
@@ -92,7 +92,7 @@ export const annotationManager = ( renderer: Renderer ): AnnotationManager => {
 
         if ( fixations.value[ fixationId ]!.assigned === 'assigned' ) {
             for ( let i = 0; i < annotations.value.length; i++ ) {
-                if ( annotations.value[ i ]!.fixationIdx === fixationId ) {
+                if ( annotations.value[ i ]!.fixationIdx === fixationId && !annotations.value[ i ]!.algorithm ) {
                     idx = i;
                     break;
                 }
@@ -101,15 +101,19 @@ export const annotationManager = ( renderer: Renderer ): AnnotationManager => {
             if ( idx > -1 ) {
                 const d = annotations.value.splice( idx, 1 );
 
-                fixations.value[ fixationId ]!.assigned = 'unassigned';
+                console.log( 'Removing annotation', d, 'with fix idx', fixationId );
+
 
                 if ( addActionToHistory ) {
-                    history.remove( d[ 0 ]!, selectedFixation.value );
-                    renderer.renderLines.render();
-                    renderer.renderFixations.render();
-                    renderer.renderIndices.render();
+                    history.remove( d[ 0 ]!, selectedFixation.value, fixations.value[ fixationId ]!.assigned );
                 }
 
+                fixations.value[ fixationId ]!.assigned = 'unassigned';
+
+                renderer.renderIndices.render();
+                renderer.renderFixations.render();
+                renderer.renderLines.render();
+
                 highlightBox( d[ 0 ]!.boxIdx, 3000 );
             }
         }
@@ -123,7 +127,7 @@ export const annotationManager = ( renderer: Renderer ): AnnotationManager => {
         let idx = -1;
 
         for ( let i = 0; i < annotations.value.length; i++ ) {
-            if ( annotations.value[ i ]!.boxIdx === boxId ) {
+            if ( annotations.value[ i ]!.boxIdx === boxId && !annotations.value[ i ]!.algorithm ) {
                 idx = i;
                 break;
             }
diff --git a/src/editor/manager/history.ts b/src/editor/manager/history.ts
@@ -53,24 +53,25 @@ const startHistoryTracker = ( renderer: Renderer, annotation: AnnotationManager
         if ( last.action === 'delete' ) annotation.deleteByFixID( last.annotation.fixationIdx );
         else annotation.create( last.annotation.boxIdx, last.annotation.fixationIdx, true, false );
 
-        if ( last.annotation.boxIdx !== undefined ) {
-            fixations.value[ last.annotation.fixationIdx ]!.assigned = 'assigned';
-        } else {
-            fixations.value[ last.annotation.fixationIdx ]!.assigned = 'unassigned';
-        }
+        fixations.value[ last.annotation.fixationIdx ]!.assigned = last.fixationState;
 
         renderer.renderLines.render();
         renderer.renderFixations.render();
     };
 
-    const add = ( annotation: EditorAnnotation, selectedFixation: number ) => {
+    const add = (
+        annotation: EditorAnnotation,
+        selectedFixation: number,
+        oldState: 'assigned' | 'unassigned' | 'machine' | 'invalid'
+    ) => {
         revision.value++;
 
         undoHistory.value.push( {
             'annotation': {
                 ...annotation
             },
             'selectedFixation': selectedFixation,
+            'fixationState': oldState,
             'action': 'add'
         } );
         clearRedo();
@@ -81,14 +82,19 @@ const startHistoryTracker = ( renderer: Renderer, annotation: AnnotationManager
      * @param annotation - The annotation that was removed
      * @param selectedFixation - The fixation that was selected
      */
-    const remove = ( annotation: EditorAnnotation, selectedFixation: number ) => {
+    const remove = (
+        annotation: EditorAnnotation,
+        selectedFixation: number,
+        oldState: 'assigned' | 'unassigned' | 'machine' | 'invalid'
+    ) => {
         revision.value++;
 
         undoHistory.value.push( {
             'annotation': {
                 ...annotation
             },
             'selectedFixation': selectedFixation,
+            'fixationState': oldState,
             'action': 'delete'
         } );
         clearRedo();
@@ -106,13 +112,9 @@ const startHistoryTracker = ( renderer: Renderer, annotation: AnnotationManager
         if ( last.action === 'add' ) annotation.deleteByFixID( last.annotation.fixationIdx );
         else annotation.create( last.annotation.boxIdx, last.annotation.fixationIdx, true, false );
 
-        if ( last.annotation.boxIdx !== undefined ) {
-            fixations.value[ last.annotation.fixationIdx ]!.assigned = 'assigned';
-        } else {
-            fixations.value[ last.annotation.fixationIdx ]!.assigned = 'unassigned';
-        }
+        fixations.value[ last.annotation.fixationIdx ]!.assigned = last.fixationState;
 
-        selectedFixation.value = last.selectedFixation + 1;
+        selectedFixation.value = last.selectedFixation;
 
         renderer.renderLines.render();
         renderer.renderFixations.render();
diff --git a/src/editor/render/lines.ts b/src/editor/render/lines.ts
@@ -16,6 +16,8 @@ import {
     assignedLineColor,
     lineWidth,
     linesDisplay,
+    machineAssignedLineColor,
+    machineAssignedLineWidth,
     numberOfLinesToRenderInSurroundingMode
 } from '../config';
 import {
@@ -55,10 +57,12 @@ export const linesRenderer = ( linesCanvas: Ref<HTMLCanvasElement | null> ) => {
                     filterAlgorithms( l, surroundingDrawer );
                 } );
         } else if ( linesDisplay.value === 'allalgos' ) {
-            // TODO: Do we want more settings here? (like )
+            ctx.lineWidth = scale( machineAssignedLineWidth.value );
+            ctx.strokeStyle = machineAssignedLineColor.value;
+
             if ( selectedFixation.value >= 0 )
                 annotations.value.forEach( l => {
-                    if ( l.fixationIdx === selectedFixation.value )
+                    if ( l.fixationIdx === selectedFixation.value && l.algorithm )
                         drawLine( l );
                 } );
         }
@@ -69,7 +73,10 @@ export const linesRenderer = ( linesCanvas: Ref<HTMLCanvasElement | null> ) => {
 
         if ( assignType === 'invalid' ) return;
 
-        if ( assignType === 'assigned' ) drawFunc( l );
+        if ( assignType === 'assigned' ) {
+            if ( !l.algorithm )
+                drawFunc( l );
+        }
 
 
         if ( !l.algorithm ) {
diff --git a/src/editor/types/history.d.ts b/src/editor/types/history.d.ts
@@ -6,6 +6,7 @@ export interface HistoryEntry {
     'annotation': EditorAnnotation;
     'selectedFixation': number;
     'action': 'add' | 'delete';
+    'fixationState': 'assigned' | 'unassigned' | 'machine' | 'invalid';
 }
 
 export interface AnnotationManager {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ export interface HistoryEntry {`
`6`	`6`	`'annotation': EditorAnnotation;`
`7`	`7`	`'selectedFixation': number;`
`8`	`8`	`'action': 'add' \| 'delete';`
	`9`	`+ 'fixationState': 'assigned' \| 'unassigned' \| 'machine' \| 'invalid';`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`export interface AnnotationManager {`