digilib-old: client/digitallibrary/jquery/jquery.digilib.js comparison

comparison client/digitallibrary/jquery/jquery.digilib.js @ 813:1a7b14deae3a jquery

regions plugin works, inclunding event handlers

author	hertzhaft
date	Mon, 21 Feb 2011 01:03:55 +0100
parents	1b1728926534
children	40591c00ef41

comparison

equal deleted inserted replaced

-:b484631f37c1
+:1a7b14deae3a
 settings.mk = '';
 for (var i = 0; i < data.marks.length; i++) {
 if (i) {
 settings.mk += ',';
 }
-settings.mk += cropFloat(data.marks[i].x).toString() +
+settings.mk +=
-'/' + cropFloat(data.marks[i].y).toString();
+cropFloatStr(data.marks[i].x) + '/' +
+cropFloatStr(data.marks[i].y);
 }
 }
 // Scaler flags
 if (data.scalerFlags) {
 var mo = '';
 // handler for imageInfo loaded event
 var handleImageInfo = function (evt, json) {
 var data = this;
 updateDisplay(data);
 };
 // place marks on the image
 var renderMarks = function (data) {
 if (data.$img == null || data.imgTrafo == null) return;
 console.debug("rendermarks img=",data.$img," imgtrafo=",data.imgTrafo);
 var $elem = data.$elem;
 var mark = marks[i];
 if (data.zoomArea.containsPosition(mark)) {
 var mpos = data.imgTrafo.transform(mark);
 console.debug("renderMarks: mpos=",mpos);
 // create mark
-var html = '<div class="mark">'+(i+1)+'</div>';
+var html = '<div class="mark overlay">'+(i+1)+'</div>';
 var $mark = $(html);
+$mark.attr("id", "dibilib.mark." + i);
 $elem.append($mark);
 mpos.adjustDiv($mark);
 }
 }
 };
 // set zoom background
 var setZoomBG = function(data) {
 var $scaler = data.$scaler;
 var $img = data.$img;
 var fullRect = null;
-// hide marks
-data.$elem.find('div.mark').hide();
 // hide the scaler img, show background of div instead
 $img.css('visibility', 'hidden');
 var scalerCss = {
 'background-image' : 'url(' + $img.attr('src') + ')',
 'background-repeat' : 'no-repeat',
 var $scaler = data.$scaler;
 var $img = data.$img;
 // drag the image and load a new detail on mouse up
 var dragStart = function (evt) {
-console.debug("dragstart at=",evt);
+console.debug("dragstart at=", evt);
 // don't start dragging if not zoomed
 if (isFullArea(data.zoomArea)) return false;
+$elem.find(".overlay").hide(); // hide all overlays (marks/regions)
 startPos = geom.position(evt);
 delta = null;
 // set low res background immediately on mousedown
 fullRect = setZoomBG(data);
 $document.bind("mousemove.dlZoomDrag", dragMove);
 // no movement
 $img.css('visibility', 'visible');
 $scaler.css({'opacity' : '1', 'background-image' : 'none'});
 // unhide marks
 data.$elem.find('div.mark').show();
+$(data).trigger('redisplay');
 return false;
 }
 // get old zoom area (screen coordinates)
 var za = geom.rectangle($img);
 // move
 };
 // auxiliary function to crop senseless precision
 var cropFloat = function (x) {
 return parseInt(10000 * x, 10) / 10000;
+};
+// idem, string version
+var cropFloatStr = function (x) {
+return cropFloat(x).toString();
 };
 // fallback for console.log calls
 if (customConsole) {
 var logFunction = function(type) {
 getQuality : getQuality,
 setQuality : setQuality,
 getScaleMode : getScaleMode,
 setScaleMode : setScaleMode,
 isFullArea : isFullArea,
-getBorderWidth : getBorderWidth
+isNumber : isNumber,
+getBorderWidth : getBorderWidth,
+cropFloat : cropFloat,
+cropFloatStr : cropFloatStr
 };
 // hook digilib plugin into jquery
 $.fn.digilib = function (action) {
 // plugin extension mechanism, called when the plugins' code is read