Mercurial > hg > digilib

changeset 1306:927a3ebf9d6e rc_create_polys

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
annotator uses its own vector layer now. Task-Url: https://it-dev.mpiwg-berlin.mpg.de/tracs/digilib/ticket/41
author robcast
date Wed, 21 Jan 2015 18:11:23 +0100
parents 7abdb38fa0fc
children 75db880828a1
files webapp/src/main/webapp/jquery/jquery.digilib.annotator.js webapp/src/main/webapp/jquery/jquery.digilib.vector.js
diffstat 2 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Wed Jan 21 17:58:17 2015 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Wed Jan 21 18:11:23 2015 +0100
@@ -39,6 +39,8 @@
     var digilib = null;
     // the functions made available by digilib
     var fn = {};
+    // annotation shape layer
+    var annotationLayer = null;
 
     var buttons = {
         annotations : {
@@ -372,7 +374,7 @@
                         'style' : 'pointer-events:all'
                 	}
         	};
-        	digilib.actions.addShape(data, vecShape);
+        	digilib.actions.addShape(data, vecShape, annotationLayer);
         	$annotation = vecShape.$elem;
             screenRect = data.imgTrafo.transform(clippedArea);
         } else if (type === 'point') {
@@ -393,7 +395,7 @@
                         'style' : 'pointer-events:all'
                 	}
         	};
-        	digilib.actions.addShape(data, vecShape);
+        	digilib.actions.addShape(data, vecShape, annotationLayer);
         	$annotation = vecShape.$elem;
         }
         // save annotation in data for Annotator
@@ -656,6 +658,13 @@
             // get annotation user from cookie
             settings.annotationUser = data.dlOpts.annotationUser;
         }
+        // create annotation shapes layer
+        annotationLayer = {
+            'projection': 'screen', 
+            'renderFn': fn.vectorDefaultRenderFn,
+            'shapes': []
+        };
+        digilib.actions.addVectorLayer(data, annotationLayer);
         // install event handler
         $data.bind('setup', handleSetup);
         $data.bind('update', handleUpdate);
--- a/webapp/src/main/webapp/jquery/jquery.digilib.vector.js	Wed Jan 21 17:58:17 2015 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.vector.js	Wed Jan 21 18:11:23 2015 +0100
@@ -179,10 +179,10 @@
                 // set defaults for HTML element
                 $elem.css({'position':'absolute', 'z-index': 9, 'pointer-events':'none'});
                 $elem.addClass(data.settings.cssPrefix+'overlay');
-                // add layer
-                data.vectorLayers.push(layer);
-                renderLayers(data);
             }
+            // add layer
+            data.vectorLayers.push(layer);
+            renderLayers(data);
         }
     };