Changeset 24

Timestamp:

02/16/07 09:51:02 (2 years ago)

Author:

mikel

Message:

fixes off by one error in zoomify, and various other small bugs

Files:

• worldkit/com/brainoff/worldkitAnnotation.as (modified) (2 diffs)
• worldkit/com/brainoff/worldkitConfig.as (modified) (4 diffs)
• worldkit/com/brainoff/worldkitImages.as (modified) (8 diffs)
• worldkit/com/brainoff/worldkitInteraction.as (modified) (8 diffs)
• worldkit/com/brainoff/worldkitMain.as (modified) (1 diff)
• worldkit/com/brainoff/worldkitRSS.as (modified) (1 diff)

worldkit/com/brainoff/worldkitAnnotation.as

@@ -210 +210 @@
-            mc[ textname ]._x = textx; if (textx != x) { mc[textname].leftpos = true; }
-            mc[ textname ]._y = texty; if (texty != y) { mc[textname].bottompos = true; }
-
+
+
-            mc[textname]._xscale = scale;    
-            mc[textname]._yscale = scale;
@@ -542 +543 @@
-                rss.setActive(this);
-            }
+
+            var ratio = conf.w / conf.h;
+            var stagew, stageh, textx, texty;
+            if (ratio > 1) { stagew  = 100 * ratio; stageh = 100; }
+            else { stageh = 100 / ratio; stagew = 100; }
+
+            var mousex = conf.w * (_root._xmouse / stagew);
+            var mousey = conf.h * (_root._ymouse / stageh);
+
+            if (mc.origwidth - mousex < conf.textboxsize) { textx = mousex - (conf.textboxsize / interact.scale); }
+            if (mc.origheight - y < 100) { texty = mousey - (50 / interact.scale); }   
+
+            mc[ textname ]._x = textx; if (textx != x) { mc[textname].leftpos = true; }
+            mc[ textname ]._y = texty; if (texty != y) { mc[textname].bottompos = true; }
+
-            mc[ textname ]._visible = 1; 
-        } else {

worldkit/com/brainoff/worldkitConfig.as

@@ -404 +404 @@
-                }
-                if (attr.minscale != undefined) {
-scale
+view
-                }
-                if (attr.maxscale != undefined) {
-scale
+view
-                }
-                if (attr.preload != undefined) {
@@ -457 +457 @@
-                    this.wms[ attr.id ] = new Object();
-                    this.wms[ attr.id ].url = value;
+                    if (attr.path) {
+                        this.wms[ attr.id ].url = this.wms[ attr.id ].url + attr.path;
+                    } else {
+                        this.wms[ attr.id ].url = this.wms[ attr.id ].url + "ZOOM/XTILE/YTILE.jpg";
+                    }
+                    if (attr.origin) {
+                        this.wms[ attr.id ].origin = attr.origin;
+                    } else {
+                        this.wms[ attr.id ].origin = "sw";
+                    }
-                    this.wms[ attr.id ].width = 256;
-                    this.wms[ attr.id ].height = 256;
@@ -590 +600 @@
-                if (wms[ s ].tilemap) {
-                        swftemplate[ id ].url = wms[ s ].url;
+                        swftemplate[ id ].origin = wms[ s ].origin;
-                        swftemplate[ id ].tilemap = true;
-                } else {
@@ -626 +637 @@
-            loader.onLoad = function(success) { config.onZoomifyConfig(this,success); };
-            loader.load( zoomifydir + "ImageProperties.xml" ); 
+
+            if (toolbar == undefined) {
+                toolbar = true;
+            }
-            return true;
-        } else {

worldkit/com/brainoff/worldkitImages.as

@@ +1 @@
+
-import com.brainoff.worldkitMain;
-import com.brainoff.worldkitConfig;
@@ -90 +91 @@
-        for (var s in conf.swftemplate) {
-            imagemc.createEmptyMovieClip(s, layer + conf.swftemplate[s].layer);
-            if (conf.swftemplate[s].layer > l) {
-                    l = conf.swftemplate[s].layer; //REVIST tangled interplay of config iterator, layer, etc
-            }
-        } 
-l
+conf.swftemplatelayer
-
-//      checkSwfTemplate();
@@ -103 +101 @@
-        */
-        for (var swf in conf.swflayer) {
-! conf.swflayer[swf].fromtemplat
+conf.swflayer[swf].fromtemplate != tru
-                loadImage(imagemc, "swflayer" + swf, conf.swflayer[swf].url, layer, "AdjustSwf", 0,1, conf.swflayer[swf].w, conf.swflayer[swf].h, conf.swflayer[swf].extent, true);
-                conf.swflayer[swf].parent = imagemc;
-                layer++;
-
+
+
-        }
-
@@ -220 +218 @@
-                target_mc.origwidth = target_mc._width;
-            }
+            target_mc.actualwidth = target_mc._width;
-
-            if (imglist[key].height != undefined) {
@@ -226 +225 @@
-                target_mc.origheight = target_mc._height;
-            }
+            target_mc.actualheight = target_mc._height;
-        }
-
@@ -318 +318 @@
-            clip.setMask( clip[ "masker"] );
-        }
-
+, true
-        mc[ id ]._alpha = 100;
-        
@@ -335 +335 @@
-            if (mc[id] == undefined) {
-                loadImage(mc, id, conf.swflayer[confid].url, layer, "AdjustSwf", 0, 1, conf.swflayer[confid].w, conf.swflayer[confid].h, conf.swflayer[confid].extent);
+                layer++;
-            } else if (mc[id].loaded == true) {
-
+
+
+
-                mc[ id ]._visible = true;
-                //setTimeNavAlpha(mc,id);
@@ -425 +428 @@
-
-                if (conf.swftemplate[id].tilemap) {
-
+
+
+
+
+
+
+
+
+
+
-                } else if (conf.swftemplate[id].zoomify != undefined) {
-                        var group = Math.floor((conf.swftemplate[id].tilecount + i + (j * conf.swftemplate[id].spanx)) / 256);

worldkit/com/brainoff/worldkitInteraction.as

@@ -223 +223 @@
-            } else {
-                mc.toolbar["DragOn"]._visible = 0;
+                conf.grabber = true;
-            }
-        } else {
@@ -490 +491 @@
-
-        Zoom();
+
+        if (conf.onzoompan) {
+                var args = "extent=" + cwest + "," + csouth + "," + ceast + "," + cnorth;
+                //getURL( conf.onzoompan + "(\"" + args + "\");" );
+                ExternalInterface.call( conf.onzoompan.substr(11), args);
+        }
-    }
-
@@ -803 +810 @@
-    }
-
-
+,over:Boolean
-
-        var w = conf.w;
@@ -831 +838 @@
-            y = lon;
-        } else if (conf.west >= conf.east) {
-
+ || over
-                x = ((lon - we + 360)/(ea + 360 - we)) * w;
-            } else {
@@ -873 +880 @@
-      The black magic of worldKit. Fit images to a map with dynamically determing width/heigh
-    */
-
+, tiled:Boolean
-        
-        var w, h;
@@ -890 +897 @@
-        var xanother = 0;
-        var yanother = 0;
+        var xy;
+
-        if (extent == 1) {
-            hanother = 180/(conf.north - conf.south);
-            wanother = 360/(conf.east - conf.west);
-            
-var 
+
-            xanother = xy[0] * w / conf.w;
-            yanother = xy[1] * h / conf.h;
+
-        } else if (extent != undefined) {
-            var no,so,ea,we;
@@ -904 +914 @@
-            wanother = (ea - we)/(conf.east - conf.west);
-            
-var 
+
-            xanother = xy[0] * scale * w / conf.w;
-            yanother = xy[1] * scale * h / conf.h;
+
-        }
-        
@@ -915 +926 @@
-            clip = parent[id];
-        }
-
-
+
+
+
+
-
-        var xoffset = scale * ((conf.w / 2) - centerx) * (w / conf.w);
-        var yoffset = scale * ((conf.h / 2) - centery) * (h / conf.h);
-        
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

worldkit/com/brainoff/worldkitMain.as

@@ -7 +7 @@
-
-class com.brainoff.worldkitMain {
-125
+201
-
-    var conf:worldkitConfig;

worldkit/com/brainoff/worldkitRSS.as

@@ -351 +351 @@
-                break;
-            case("pubdate"): //RSS 2.0
-
+
+
-            case("dc:date"): //RSS 1.0
-            case("ev:startdate"): //for consistency