digilib: client/digitallibrary/greyskin/dllib.js comparison

comparison client/digitallibrary/greyskin/dllib.js @ 451:6b9f375f5073

ongoing experimental intermediary release - calibration and scale modes are working

author	robcast
date	Mon, 30 Jan 2006 16:02:04 +0100
parents	ff63f8ce2039
children	1952462027b6

comparison

equal deleted inserted replaced

-:23195b070d30
+:6b9f375f5073
 this.scalerDiv = null;
 this.scalerImg = null;
 this.buttons1Div = null;
 this.buttons2Div = null;
 /* parse parameters */
+this.params = new DLParameters();
 // put the query parameters (sans "?") in the parameters array
-this.params = new DLParameters();
 this.params.parse(location.search.slice(1));
 // treat special parameters
 this.area = this.parseArea();
 this.marks = new Marks();
 this.marks.parse(this.params.get("mk"));
 Digilib.prototype.parseTrafo = function(elem) {
 // returns Transform from current dlArea and picsize
 var picsize = getElementRect(elem);
 var trafo = new Transform();
 // subtract area offset and size
-trafo.concat(getTranslation(new Position(-this.area.x, -this.area.y)));
+trafo.concat(trafo.getTranslation(new Position(-this.area.x, -this.area.y)));
-trafo.concat(getScale(new Size(1/this.area.width, 1/this.area.height)));
+trafo.concat(trafo.getScale(new Size(1/this.area.width, 1/this.area.height)));
 // scale to screen size
-trafo.concat(getScale(picsize));
+trafo.concat(trafo.getScale(picsize));
-trafo.concat(getTranslation(picsize));
+trafo.concat(trafo.getTranslation(picsize));
 // FIX ME: Robert, kannst Du mal nachsehen, ob das folgende tut, was es soll?
 // oder gibt es dafuer neuen Code? -- ROC: Bisher funktioniert es nicht!
 // rotate
 //var rot = getRotation(- dl.params.get("rot"), new Position(0.5*picsize.width, 0.5*picsize.height));
 //trafo.concat(rot);
 	    digilib.trafo = digilib.parseTrafo(digilib.scalerImg);
 	    // display marks
 	    digilib.renderMarks();
 		digilib.showBirdDiv(isBirdDivVisible);
 		digilib.showArrows();		// show arrow overlays for zoom navigation
-		digilib.moveCenter(true);	// click to move point to center
+		//digilib.moveCenter(true);	// click to move point to center
 		// new Slider("sizes", 1, 5, 2);
 	    focus();
 	}
 }
 Digilib.prototype.renderMarks = function() {
 	}
 }
 Digilib.prototype.isFullArea = function(area) {
 if (!area) area = this.area;
-// pixel by pixel is not always full area
+return (area.width == 1.0) && (area.height == 1.0);
-return (area.width == 1.0) && (area.height == 1.0) && ! this.flags.get("clip");
 }
 Digilib.prototype.canMove = function(movx, movy) {
 if (this.isFullArea()) return false;
 var x2 = this.area.x + this.area.width;
 showElement(overlay, false);
 return;
 };
 var birdImgRect = getElementRect(birdImg);
 var area = this.area;
-// scale area down to img size
+if (this.flags.get("osize") || this.flags.get("clip")) {
-var birdAreaRect = new Rectangle(
+		// in original-size and pixel-by-pixel mode the area size is not valid
-// what about borders ??
+		var birdAreaRect = new Rectangle(
-birdImgRect.x + birdImgRect.width  * area.x,
+		birdImgRect.x + birdImgRect.width  * area.x,
-birdImgRect.y + birdImgRect.height * area.y,
+		birdImgRect.y + birdImgRect.height * area.y,
-birdImgRect.width  * area.width,
+		5,
-birdImgRect.height * area.height
+		5);
-);
+} else {
+		// scale area down to img size
+		var birdAreaRect = new Rectangle(
+		// what about borders ??
+		birdImgRect.x + birdImgRect.width  * area.x,
+	        birdImgRect.y + birdImgRect.height * area.y,
+	        birdImgRect.width  * area.width,
+	        birdImgRect.height * area.height);
+	}
 moveElement(birdArea, birdAreaRect);
 showElement(birdArea, true);
 moveElement(overlay, birdImgRect);
 showElement(overlay, true);
 registerEvent("mousedown", overlay, birdAreaStartDrag);
 new Rectangle(r.x + r.width - this.ARROW_WIDTH, r.y, this.ARROW_WIDTH, r.height),
 this.canMove(1, 0)
 );
 	}
-Digilib.prototype.calibrate = function(direction) {
+Digilib.prototype.calibrate = function() {
-// calibrate screen
+// calibrate screen resolution
-var startPos; // anchor for dragging
-var newRect;  // position after drag
 var calDiv = getElement("calibration");
-var pixel = calDiv.getElementsByTagName("p")[0];
+var calRect = getElementRect(calDiv);
-var overlay = getElement("overlay");
-moveElement(overlay, getWinRect());
-showElement(overlay, true);
-var xDir = direction == "x";
 moveCenter(false);
-registerEvent("mousedown", document, calibrationStartDrag);
+var wins = getWinSize();
+calRect.setCenter(new Position(wins.width / 2, wins.height / 2));
-function calibrationStartDrag(evt) {
+moveElement(calDiv, calRect);
-// mousedown handler: start drag
+showElement(calDiv, true);
-startPos = evtPosition(evt);
+var cm = window.prompt("The length of the scale on your screen in centimeter:");
-unregisterEvent("mousedown", document, calibrationStartDrag);
+if (cm) {
-registerEvent("mousemove", document, calibrationMove);
+		var dpi = calRect.width / parseFloat(cm) * 2.54;
-registerEvent("mouseup",   document, calibrationEndDrag);
+		this.params.set("ddpi", cropFloat(dpi));
-newRect = new Rectangle(
+	}
-startPos.x,
+	showElement(calDiv, false);
-startPos.y,
+}
-xDir ? 1 : CALIBRATION_WIDTH,
-xDir ? CALIBRATION_WIDTH : 1
-);
+Digilib.prototype.setScale = function(scale) {
-moveElement(calDiv, newRect);
+	// sets original-size, pixel-by-pixel or fit-to-screen scale type
-showElement(calDiv, true);
+	if (scale == "pixel") {
-// debugProps(getElementRect(bird))
+		// pixel by pixel
-return stopEvent(evt);
+		this.flags.set("clip");
-}
+		this.flags.reset("osize");
+		this.flags.reset("fit");
-function calibrationMove(evt) {
+	} else if (scale == "original") {
-// mousemove handler: drag
+		// original size -- needs calibrated screen
-var pos = evtPosition(evt);
+if (!this.params.isSet("ddpi")) {
-var dx = (xDir) ? pos.x - startPos.x : CALIBRATION_WIDTH;
+		var dpi = cookie.get("ddpi");
-var dy = (xDir) ? CALIBRATION_WIDTH : pos.y - startPos.y;
+	        if (dpi == null) {
-// move birdArea div, keeping size
+		        alert("Your screen has not yet been calibrated - using default value of 72 dpi");
-newRect = new Rectangle(startPos.x, startPos.y, dx, dy);
+		dpi = 72;
-pixel.innerHTML = (xDir ? dx : dy) + " px";
+	}
-moveElement(calDiv, newRect);
+		this.params.set("ddpi", dpi);
-showElement(calDiv, true);
+	}
-return stopEvent(evt);
-}
-function calibrationEndDrag(evt) {
-// mouseup handler: calibrate
-unregisterEvent("mousemove", document, calibrationMove);
-unregisterEvent("mouseup",   document, calibrationEndDrag);
-if (xDir) {
-var val = newRect.width * 0.254; // ratio dm/inch
-cookie.add("ddpi", val);
-cookie.add("ddpix", val);
-} else {
-var val = newRect.height * 0.254;
-cookie.add("ddpiy", val);
-}
-showElement(calDiv, false);
-showElement(overlay, false);
-moveCenter(true);
-return stopEvent(evt);
-}
-}
-Digilib.prototype.originalSize = function(on) {
-// set osize flag, needs calibrated screen
-if (on) {
-var dpi = cookie.get("ddpi");
-if (dpi == null) {
-alert("Screen has not yet been calibrated - using default value of 72 dpi");
-dpi = 72;
-}
-this.params.set("ddpi", dpi);
 this.flags.set("osize");
-this.display();
+this.flags.reset("clip");
+		this.flags.reset("fit");
 } else {
+		// scale to screen size (default)
+		this.flags.reset("clip");
 		this.flags.reset("osize");
 	}
-}
+this.display();
+}
-Digilib.prototype.pixelByPixel = function(on) {
-// sets clip flag
+Digilib.prototype.getScale = function() {
-if (on) {
+	// returns scale type
-this.flags.set("clip");
+	if (this.flags.get("clip")) {
-this.display();
+		return "pixel";
-}
+	} else if (this.flags.get("osize")) {
-else this.flags.reset("clip");
+		return "original";
-}
+	} else {
+		return "fit";
+	}
+}
 Digilib.prototype.pageWidth = function() {
 	this.zoomFullpage('width');
 }
-Digilib.prototype.resize = function(factor) {
+Digilib.prototype.setSize = function(factor) {
 this.params.set("ws", factor);
-this.showSizeMenu(false);
 this.display();
 }
-Digilib.prototype.showSizeMenu = function(show) {
+Digilib.prototype.showMenu = function(menuId, buttonId, show) {
-var menu = getElement("sizes");
+var menu = getElement(menuId);
 if (show) {
-// align menu with button
+// align right side of menu with button
-var buttonPos = getElementPosition(getElement("size"));
+var buttonPos = getElementPosition(getElement(buttonId));
-moveElement(menu, new Position(buttonPos.x - 50, buttonPos.y));
+var menusize = getElementSize(menu);
+moveElement(menu, new Position(buttonPos.x - menusize.width - 3, buttonPos.y));
 }
 showElement(menu, show);
 }
 function display(detail, moDetail) {dl.display(detail, moDetail)};
 function setMark(reload) {dl.setMark(reload)};
 function removeMark(reload) {dl.removeMark(reload)};
 function zoomArea() {dl.zoomArea()};
 function zoomBy(factor) {dl.zoomBy(factor)};
-function zoomFullpage() {dl.zoomFullpage()};
+function zoomFullpage(a) {dl.zoomFullpage(a)};
 function moveCenter(on) {dl.moveCenter(on)};
 function isFullArea(area) {dl.isFullArea(area)};
 function canMove(movx, movy) {dl.canMove(movx, movy)};
 function moveBy(movx, movy) {dl.moveBy(movx, movy)};
 function getRef(baseURL) {dl.getRef(baseURL)};
 function setParamWin(param, text, relative) {dl.setParamWin(param, text, relative)};
 function showOptions(show) {dl.showOptions(show)};
 function showBirdDiv(show) {dl.showBirdDiv(show)};
 function showAboutDiv(show) {dl.showAboutDiv(show)};
 function calibrate(direction) {dl.calibrate(direction)};
+function setScale(a) {dl.setScale(a)};
+function getScale(a) {dl.getScale(a)};
 function originalSize(on) {dl.originalSize(on)};
 function pixelByPixel(on) {dl.pixelByPixel(on)};
 function pageWidth() {dl.pageWidth()};
-function resize(factor) {dl.resize(factor)};
+function setSize(factor) {dl.setSize(factor)};
-function showSizeMenu(show) {dl.showSizeMenu(show)};
+function showMenu(a,b,c) {dl.showMenu(a,b,c)};
 // :tabSize=4:indentSize=4:noTabs=true: