v0.3

GlobalEcologyLab · Aug 1, 2016 · 2e53cd1 · 2e53cd1
1 parent d81d8bd
commit 2e53cd1
Show file tree

Hide file tree

Showing 7 changed files with 1,853 additions and 12,375 deletions.
diff --git a/PaleoclimateDataDropboxUrlLookupHelper.py b/PaleoclimateDataDropboxUrlLookupHelper.py
diff --git a/PaleoclimateToolDataFileHelper.py b/PaleoclimateToolDataFileHelper.py
diff --git a/Test/PaleoclimateToolDataFileHelperTest.py b/Test/PaleoclimateToolDataFileHelperTest.py
diff --git a/installer.iss b/installer.iss
@@ -5,16 +5,16 @@
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{C2A63D2B-388C-49F6-9779-6F9B3FDB2FDA}
+AppId={{330A39BA-68E1-4A46-AF6A-6B979966CCE5}
 AppName=PaleoView
-AppVersion=0.2
-AppVerName=PaleoView 0.2 prototype 4
+AppVersion=0.3
+AppVerName=PaleoView v0.3
 AppPublisher=Global Ecology Lab
 AppPublisherURL=http://www.example.com/
 AppSupportURL=http://www.example.com/
 AppUpdatesURL=http://www.example.com/
-DefaultDirName={pf}\PaleoView v0.2 p4
-DefaultGroupName=PaleoView v0.2 p4
+DefaultDirName={pf}\PaleoView v0.3
+DefaultGroupName=PaleoView v0.3
 OutputBaseFilename=setup
 Compression=lzma
 SolidCompression=yes
@@ -26,18 +26,18 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
-Source: "C:\afat32\Dropbox\GlobalEcologyGroup\PythonResources\vcredist_x86.exe"; DestDir: {tmp}
+Source: "C:\Users\shaythorne\Dropbox\GlobalEcology\PythonResources\vcredist_x86.exe"; DestDir: {tmp}
 Source: "dist\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "paleo_view_config.txt"; DestDir: "{app}"
 Source: "Map Data/*"; DestDir: "{app}/Map Data"; Flags: recursesubdirs createallsubdirs
 Source: "Bias Corrections/*"; DestDir: "{app}/Bias Corrections"; Flags: recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files vcredist_x86.exe
 
 [Icons]
-Name: "{group}\PaleoView v0.2 p4"; Filename: "{app}\paleo_view_v0_2.exe"
-Name: "{commondesktop}\PaleoView v0.2 p4"; Filename: "{app}\paleo_view_v0_2.exe"; Tasks: desktopicon
+Name: "{group}\PaleoView v0.3"; Filename: "{app}\paleo_view_v0_3.exe"
+Name: "{commondesktop}\PaleoView v0.3"; Filename: "{app}\paleo_view_v0_3.exe"; Tasks: desktopicon
 
 [Run]
 Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/qu"; StatusMsg: "Installing Microsoft Visual C++ 2008 Redistributable Package..."
 Filename: "{tmp}\vcredist_x86.exe"; Parameters: ""; StatusMsg: "Installing Microsoft Visual C++ 2008 Redistributable Package..."
-Filename: "{app}\paleo_view_v0_2.exe"; Description: "{cm:LaunchProgram,PaleoView}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\paleo_view_v0_3.exe"; Description: "{cm:LaunchProgram,PaleoView}"; Flags: nowait postinstall skipifsilent
diff --git a/paleo_view_config.txt b/paleo_view_config.txt
@@ -1,6 +1,7 @@
-climate_data_source = 'url'
-climate_data_url = 'https://dl.dropboxusercontent.com/sh/upmj85imokepgts/'
+climate_data_source = local
+climate_data_url = http://203.83.208.84/
 climate_data_directory = 
+climate_data_local_data_type = netcdf
 default_file_generation_directory = 
 region_mask_directory = path.join(getcwd(), 'Map Data')
 maximum_time_series_points = 500

diff --git a/paleo_view_v0_2.py → paleo_view_v0_3.py b/paleo_view_v0_2.py → paleo_view_v0_3.py
diff --git a/setup_pc.py b/setup_pc.py
@@ -7,16 +7,16 @@
 
 # >python setup_pc.py py2exe
 
-sys.path.append("C:\\Program Files\\Dropbox\\Microsoft.VC90.CRT")
+sys.path.append("C:\Users\shaythorne\Dropbox\GlobalEcology\PythonResources\Microsoft.VC90.CRT")
 
 data_files = matplotlib.get_py2exe_datafiles()
-#data_files.append(("Microsoft.VC90.CRT", glob(r'C:\Program Files\Dropbox\Microsoft.VC90.CRT\*.*')))
+#data_files.append(("Microsoft.VC90.CRT", glob(r'C:\Users\shaythorne\Dropbox\GlobalEcology\PythonResources\Microsoft.VC90.CRT\*.*')))
 data_files.append((r'mpl-data\basemap-data', glob(r'C:\Python27\Lib\site-packages\mpl_toolkits\basemap\data\*')))
 data_files.append((r'docx-data\templates', glob(r'C:\Python27\Lib\site-packages\docx\templates\*')))
 #data_files.append((r'Map Data', glob(r'C:\afat32\Dropbox\GlobalEcologyGroup\ProjectCode\PaleoclimateTool\v0.1\Map Data\*')))
 setup(
     data_files=data_files,
-    windows=['paleo_view_v0_2.py'],
+    windows=['paleo_view_v0_3.py'],
 )
 #    options={'py2exe': { 'includes': 'patsy' }}
 #    options={'py2exe': { 'excludes': ['_gtkagg', '_qt4agg', '_agg2', '_cairo', '_cocoaagg', '_fltkagg', '_gtk', '_gtkcairo'] }}