Skip to content

Commit

Permalink
corrected date issue as outlined in issue 111
Browse files Browse the repository at this point in the history
  • Loading branch information
leonro committed Mar 25, 2022
1 parent 71c46c9 commit ae91462
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
16 changes: 16 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@ MagPy provides a tool set for geomagnetic data analysis.
Installation instructions can be found on the main download page.
-------------------------------------------------

####v<1.0.5>, <2022-xx-xx> --

1.0.5 general:

1.0.5 additions:

1.0.5 fixes:
+ correct usage of datetime in fitting options of GUI

####v<1.0.3>, <2022-01-06> --

1.0.3 general:
+ ready for newest wx4
+ tested on windows 10 with newest winpython 3.9
+ ready for creating new windows installer

####v<1.0.4>, <2022-03-10> --

1.0.4 general:
Expand Down
2 changes: 1 addition & 1 deletion geomagpy.egg-info/PKG-INFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: geomagpy
Version: 1.0.2
Version: 1.0.4
Summary: Geomagnetic analysis tools.
Home-page: http://pypi.python.org/pypi/geomagpy/
Author: R. Leonhardt, R. Bailey, M. Miklavec, J. Fee, H. Schovanec
Expand Down
5 changes: 4 additions & 1 deletion magpy/gui/dialogclasses.py
Original file line number Diff line number Diff line change
Expand Up @@ -2081,6 +2081,9 @@ def __init__(self, parent, title, options, stream, shownkeylist, keylist):

# Widgets
def createControls(self):
stfit = wx.DateTime.FromDMY(self.mintime.day,self.mintime.month-1,self.mintime.year,)
etfit = wx.DateTime.FromDMY(self.maxtime.day,self.maxtime.month-1,self.maxtime.year,)
"""
try:
stfit = wx.DateTime.FromDMY(self.mintime.day,self.mintime.month,self.mintime.year,)
etfit = wx.DateTime.FromDMY(self.maxtime.day,self.maxtime.month,self.maxtime.year,)
Expand All @@ -2099,7 +2102,7 @@ def createControls(self):
stfit = stfit.SetYear(int(time.strftime("%Y",sttup)))
except:
pass

"""
self.funcLabel = wx.StaticText(self, label="Fit function:",size=(160,30))
self.funcComboBox = wx.ComboBox(self, choices=self.funclist,
style=wx.CB_DROPDOWN, value=self.fitfunc,size=(160,-1))
Expand Down

0 comments on commit ae91462

Please sign in to comment.