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

comparison client/digitallibrary/jquery/jquery.digilib.js @ 772:33b5477f8d84 jquery

original size mode works with zoom area now. needs error handling.

author	robcast
date	Thu, 10 Feb 2011 23:38:03 +0100
parents	7e9851ef03d7
children	34bba748004d

comparison

equal deleted inserted replaced

-:4b686a0d44f7
+:33b5477f8d84
 'rgba' : '0/0/0',
 'ddpi' : null,
 'ddpix' : null,
 'ddpiy' : null,
 // list of digilib parameters
-'digilibParamNames' : ['fn','pn','ww','wh','wx','wy','ws','mo','rot','cont','brgt','rgbm','rgba','mk','clop'],
+'digilibParamNames' : ['fn','pn','ww','wh','wx','wy','ws','mo','rot','cont','brgt','rgbm','rgba','ddpi','mk','clop'],
 // digilib parameter defaults
 'mk' : '',
 'clop' : '',
 // mode of operation:
 // fullscreen = take parameters from page URL, keep state in page URL
 redisplay(data);
 }
 },
 // calibrate (only faking)
-calibrate : function (data) {
+calibrate : function (data, res) {
-loadImageInfo(data);
+var oldRes = data.settings.ddpi;
+if (res == null) {
+res = window.prompt("Display resolution (dpi)", oldRes);
+}
+if (res != null) {
+data.settings.ddpi = res;
+redisplay(data);
+}
 },
 // set image scale mode
 setScaleMode : function (data, mode) {
 var oldM = getScaleMode(data);
 highlight('quality', flags.q1 || flags.q2);
 highlight('zoomin', ! isFullArea(data.zoomArea));
 };
 // create Transform from area and $img
-var getImgTrafo = function ($img, area, rot, hmir, vmir, mode, imgInfo) {
+var getImgTrafo = function ($img, area, rot, hmir, vmir, mode, data) {
 var picrect = geom.rectangle($img);
 if (mode != null) {
+var imgInfo = data.imgInfo;
 if (mode === 'pixel') {
 // scaler mo=clip - image area size does not come from ww, wh
 if (imgInfo != null) {
 area.width = picrect.width / imgInfo.width;
 area.height = picrect.height / imgInfo.height;
 } else {
 console.error("No image info for pixel mode!");
+}
+}
+if (mode === 'size') {
+// scaler mo=osize - image area size does not come from ww, wh
+if (imgInfo != null) {
+var ddpi = parseFloat(data.settings.ddpi);
+area.width = (picrect.width / ddpi) / (imgInfo.width / imgInfo.dpi_x);
+area.height = (picrect.height / ddpi) / (imgInfo.height / imgInfo.dpi_y);
+} else {
+console.error("No image info for original size mode!");
 }
 }
 }
 var trafo = geom.transform();
 // move zoom area offset to center
 var $img = data.$img;
 if ($img != null && $img.get(0).complete) {
 // create Transform from current zoomArea and image size
 data.imgTrafo = getImgTrafo($img, data.zoomArea,
 data.settings.rot, data.scalerFlags.hmir, data.scalerFlags.vmir,
-data.scaleMode, data.imgInfo);
+data.scaleMode, data);
 // console.debug("imgTrafo=", data.imgTrafo);
 }
 };
 // returns function for load event of scaler img
 }
 };
 // show zoom area indicator on bird's eye view
 var renderBirdArea = function (data) {
-if (data.$birdImg == null) return;
+if (data.$birdImg == null || ! data.$birdImg.get(0).complete) return;
 var $birdZoom = data.$birdZoom;
 var zoomArea = data.zoomArea;
 var normalSize = isFullArea(zoomArea);
 if (normalSize) {
 $birdZoom.hide();