Merge pull request #402 from lixun910/dev1.7

merge branch Dev1.7 to master

.gitignore

@@ -0,0 +1,55 @@
+*~
+
+BuildTools/windows/temp/
+BuildTools/windows/Debug/
+BuildTools/windows/Release/
+BuildTools/windows/ipch/
+BuildTools/windows/GeoDa.vcxproj.filters
+BuildTools/macosx/libraries/
+BuildTools/macosx/libraries1/
+BuildTools/macosx/temp/
+BuildTools/macosx/build/
+BuildTools/macosx/GeoDa.xcodeproj/
+BuildTools/macosx/GeoDa.xcodeproj/xcuserdata/
+BuildTools/macosx/GeoDa-leopard.xcodeproj/
+
+*.dmg
+*.mode1v3
+*.pbxuser
+*.sdf
+*.suo
+*.user
+*.csv
+*.dbf
+*.shx
+*.shp
+*.kml
+*.gal
+*.swp
+SampleData/
+
+*.xcuserstate
+
+*.xcuserstate
+
+*.xcsettings
+
+*.xcuserstate
+
+*.xcbkptlist
+
+*.xcscheme
+
+BuildTools/macosx/GeoDa.xcodeproj/xcuserdata/xun.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+
+BuildTools/macosx/GeoDa.xcodeproj/project.xcworkspace/xcuserdata/xun.xcuserdatad/UserInterfaceState.xcuserstate
+
+
+*.xcuserstate
+
+rc/Drop-Files-Here-extra.png
+
+rc/Drop-Files-Here-extra-black.png
+*.opensdf
+*.exe
+BuildTools/windows/logger.txt

BuildTools/CommonDistFiles/geoda_prefs.json

@@ -0,0 +1,14 @@
+{
+	"html_entries": [
+		{ "menu_title": "Hex Bins Example",
+		 "url": "http://localhost:8888/hex_bins.html" },
+		{ "menu_title": "Scatter Plot Example",
+		 "url": "http://localhost:8888/scatterplot_example6.html" },
+		{ "menu_title": "Scatter Plot Example (relative path)",
+		 "url": "web_plugins/scatterplot_example6.html" },
+		{ "menu_title": "GeoDa Center",
+		 "url": "http://geodacenter.asu.edu/" },
+		{ "menu_title": "LOESS curve Example",
+		 "url": "http://localhost:8888/loess_curve.html" }
+    ]
+}

BuildTools/CommonDistFiles/web_plugins/d3/LICENSE

@@ -0,0 +1,26 @@
+Copyright (c) 2010-2014, Michael Bostock
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* The name Michael Bostock may not be used to endorse or promote products
+  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

BuildTools/CommonDistFiles/web_plugins/d3/d3.hexbin.v0.js

@@ -0,0 +1,110 @@
+(function() {
+
+d3.hexbin = function() {
+  var width = 1,
+      height = 1,
+      r,
+      x = d3_hexbinX,
+      y = d3_hexbinY,
+      dx,
+      dy;
+
+  function hexbin(points) {
+    var binsById = {};
+
+    points.forEach(function(point, i) {
+      var py = y.call(hexbin, point, i) / dy, pj = Math.round(py),
+          px = x.call(hexbin, point, i) / dx - (pj & 1 ? .5 : 0), pi = Math.round(px),
+          py1 = py - pj;
+
+      if (Math.abs(py1) * 3 > 1) {
+        var px1 = px - pi,
+            pi2 = pi + (px < pi ? -1 : 1) / 2,
+            pj2 = pj + (py < pj ? -1 : 1),
+            px2 = px - pi2,
+            py2 = py - pj2;
+        if (px1 * px1 + py1 * py1 > px2 * px2 + py2 * py2) pi = pi2 + (pj & 1 ? 1 : -1) / 2, pj = pj2;
+      }
+
+      var id = pi + "-" + pj, bin = binsById[id];
+      if (bin) bin.push(point); else {
+        bin = binsById[id] = [point];
+        bin.i = pi;
+        bin.j = pj;
+        bin.x = (pi + (pj & 1 ? 1 / 2 : 0)) * dx;
+        bin.y = pj * dy;
+      }
+    });
+
+    return d3.values(binsById);
+  }
+
+  function hexagon(radius) {
+    var x0 = 0, y0 = 0;
+    return d3_hexbinAngles.map(function(angle) {
+      var x1 = Math.sin(angle) * radius,
+          y1 = -Math.cos(angle) * radius,
+          dx = x1 - x0,
+          dy = y1 - y0;
+      x0 = x1, y0 = y1;
+      return [dx, dy];
+    });
+  }
+
+  hexbin.x = function(_) {
+    if (!arguments.length) return x;
+    x = _;
+    return hexbin;
+  };
+
+  hexbin.y = function(_) {
+    if (!arguments.length) return y;
+    y = _;
+    return hexbin;
+  };
+
+  hexbin.hexagon = function(radius) {
+    if (arguments.length < 1) radius = r;
+    return "m" + hexagon(radius).join("l") + "z";
+  };
+
+  hexbin.centers = function() {
+    var centers = [];
+    for (var y = 0, odd = false, j = 0; y < height + r; y += dy, odd = !odd, ++j) {
+      for (var x = odd ? dx / 2 : 0, i = 0; x < width + dx / 2; x += dx, ++i) {
+        var center = [x, y];
+        center.i = i;
+        center.j = j;
+        centers.push(center);
+      }
+    }
+    return centers;
+  };
+
+  hexbin.mesh = function() {
+    var fragment = hexagon(r).slice(0, 4).join("l");
+    return hexbin.centers().map(function(p) { return "M" + p + "m" + fragment; }).join("");
+  };
+
+  hexbin.size = function(_) {
+    if (!arguments.length) return [width, height];
+    width = +_[0], height = +_[1];
+    return hexbin;
+  };
+
+  hexbin.radius = function(_) {
+    if (!arguments.length) return r;
+    r = +_;
+    dx = r * 2 * Math.sin(Math.PI / 3);
+    dy = r * 1.5;
+    return hexbin;
+  };
+
+  return hexbin.radius(1);
+};
+
+var d3_hexbinAngles = d3.range(0, 2 * Math.PI, Math.PI / 3),
+    d3_hexbinX = function(d) { return d[0]; },
+    d3_hexbinY = function(d) { return d[1]; };
+
+})();