v1.5.1

fit region view/edit to screen size

Author: seanhaythorne

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={{C0808D1B-C181-47D7-8A26-A96EF44DA6E1}
+AppId={{6175BF8E-2028-4E5B-BF1F-2D163DC79F36}
 AppName=PaleoView
-AppVersion=1.5
-AppVerName=PaleoView v1.5
+AppVersion=1.5.1
+AppVerName=PaleoView v1.5.1
 AppPublisher=Global Ecology Lab
 AppPublisherURL=https://github.com/GlobalEcologyLab/PaleoView
 AppSupportURL=https://github.com/GlobalEcologyLab/PaleoView
 AppUpdatesURL=https://github.com/GlobalEcologyLab/PaleoView
-DefaultDirName={pf}\PaleoView v1.5
-DefaultGroupName=PaleoView v1.5
+DefaultDirName={pf}\PaleoView v1.5.1
+DefaultGroupName=PaleoView v1.5.1
 OutputBaseFilename=setup
 Compression=lzma
 SolidCompression=yes
@@ -34,10 +34,10 @@ Source: "Bias Corrections/*"; DestDir: "{app}/Bias Corrections"; Flags: recurses
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files vcredist_x86.exe
 
 [Icons]
-Name: "{group}\PaleoView v1.5"; Filename: "{app}\paleo_view_v1_5.exe"
-Name: "{commondesktop}\PaleoView v1.5"; Filename: "{app}\paleo_view_v1_5.exe"; Tasks: desktopicon
+Name: "{group}\PaleoView v1.5.1"; Filename: "{app}\paleo_view_v1_5_1.exe"
+Name: "{commondesktop}\PaleoView v1.5.1"; Filename: "{app}\paleo_view_v1_5_1.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_v1_5.exe"; Description: "{cm:LaunchProgram,PaleoView}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\paleo_view_v1_5_1.exe"; Description: "{cm:LaunchProgram,PaleoView}"; Flags: nowait postinstall skipifsilent

paleo_view_v1_5.py paleo_view_v1_5_1.pypaleo_view_v1_5.py renamed to paleo_view_v1_5_1.py

@@ -2800,8 +2800,9 @@ def createRegionFigure(self, update=False, user_defined_update=False, time_depen
                 basemap_resolution = 'l'
 
             # Set/calculate dimensions and margins
-            maximum_width = 15.0
-            maximum_height = 9.0
+            maximum_width = self.master.winfo_screenmmwidth()/25.4*0.8 # was 15.0 inches
+            maximum_height = self.master.winfo_screenmmheight()/25.4*0.8 - 0.5 # was 9.0 inches
+            dpi = int(25.4*self.master.winfo_screenwidth()/self.master.winfo_screenmmwidth())
             margin = 0.2
             region_box = self.region_bounding_box[self.current_region]
             if self.current_region in ['antarctica'] :
@@ -2823,8 +2824,8 @@ def createRegionFigure(self, update=False, user_defined_update=False, time_depen
                 bounding_lat = -60
             if update :
                 self.view_edit_region_figure.set_size_inches(width, height, forward=True)
-            else :
-                self.view_edit_region_figure = Figure(figsize=(width, height), frameon=False, linewidth=10, dpi=100, tight_layout=True)
+            else : # was dpi=100
+                self.view_edit_region_figure = Figure(figsize=(width, height), frameon=False, linewidth=10, dpi=dpi, tight_layout=True)
                 self.view_edit_region_plot_axes = self.view_edit_region_figure.add_subplot(111)
             self.view_edit_region_figure.subplots_adjust(left=(margin/width), right=(1.0-margin/width), bottom=(margin/height), top=(1.0-margin/height))
             self.region_basemap = Basemap(ax=self.view_edit_region_plot_axes,
@@ -6456,7 +6457,7 @@ def isNonNegativetiveFloat(self, string_value) :
 
 ## Main program
 
-application_name = 'PaleoView v1.5'
+application_name = 'PaleoView v1.5.1'
 
 # Set user application data directory
 if MAC_VERSION :

setup_pc.py

@@ -17,7 +17,7 @@
 #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_v1_5.py'],
+    windows=['paleo_view_v1_5_1.py'],
 )
 #    options={'py2exe': { 'includes': 'patsy' }}
 #    options={'py2exe': { 'excludes': ['_gtkagg', '_qt4agg', '_agg2', '_cairo', '_cocoaagg', '_fltkagg', '_gtk', '_gtkcairo'] }}