update CAST for new version

CAST.iss

@@ -7,9 +7,9 @@
 [Setup]
 AppName=CAST
 AppPublisher=GeoDa Center
-AppPublisherURL=http://geoda.asu.edu/
-AppSupportURL=http://geoda.asu.edu/
-AppUpdatesURL=http://geoda.asu.edu/
+AppPublisherURL=http://spatial.uchicago.edu/
+AppSupportURL=http://spatial.uchicago.edu/
+AppUpdatesURL=http://spatial.uchicago.edu/
 AppSupportPhone=(480)965-7533
 AppVersion=0.99(alpha)
 DefaultDirName={pf}\GeoDa Software
@@ -26,17 +26,17 @@ OutputDir=userdocs:Inno Setup Examples Output
 Name:"{app}\examples"
 
 [Files]
-Source: "CAST.exe"; DestDir: "{app}"
+Source: "dist\CAST.exe"; DestDir: "{app}"
 Source: "Microsoft.VC90.CRT.manifest"; DestDir: "{app}"
 Source: "msvcm90.dll"; DestDir: "{app}"
 Source: "msvcp90.dll"; DestDir: "{app}"
 Source: "msvcr90.dll"; DestDir: "{app}"
-Source: "examples\tempe.shp"; DestDir: "{app}\examples"
-Source: "examples\tempe.dbf"; DestDir: "{app}\examples"
-Source: "examples\tempe.shx"; DestDir: "{app}\examples"
-Source: "examples\beats.shp"; DestDir: "{app}\examples"
-Source: "examples\beats.dbf"; DestDir: "{app}\examples"
-Source: "examples\beats.shx"; DestDir: "{app}\examples"
+;Source: "examples\tempe.shp"; DestDir: "{app}\examples"
+;Source: "examples\tempe.dbf"; DestDir: "{app}\examples"
+;Source: "examples\tempe.shx"; DestDir: "{app}\examples"
+;Source: "examples\beats.shp"; DestDir: "{app}\examples"
+;Source: "examples\beats.dbf"; DestDir: "{app}\examples"
+;Source: "examples\beats.shx"; DestDir: "{app}\examples"
 
 
 ;Source: "Readme.txt"; DestDir: "{app}"; Flags: isreadme

setup.py.win

@@ -24,7 +24,7 @@ class Target(object):
     def __init__(self, **kw):
         """ Default class constructor. Update as you need. """
         self.__dict__.update(kw)
-        
+
 
 # Ok, let's explain why I am doing that.
 # Often, data_files, excludes and dll_excludes (but also resources)
@@ -35,7 +35,7 @@ sys.path.append("C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\redist\\x86
 data_files = []
 data_files = [("", glob.glob(r"C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*"))]
 
-includes = []
+includes = ['scipy', 'scipy.integrate', 'scipy.special.*','scipy.linalg.*']
 excludes = ['_gtkagg', '_tkagg', 'bsddb', 'curses', 'email', 'pywin.debugger',
             'pywin.debugger.dbgcon', 'pywin.dialogs', 'tcl',
             'Tkconstants', 'Tkinter']
@@ -63,7 +63,7 @@ GUI2Exe_Target_1 = Target(
     icon_resources = icon_resources,
     bitmap_resources = bitmap_resources,
     other_resources = other_resources,
-    dest_base = "CAST",    
+    dest_base = "CAST",
     version = "0.1",
     company_name = "GeoDa Cener",
     copyright = "GeoDa Center",
@@ -75,14 +75,14 @@ GUI2Exe_Target_1 = Target(
 # That's serious now: we have all (or almost all) the options py2exe
 # supports. I put them all even if some of them are usually defaulted
 # and not used. Some of them I didn't even know about.
-                    
+
 setup(
 
     # No UPX or Inno Setup
 
     data_files = data_files,
 
-    options = {"py2exe": {"compressed": 2, 
+    options = {"py2exe": {"compressed": 2,
                           "optimize": 2,
                           "includes": includes,
                           "excludes": excludes,
@@ -114,4 +114,3 @@ setup(
 
 
 # And we are done. That's a setup script :-D
-

stars.py

@@ -3,5 +3,8 @@
 import stars
 import warnings
 
+def dependencies_for_myprogram():
+    from scipy.sparse.csgraph import _validation
+
 warnings.filterwarnings("ignore")
-stars.main()
+stars.main()

stars/core/mt_densitymap_wrap.cpp

@@ -125,6 +125,7 @@ template<class T> class SwigValueWrapper {
 #endif
 
 
+#include <cmath>
 /* Python.h has to appear first */
 #include <Python.h>
 

stars/visualization/dialogs/Weights.py

@@ -381,7 +381,7 @@ def __init__(self, main, resource):
         self.dialog.Bind(wx.EVT_BUTTON, self.OnAddIDVariable, self.btn_add_id_var)
 
     def ShowMsgBox(self,msg,mtype='Warning',micon=wx.ICON_WARNING):
-        dlg = wx.MessageDialog(self, msg, mtype, wx.OK|micon)
+        dlg = wx.MessageDialog(None, msg, mtype, wx.OK|micon)
         dlg.ShowModal()
         dlg.Destroy()
 

stars/visualization/maps/DensityMap.py

@@ -563,7 +563,7 @@ def OnPaneChanged(self,event):
             self.btn_cancel.SetPosition((x+190,y-offset))
 
     def ShowMsgBox(self,msg,mtype='Warning',micon=wx.ICON_WARNING):
-        dlg = wx.MessageDialog(self, msg, mtype, wx.OK|micon)
+        dlg = wx.MessageDialog(None, msg, mtype, wx.OK|micon)
         dlg.ShowModal()
         dlg.Destroy()