Mercurial > hg > digilib
changeset 1256:677277d77cca
basic measuring tool now complete
| author | hertzhaft |
|---|---|
| date | Fri, 17 Jan 2014 17:43:20 +0100 |
| parents | 021ebb62fd10 |
| children | 4f8f960a4bea |
| files | webapp/src/main/webapp/jquery/jquery.digilib.measure.css webapp/src/main/webapp/jquery/jquery.digilib.measure.js |
| diffstat | 2 files changed, 482 insertions(+), 402 deletions(-) [+] |
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.measure.css Fri Jan 17 17:38:24 2014 +0100 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.measure.css Fri Jan 17 17:43:20 2014 +0100 @@ -13,6 +13,35 @@ z-index: 20; } +span.dl-measure-label { + padding: 0px 5px; + } + +span.dl-measure-number { + color: lightgreen; + background-color: #606060; + padding: 2px; + font-weight: bold; + } + +input#measure-val2, select#measure-shape, select#measure-unit1, select#measure-unit2 { + color: lightgreen; + background-color: #606060; + } + +select#measure-shape:focus { + color: black; + background-color: white; + } + +option:disabled { + color: black; +} + +button.dl-drawing { + background-color: lightgreen; +} + option.dl-units { margin-left: 10px; }
--- a/webapp/src/main/webapp/jquery/jquery.digilib.measure.js Fri Jan 17 17:38:24 2014 +0100 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.measure.js Fri Jan 17 17:43:20 2014 +0100 @@ -38,7 +38,7 @@ var fn = { // dummy function to avoid errors, gets overwritten by buttons plugin highlightButtons : function () { - console.debug('svg: dummy function - highlightButtons'); + console.debug('measure: dummy function - highlightButtons'); } }; // affine geometry plugin @@ -47,632 +47,632 @@ var CSS = ''; var UNITS = { - "comment" : [ + comment : [ "Angaben nach:", "Klimpert, Richard: Lexikon der Münzen, Maße, Gewichte, Zählarten und Zeitgrößen aller Länder der Erde 2) Berlin 1896 (Reprint Graz 1972)", "Doursther, Horace: Dictionnaire universel des poids et mesures anciens et modernes. Paris 1840 (Reprint Amsterdam 1965)" ], - "sections" : [{ - "name" : "Längenmaße: metrisch", - "group" : "1", - "units" : [{ - "name" : "m", - "factor" : "1" + sections : [{ + name : "Längenmaße: metrisch", + group : "1", + units : [{ + name : "m", + factor : "1" }, { - "name" : "mm", - "factor" : "0.001" + name : "mm", + factor : "0.001" }, { - "name" : "cm", - "factor" : "0.01" + name : "cm", + factor : "0.01" }, { - "name" : "dm", - "factor" : "0.1" + name : "dm", + factor : "0.1" }, { - "name" : "km", - "factor" : "1000" + name : "km", + factor : "1000" }] }, { - "name" : "Längenmaße: nautisch", - "group" : "1", - "units" : [{ - "name" : "geographische Meile", - "factor" : "7420" + name : "Längenmaße: nautisch", + group : "1", + units : [{ + name : "geographische Meile", + factor : "7420" }, { - "name" : "Seemeile", - "factor" : "1854.965" + name : "Seemeile", + factor : "1854.965" }, { - "name" : "fathom", - "factor" : "1.828782" + name : "fathom", + factor : "1.828782" }, { - "name" : "cable", - "factor" : "182.8782" + name : "cable", + factor : "182.8782" }, { - "name" : "league", - "factor" : "5564.895" + name : "league", + factor : "5564.895" }] }, { - "name" : "Längenmaße: England", - "group" : "1", - "units" : [{ - "name" : "foot", - "factor" : "0.304797", - "subunits" : "12" + name : "Längenmaße: England", + group : "1", + units : [{ + name : "foot", + factor : "0.304797", + subunits : "12" }, { - "name" : "inch", - "factor" : "0.02539975" + name : "inch", + factor : "0.02539975" }, { - "name" : "yard", - "factor" : "0.914391", - "subunits" : "3" + name : "yard", + factor : "0.914391", + subunits : "3" }, { - "name" : "pole", - "factor" : "5.0291505", - "subunits" : "11" + name : "pole", + factor : "5.0291505", + subunits : "11" }, { - "name" : "chain", - "factor" : "20.116602", - "subunits" : "4" + name : "chain", + factor : "20.116602", + subunits : "4" }, { - "name" : "furlong", - "factor" : "201.16602" + name : "furlong", + factor : "201.16602" }, { - "name" : "mile", - "factor" : "1609.32816", - "subunits" : "8" + name : "mile", + factor : "1609.32816", + subunits : "8" }] }, { - "name" : "Längenmaße: Italien", - "group" : "1", - "units" : [{ - "name" : "palmo d'architetto (Rom)", - "factor" : "0.223425", - "subunits" : "12" + name : "Längenmaße: Italien", + group : "1", + units : [{ + name : "palmo d'architetto (Rom)", + factor : "0.223425", + subunits : "12" }, { - "name" : "braccio (Florenz)", - "factor" : "0.5836" + name : "braccio (Florenz)", + factor : "0.5836" }, { - "name" : "braccio (Mailand)", - "factor" : "0.5949" + name : "braccio (Mailand)", + factor : "0.5949" }, { - "name" : "canna d'architetto (Rom)", - "factor" : "2.23425" + name : "canna d'architetto (Rom)", + factor : "2.23425" }, { - "name" : "canna di commercio (Rom)", - "factor" : "1.9920" + name : "canna di commercio (Rom)", + factor : "1.9920" }, { - "name" : "canna d'architetto (Florenz)", - "factor" : "2.9180" + name : "canna d'architetto (Florenz)", + factor : "2.9180" }, { - "name" : "canna di commercio (Florenz)", - "factor" : "2.3344" + name : "canna di commercio (Florenz)", + factor : "2.3344" }, { - "name" : "canna (Neapel)", - "factor" : "2.0961" + name : "canna (Neapel)", + factor : "2.0961" }, { - "name" : "miglio (Lombardei)", - "factor" : "1784.808" + name : "miglio (Lombardei)", + factor : "1784.808" }, { - "name" : "miglio (Neapel)", - "factor" : "1855.110" + name : "miglio (Neapel)", + factor : "1855.110" }, { - "name" : "miglio (Rom)", - "factor" : "1489.50" + name : "miglio (Rom)", + factor : "1489.50" }, { - "name" : "minuta (Rom)", - "factor" : "0.00372375" + name : "minuta (Rom)", + factor : "0.00372375" }, { - "name" : "oncia (Rom)", - "factor" : "0.01861875" + name : "oncia (Rom)", + factor : "0.01861875" }, { - "name" : "oncia (Mailand)", - "factor" : "0.49575" + name : "oncia (Mailand)", + factor : "0.49575" }, { - "name" : "palmo di commercio (Rom)", - "factor" : "0.249" + name : "palmo di commercio (Rom)", + factor : "0.249" }, { - "name" : "palmo (Florenz)", - "factor" : "0.2918" + name : "palmo (Florenz)", + factor : "0.2918" }, { - "name" : "piede (Brescia)", - "factor" : "0.471" + name : "piede (Brescia)", + factor : "0.471" }, { - "name" : "piede (Carrara)", - "factor" : "0.2933" + name : "piede (Carrara)", + factor : "0.2933" }, { - "name" : "piede (Como)", - "factor" : "0.4512" + name : "piede (Como)", + factor : "0.4512" }, { - "name" : "piede (Modena)", - "factor" : "0.523048" + name : "piede (Modena)", + factor : "0.523048" }, { - "name" : "piede (Reggio Em.)", - "factor" : "0.530898" + name : "piede (Reggio Em.)", + factor : "0.530898" }, { - "name" : "piede (Venedig)", - "factor" : "0.347735" + name : "piede (Venedig)", + factor : "0.347735" }, { - "name" : "piede (Vicenza)", - "factor" : "0.3574" + name : "piede (Vicenza)", + factor : "0.3574" }, { - "name" : "piede (Verona)", - "factor" : "0.3429" + name : "piede (Verona)", + factor : "0.3429" }, { - "name" : "piede (Rom)", - "factor" : "0.297587" + name : "piede (Rom)", + factor : "0.297587" }, { - "name" : "piede Lombardo", - "factor" : "0.435185" + name : "piede Lombardo", + factor : "0.435185" }, { - "name" : "piede liprando (Turin)", - "factor" : "0.51377" + name : "piede liprando (Turin)", + factor : "0.51377" }, { - "name" : "piede manuale (Turin)", - "factor" : "0.342511" + name : "piede manuale (Turin)", + factor : "0.342511" }, { - "name" : "piede (Neapel, 'palmo')", - "factor" : "0.26455" + name : "piede (Neapel, 'palmo')", + factor : "0.26455" }, { - "name" : "soldo (Florenz)", - "factor" : "0.2918" + name : "soldo (Florenz)", + factor : "0.2918" }, { - "name" : "trabucco piemontese (Turin)", - "factor" : "3.08259" + name : "trabucco piemontese (Turin)", + factor : "3.08259" }] }, { - "name" : "Längenmaße: Niederlande", - "group" : "1", - "units" : [{ - "name" : "voet (Amsterdam)", - "factor" : "0.283113" + name : "Längenmaße: Niederlande", + group : "1", + units : [{ + name : "voet (Amsterdam)", + factor : "0.283113" }, { - "name" : "voet (Antwerpen)", - "factor" : "0.2868" + name : "voet (Antwerpen)", + factor : "0.2868" }, { - "name" : "voet (Aelst)", - "factor" : "0.2772" + name : "voet (Aelst)", + factor : "0.2772" }, { - "name" : "voet (Breda)", - "factor" : "0.28413" + name : "voet (Breda)", + factor : "0.28413" }, { - "name" : "voet (Brügge)", - "factor" : "0.27439" + name : "voet (Brügge)", + factor : "0.27439" }, { - "name" : "voet (Brüssel)", - "factor" : "0.2757503" + name : "voet (Brüssel)", + factor : "0.2757503" }, { - "name" : "voet (Groningen)", - "factor" : "0.2922" + name : "voet (Groningen)", + factor : "0.2922" }, { - "name" : "voet (Haarlem)", - "factor" : "0.2858" + name : "voet (Haarlem)", + factor : "0.2858" }, { - "name" : "voet (Kortrijk)", - "factor" : "0.2977" + name : "voet (Kortrijk)", + factor : "0.2977" }, { - "name" : "voet (Tournai)", - "factor" : "0.2977" + name : "voet (Tournai)", + factor : "0.2977" }, { - "name" : "voet (Utrecht)", - "factor" : "0.2683" + name : "voet (Utrecht)", + factor : "0.2683" }, { - "name" : "voet (Ypern)", - "factor" : "0.2739" + name : "voet (Ypern)", + factor : "0.2739" }, { - "name" : "pied (Hainaut)", - "factor" : "0.2934" + name : "pied (Hainaut)", + factor : "0.2934" }, { - "name" : "pied St. Hubert (Lüttich)", - "factor" : "0.294698" + name : "pied St. Hubert (Lüttich)", + factor : "0.294698" }, { - "name" : "pied St. Lambert (Lüttich)", - "factor" : "0.291796" + name : "pied St. Lambert (Lüttich)", + factor : "0.291796" }, { - "name" : "pied Ste. Gertrude (Nivelles)", - "factor" : "0.27709" + name : "pied Ste. Gertrude (Nivelles)", + factor : "0.27709" }, { - "name" : "steenvoet (Oudenaerde)", - "factor" : "0.2977" + name : "steenvoet (Oudenaerde)", + factor : "0.2977" }, { - "name" : "houtvoet (Oudenaerde)", - "factor" : "0.292" + name : "houtvoet (Oudenaerde)", + factor : "0.292" }] }, { - "name" : "Längenmaße: Frankreich", - "group" : "1", - "units" : [{ - "name" : "pied du Roi (Paris)", - "factor" : "0.32483938497" + name : "Längenmaße: Frankreich", + group : "1", + units : [{ + name : "pied du Roi (Paris)", + factor : "0.32483938497" }, { - "name" : "pied (Arras)", - "factor" : "0.29777" + name : "pied (Arras)", + factor : "0.29777" }, { - "name" : "pied (Cambrai)", - "factor" : "0.29777" + name : "pied (Cambrai)", + factor : "0.29777" }, { - "name" : "Burgundischer Fuß", - "factor" : "0.33212" + name : "Burgundischer Fuß", + factor : "0.33212" }] }, { - "name" : "Längenmaße: Südeuropa", - "group" : "1", - "units" : [{ - "name" : "pié de Burgos (Spanien)", - "factor" : "0.278635" + name : "Längenmaße: Südeuropa", + group : "1", + units : [{ + name : "pié de Burgos (Spanien)", + factor : "0.278635" }, { - "name" : "pé (Portugal)", - "factor" : "0.33" + name : "pé (Portugal)", + factor : "0.33" }] }, { - "name" : "Längenmaße: deutschspr. Länder", - "group" : "1", - "units" : [{ - "name" : "Fuß (Basel)", - "factor" : "0.29820" + name : "Längenmaße: deutschspr. Länder", + group : "1", + units : [{ + name : "Fuß (Basel)", + factor : "0.29820" }, { - "name" : "Fuß (Bayern)", - "factor" : "0.2918592" + name : "Fuß (Bayern)", + factor : "0.2918592" }, { - "name" : "Fuß (Braunschweig)", - "factor" : "0.2853624" + name : "Fuß (Braunschweig)", + factor : "0.2853624" }, { - "name" : "Fuß (Gotha)", - "factor" : "0.287622" + name : "Fuß (Gotha)", + factor : "0.287622" }, { - "name" : "Fuß (Hamburg)", - "factor" : "0.286575" + name : "Fuß (Hamburg)", + factor : "0.286575" }, { - "name" : "Fuß (Hessen)", - "factor" : "0.287669" + name : "Fuß (Hessen)", + factor : "0.287669" }, { - "name" : "Fuß (Köln)", - "factor" : "0.2876" + name : "Fuß (Köln)", + factor : "0.2876" }, { - "name" : "Fuß (Mecklenburg)", - "factor" : "0.291006" + name : "Fuß (Mecklenburg)", + factor : "0.291006" }, { - "name" : "Fuß (Münster)", - "factor" : "0.2908" + name : "Fuß (Münster)", + factor : "0.2908" }, { - "name" : "Fuß (Pommern)", - "factor" : "0.2921" + name : "Fuß (Pommern)", + factor : "0.2921" }, { - "name" : "Fuß (rheinisch)", - "factor" : "0.3138535" + name : "Fuß (rheinisch)", + factor : "0.3138535" }, { - "name" : "Fuß (Sachsen)", - "factor" : "0.2831901" + name : "Fuß (Sachsen)", + factor : "0.2831901" }, { - "name" : "Fuß (Preußen)", - "factor" : "0.3138535" + name : "Fuß (Preußen)", + factor : "0.3138535" }, { - "name" : "Fuß (Wien)", - "factor" : "0.3180807" + name : "Fuß (Wien)", + factor : "0.3180807" }, { - "name" : "Fuß (Württemberg)", - "factor" : "0.2864903" + name : "Fuß (Württemberg)", + factor : "0.2864903" }, { - "name" : "Werkschuh (Frankfurt)", - "factor" : "0.2846143" + name : "Werkschuh (Frankfurt)", + factor : "0.2846143" }, { - "name" : "Meile (Preußen)", - "factor" : "7532.485" + name : "Meile (Preußen)", + factor : "7532.485" }, { - "name" : "Postmeile (Österreich)", - "factor" : "7585.937" + name : "Postmeile (Österreich)", + factor : "7585.937" }, { - "name" : "Dezimalfuß (Preußen)", - "factor" : "0.3766242" + name : "Dezimalfuß (Preußen)", + factor : "0.3766242" }] }, { - "name" : "Längenmaße: Osteuropa", - "group" : "1", - "units" : [{ - "name" : "Fuß (Böhmen)", - "factor" : "0.2964" + name : "Längenmaße: Osteuropa", + group : "1", + units : [{ + name : "Fuß (Böhmen)", + factor : "0.2964" }, { - "name" : "Fuß (Mähren)", - "factor" : "0.29596" + name : "Fuß (Mähren)", + factor : "0.29596" }, { - "name" : "stopa (Krakauer Fuß)", - "factor" : "0.3564" + name : "stopa (Krakauer Fuß)", + factor : "0.3564" }, { - "name" : "stopa (Warschauer Fuß)", - "factor" : "0.288" + name : "stopa (Warschauer Fuß)", + factor : "0.288" }, { - "name" : "Fuß (Rußland)", - "factor" : "0.3556" + name : "Fuß (Rußland)", + factor : "0.3556" }, { - "name" : "arschin", - "factor" : "0.7112" + name : "arschin", + factor : "0.7112" }, { - "name" : "saschen (Faden)", - "factor" : "2.133" + name : "saschen (Faden)", + factor : "2.133" }, { - "name" : "werst", - "factor" : "1066.8" + name : "werst", + factor : "1066.8" }, { - "name" : "milja", - "factor" : "7468" + name : "milja", + factor : "7468" }] }, { - "name" : "Längenmaße: Antike", - "group" : "1", - "units" : [{ - "name" : "pes romanus", - "factor" : "0.2945" + name : "Längenmaße: Antike", + group : "1", + units : [{ + name : "pes romanus", + factor : "0.2945" }, { - "name" : "pollex (Zoll)", - "factor" : "0.0245416667" + name : "pollex (Zoll)", + factor : "0.0245416667" }, { - "name" : "digitus (Fingerbreite)", - "factor" : "0.01840625" + name : "digitus (Fingerbreite)", + factor : "0.01840625" }, { - "name" : "palmus (Handbreite)", - "factor" : "0.073625" + name : "palmus (Handbreite)", + factor : "0.073625" }, { - "name" : "cubitus (Elle)", - "factor" : "0.44175" + name : "cubitus (Elle)", + factor : "0.44175" }, { - "name" : "passus (Doppelschritt)", - "factor" : "1.4725" + name : "passus (Doppelschritt)", + factor : "1.4725" }, { - "name" : "pertica", - "factor" : "2.945" + name : "pertica", + factor : "2.945" }, { - "name" : "actus", - "factor" : "35.34" + name : "actus", + factor : "35.34" }, { - "name" : "mille passus (Meile)", - "factor" : "1472.5" + name : "mille passus (Meile)", + factor : "1472.5" }, { - "name" : "stadium (600 Fuß)", - "factor" : "176.7" + name : "stadium (600 Fuß)", + factor : "176.7" }, { - "name" : "stadium (1/8 Meile)", - "factor" : "184.0625" + name : "stadium (1/8 Meile)", + factor : "184.0625" }, { - "name" : "stadion (Olympia)", - "factor" : "192.25" + name : "stadion (Olympia)", + factor : "192.25" }, { - "name" : "Fuß (attisch)", - "factor" : "0.308" + name : "Fuß (attisch)", + factor : "0.308" }, { - "name" : "Fuß (Babylon)", - "factor" : "0.35" + name : "Fuß (Babylon)", + factor : "0.35" }, { - "name" : "Fuß (Delphi)", - "factor" : "0.1848" + name : "Fuß (Delphi)", + factor : "0.1848" }, { - "name" : "Fuß (Olympia)", - "factor" : "0.32041667" + name : "Fuß (Olympia)", + factor : "0.32041667" }] }, { - "name" : "Fläche", - "group" : "4", - "units" : [{ - "name" : "qm", - "factor" : "1" + name : "Fläche", + group : "4", + units : [{ + name : "qm", + factor : "1" }, { - "name" : "qmm", - "factor" : "0.000001" + name : "qmm", + factor : "0.000001" }, { - "name" : "qcm", - "factor" : "0.0001" + name : "qcm", + factor : "0.0001" }, { - "name" : "qdm", - "factor" : "0.01" + name : "qdm", + factor : "0.01" }, { - "name" : "Ar", - "factor" : "100" + name : "Ar", + factor : "100" }, { - "name" : "Morgen", - "factor" : "2500" + name : "Morgen", + factor : "2500" }, { - "name" : "Hektar", - "factor" : "10000" + name : "Hektar", + factor : "10000" }, { - "name" : "qkm", - "factor" : "1000000" + name : "qkm", + factor : "1000000" }, { - "name" : "square inch", - "factor" : "0.0006452" + name : "square inch", + factor : "0.0006452" }, { - "name" : "square foot", - "factor" : "0.09288" + name : "square foot", + factor : "0.09288" }, { - "name" : "square yard", - "factor" : "0.836", - "subunits" : "9" + name : "square yard", + factor : "0.836", + subunits : "9" }, { - "name" : "pole (rod, perch)", - "factor" : "25.289" + name : "pole (rod, perch)", + factor : "25.289" }, { - "name" : "rood", - "factor" : "1012", - "subunits" : "40" + name : "rood", + factor : "1012", + subunits : "40" }, { - "name" : "acre", - "factor" : "4048", - "subunits" : "4" + name : "acre", + factor : "4048", + subunits : "4" }, { - "name" : "square mile", - "factor" : "2590000" + name : "square mile", + factor : "2590000" }] }, { - "name" : "Sonstige", - "group" : "0", - "units" : [{ - "name" : "Maßstab 1:200", - "factor" : "200" + name : "Sonstige", + group : "0", + units : [{ + name : "Maßstab 1:200", + factor : "200" }, { - "name" : "Maßstab", - "factor" : "1:100", - "add" : "100" + name : "Maßstab", + factor : "1:100", + add : "100" }, { - "name" : "Maßstab 1:75", - "factor" : "75" + name : "Maßstab 1:75", + factor : "75" }, { - "name" : "Maßstab 1:60", - "factor" : "60" + name : "Maßstab 1:60", + factor : "60" }, { - "name" : "Maßstab", - "factor" : "1:50", - "add" : "50" + name : "Maßstab", + factor : "1:50", + add : "50" }, { - "name" : "Maßstab 1:25", - "factor" : "25" + name : "Maßstab 1:25", + factor : "25" }, { - "name" : "Maßstab 1:20", - "factor" : "20" + name : "Maßstab 1:20", + factor : "20" }, { - "name" : "Maßstab 1:10", - "factor" : "10" + name : "Maßstab 1:10", + factor : "10" }, { - "name" : "Maßstab 1:5", - "factor" : "5" + name : "Maßstab 1:5", + factor : "5" }, { - "name" : "Maßstab 1:3", - "factor" : "3" + name : "Maßstab 1:3", + factor : "3" }] }] }; @@ -701,28 +701,26 @@ drawColor : 'green', // color of selected objects selectColor : 'red', - // drawing shapes - shapetypes : [ - { 'name': 'line', 'type' : 'Line' }, - { 'name': 'polyline', 'type' : 'Polygon' }, - { 'name': 'rectangle', 'type' : 'Rectangle' }, - { 'name': 'square', 'type' : 'Square' }, - { 'name': 'circle', 'type' : 'Circle' }, - { 'name': 'arch', 'type' : 'Arch' }, - { 'name': 'ratio', 'type' : 'Ratio' }, - { 'name': 'intercolumnium', 'type' : 'InterCol' }, - { 'name': 'line grid', 'type' : 'Grid' } + // drawing shape types + shapeTypes : [ + { name : 'line', type : 'Line' }, + { name : 'polyline', type : 'Polygon' }, + { name : 'rectangle', type : 'Rectangle' }, + { name : 'square', type : 'Square' }, + { name : 'circle', type : 'Circle' }, + { name : 'arch', type : 'Arch' }, + { name : 'ratio', type : 'Ratio' }, + { name : 'intercolumnium', type : 'InterCol' }, + { name : 'line grid', type : 'Grid' } ], - // default shape - shape : 'line', + // index of default shape + selectedShape : 0, + // factor to convert measured distance to length + lenFactor : 2.0, // measuring unit (index into unit list) - unit : 1, + unitFrom : 1, // converted unit (index into unit list) - converted : 2, - // last measured distance - lastDistance : 0, - // last measured angle - lastAngle : 0, + unitTo : 2, // maximal denominator for mixed fractions maxDenominator : 20, // number of decimal places for convert results @@ -771,6 +769,7 @@ }, drawshape : function(data) { var shape = currentShape(data); + data.tbWidgets.draw.addClass('dl-drawing') digilib.actions.addShape(data, shape, onCompleteShape); console.debug('action: drawshape', shape); @@ -783,11 +782,12 @@ // callback for vector.drawshape var onCompleteShape = function(data, shape) { console.debug('onCompleteShape', shape); - if (shape == null) { + data.tbWidgets.draw.removeClass('dl-drawing') + if (shape == null || shape.geometry.coordinates == null) { return false; // do nothing if no line was produced }; var dist = rectifiedDist(data, shape); - setMeasuredDist(data, dist); + updateLength(data, dist); return false; }; @@ -800,33 +800,59 @@ return dist.rectified; }; - var setMeasuredDist = function(data, dist) { - var $view = data.$toolbar.find('#measure-pixel'); - var str = fn.cropFloatStr(dist); - $view.text(str); + // recalculate units + var updateUnits = function(data) { + var val = data.lastMeasuredValue; + var $t = data.tbWidgets; + var u1 = parseFloat($t.unit1.val()); + var u2 = parseFloat($t.unit2.val()); + var v2 = val * u1 / u2; + $t.val2.val(fn.cropFloatStr(v2)); + } + + // recalculate after measuring + var updateLength = function(data, dist) { + var $t = data.tbWidgets; + var fac = data.settings.lenFactor; + var val = dist * fac; + $t.len.text(fn.cropFloatStr(dist)); + $t.val1.val(fn.cropFloatStr(val)); + data.lastMeasuredValue = val; + data.lastMeasuredDistance = dist; + updateUnits(data); }; + // recalculate factor after entering a new value in val1 + var updateFactor = function(data) { + var $t = data.tbWidgets; + var val = parseFloat($t.val1.val()); + var dist = data.lastMeasuredDistance; + var fac = val / dist; + data.settings.lenFactor = fac; + $t.fac.text(fn.cropFloatStr(fac)); + data.lastMeasuredValue = val; + updateUnits(data); + }; + + // return a shape of the currently selected shape type var currentShape = function(data) { var shape = getSelectedShapeType(data); var stroke = getSelectedStroke(data); var item = { - 'geometry' : { - 'type' : shape.type + geometry : { + type : shape.type }, - 'properties' : { - 'stroke' : stroke + properties : { + stroke : stroke } }; - return item; }; // return shape type selected by user (on the toolbar) var getSelectedShapeType = function(data) { - var $t = data.$toolbar; - var $select = $t.find('#measure-shapes'); - var val = $select.val(); - return data.settings.shapetypes[val]; + var val = data.tbWidgets.shape.val(); + return data.settings.shapeTypes[val]; }; // return line color chosen by user @@ -837,31 +863,33 @@ // load shapes into select element var loadShapeTypes = function(data) { - var $t = data.$toolbar; - var $shape = $t.find('#measure-shapes'); - $.each(data.settings.shapetypes, function(index, item) { + var $shape = data.tbWidgets.shape; + $.each(data.settings.shapeTypes, function(index, item) { var $opt = $('<option value="'+ index + '">' + item.name + '</option>'); $shape.append($opt); }); + $shape.children(':not(:disabled)')[data.settings.selectedShape].selected = true; }; // load units into select elements var loadSections = function(data) { - var $t = data.$toolbar; - var $unit1 = $t.find('#measure-unit1'); - var $unit2 = $t.find('#measure-unit2'); + var $t = data.tbWidgets; + var $u1 = $t.unit1; + var $u2 = $t.unit2; var sections = data.settings.units.sections; $.each(sections, function(index, section) { var $opt = $('<option class="dl-section" disabled="disabled">'+ section.name +'</option>'); - $unit1.append($opt); - $unit2.append($opt.clone()); + $u1.append($opt); + $u2.append($opt.clone()); $.each(section.units, function(index, unit) { var $opt = $('<option class="dl-units" value="'+ unit.factor + '">'+ unit.name + '</option>'); $opt.data('unit', unit); - $unit1.append($opt); - $unit2.append($opt.clone()); + $u1.append($opt); + $u2.append($opt.clone()); }); }); + $u1.children(':not(:disabled)')[data.settings.unitFrom].selected = true; + $u2.children(':not(:disabled)')[data.settings.unitTo].selected = true; }; var setScreenPosition = function(data, $div) { @@ -874,57 +902,80 @@ // setup a div for accessing the measure functionality var setupToolbar = function(data) { console.debug('measure: setupToolbar'); - var html = '\ - <div id="measure-toolbar">\ - <button id="measure-draw">M</button>\ - <select id="measure-shapes"/>\ - <span class="dl-measure-label">pixel</span>\ - <span id="measure-pixel" class="measure-number">0.0</span>\ - <span class="dl-measure-label">factor</span>\ - <span id="measure-factor" class="dl-measure-number">0.0</span>\ - <input id="measure-value1" class="dl-measure-input" value="0.0"/>\ - <span class="measure-label">=</span>\ - <select id="measure-unit1"/>\ - <input id="measure-value2" class="dl-measure-input" value="0.0"/>\ - <span class="dl-measure-label">=</span>\ - <select id="measure-unit2"/>\ - <span id="measure-angle" class="dl-measure-number">0.0</span>\ - </div>'; - var $toolbar = $(html); - console.debug('measure', data.$elem, $toolbar); + var tbWidgets = { + names : [ + 'draw', 'shape', + 'lenlabel', 'len', + 'faclabel', 'fac', + 'eq1', 'val1', 'unit1', + 'eq2', 'val2', 'unit2', + 'angle' + ], + draw : $('<button id="measure-draw" title="click to draw a measuring shape on top of the image">M</button>'), + shape : $('<select id="measure-shape" title="select a shape to use for measuring" />'), + lenlabel : $('<span class="dl-measure-label" >len</span>'), + faclabel : $('<span class="dl-measure-label" >factor</span>'), + eq1 : $('<span class="dl-measure-label">=</span>'), + eq2 : $('<span class="dl-measure-label">=</span>'), + len : $('<span id="measure-len" class="dl-measure-number">0.0</span>'), + fac : $('<span id="measure-factor" class="dl-measure-number" />'), + val1 : $('<input id="measure-val1" class="dl-measure-input" title="value of the last measured distance - click to change the value" value="0.0" />'), + val2 : $('<input id="measure-val2" class="dl-measure-input" title="value of the last measured distance, converted to the secondary unit" value="0.0"/>'), + unit1 : $('<select id="measure-unit1" title="current measuring unit - click to change" />'), + unit2 : $('<select id="measure-unit2" title="secondary measuring unit - click to change" />'), + angle : $('<span id="measure-angle" class="dl-measure-number" title="last measured angle" />') + }; + var $toolbar = $('<div id="measure-toolbar" />'); + $.each(tbWidgets.names, function(index, item) { + $toolbar.append(tbWidgets[item]); + }); data.$elem.append($toolbar); data.$toolbar = $toolbar; + data.tbWidgets = tbWidgets; + tbWidgets.fac.text(fn.cropFloatStr(data.settings.lenFactor)); loadShapeTypes(data); loadSections(data); - setupToolbarButton(data); + setupToolbarButtons(data); return $toolbar; }; // wire the draw button - var setupToolbarButton = function (data) { - console.debug('measure: setupToolbarButton'); - var $t = data.$toolbar; - var $b = $t.find('#measure-draw'); + var setupToolbarButtons = function (data) { + console.debug('measure: setupToolbarButtons'); + var $t = data.tbWidgets; + var $draw = $t.draw; var buttonConfig = buttons['drawshape']; // not in data.settings.buttons // button properties var action = buttonConfig.onclick; var tooltip = buttonConfig.tooltip; - $b.attr('title', tooltip); + $draw.attr('title', tooltip); $elem = data.$elem; - $b.on('click.digilib', function(evt) { + $draw.on('click.digilib', function(evt) { // the handler function calls digilib with action console.debug('click action=', action, ' evt=', evt); $elem.digilib(action); return false; }); + $t.val1.on('change.digilib', function(evt) { + updateFactor(data); + }); + $t.unit1.on('change.digilib', function(evt) { + updateUnits(data); + }); + $t.unit2.on('change.digilib', function(evt) { + updateUnits(data); + }); + }; // event handler var handleSetup = function (evt) { console.debug("measure: handleSetup"); var data = this; + data.lastMeasuredDistance = 0; + data.lastMeasuredValue = 0; + data.lastMeasuredAngle = 0; setupToolbar(data); - // var settings = data.settings; }; // event handler