update version number

Author: stephanie

odmtools/gui/frmFlagValues.py

@@ -100,7 +100,7 @@ def __init__(self, parent, series_service, choices, isNew=False):
 
         #len choices added in cases where ther are no flags in the database- still needs to be tested.
         #desired functionality is to automatically select creation of new flag
-        if isNew or len(choices ==0):
+        if isNew or len(choices) ==0:
             self.selectedValue = NEW
             wx.CallAfter(self.showNewFields)
         else:

odmtools/gui/plotTimeSeries.py

@@ -279,8 +279,8 @@ def drawEditPlot(self, oneSeries):
 
         convertedDates = matplotlib.dates.date2num(dates)
 
-        scale = 1.5
-        f = zoom_factory(curraxis , base_scale = scale)
+        # scale = 1.5
+        # f = zoom_factory(curraxis , base_scale = scale)
         self.xys = zip(convertedDates, oneSeries.dataTable['DataValue'])
         self.toolbar.editSeries(self.xys, self.editCurve)
         self.pointPick = self.canvas.mpl_connect('pick_event', self._onPick)

setup/Mac/ODMTools.packproj

@@ -566,9 +566,9 @@
 						<key>IFPkgDescriptionDescription</key>
 						<string></string>
 						<key>IFPkgDescriptionTitle</key>
-						<string>ODMTools_v1.2.3</string>
+						<string>ODMTools_v1.2.4</string>
 						<key>IFPkgDescriptionVersion</key>
-						<string>1.2.3 Beta</string>
+						<string>1.2.4 Beta</string>
 					</dict>
 				</dict>
 				<key>Display Information</key>
@@ -619,7 +619,7 @@
 		<key>IFPkgFlagPackageSelection</key>
 		<integer>0</integer>
 		<key>Name</key>
-		<string>ODMTools_v1.2.3-beta_Mac_installer</string>
+		<string>ODMTools_v1.2.4-beta_Mac_installer</string>
 		<key>Status</key>
 		<integer>1</integer>
 		<key>Type</key>

setup/Windows/odmtools_console.iss

@@ -2,10 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ODMTools"
-#define MyAppVersion "1.2.3_Beta"
+#define MyAppVersion "1.2.4_Beta"
+#define MyAppExeLongName "ODMTools_1.2.4_Beta_win32_x86_64_console.exe"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
-#define MyAppExeName "ODMTools_1.2.3_Beta_win32_x86_64_console.exe"
+#define MyAppExeName "ODMTools.exe"
 #define MyAppDir "D:\DEV\ODMToolsPython"
 
 [Setup]

setup/Windows/odmtools_no_console.iss

@@ -2,10 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ODMTools"
-#define MyAppVersion "1.2.3_Beta"
+#define MyAppExeLongName "ODMTools_1.2.4_Beta_win32_x86_64.exe"
+#define MyAppVersion "1.2.4_Beta"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
-#define MyAppExeName "ODMTools_1.2.3_Beta_win32_x86_64.exe"
+#define MyAppExeName "ODMTools.exe"
 #define MyAppDir "D:\DEV\ODMToolsPython"
 
 [Setup]

setup/Windows/odmtools_setup.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ODMTools"
-#define MyAppVersion "1.2.3_Beta"
+#define MyAppVersion "1.2.4_Beta"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODMToolsPython"
 #define MyAppExeName "ODMTools.exe"