Skip to content

Commit d0025bc

Browse files
author
stephanie
committed
merge
2 parents a6df231 + 5830599 commit d0025bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+275296
-181
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*.so
44
*.log
55
__pycache__
6+
.cache
67
htmlcov
78

89
# Packages

‎.travis.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
language: python
2+
sudo: required
3+
# if the https://travis-ci.org/ODM2/ODMToolsPython/requests ever says: missing config
4+
# validate at: http://lint.travis-ci.org/
5+
python:
6+
# - "2.6"
7+
- "2.7"
8+
# - "3.2"
9+
# - "3.3"
10+
# - "3.4"
11+
# - "3.5"
12+
# - "3.5-dev" # 3.5 development branch
13+
# - "nightly" # currently points to 3.6-dev
14+
# command to install dependencies
15+
cache:
16+
directories:
17+
- $HOME/.cache/pip/wheels
18+
- $HOME/virtualenv/python2.7.9
19+
services:
20+
- mysql
21+
- postgresql
22+
addons:
23+
apt:
24+
packages:
25+
- cmake
26+
- unixodbc
27+
- unixodbc-dev
28+
- odbcinst1debian2
29+
- odbcinst
30+
- freetds-dev
31+
- freetds-bin
32+
- tdsodbc
33+
- libc6
34+
- e2fsprogs
35+
- mysql-client
36+
- libproj-dev
37+
- python-wxgtk2.8
38+
- python-wxtools
39+
- wx2.8-doc
40+
- wx2.8-examples
41+
- wx2.8-headers
42+
- wx2.8-i18n
43+
44+
# mariadb: '10.1'
45+
before_script:
46+
- ./scripts/tests/mysql_setup.sh
47+
- ./scripts/tests/postgres_setup.sh
48+
- ./scripts/tests/freetds.sh
49+
50+
before_install:
51+
# python -m pip makes the install go into the virtualenv
52+
- python -m pip install pandas
53+
- export PYMSSQL_BUILD_WITH_BUNDLED_FREETDS=1;python -m pip install pymssql
54+
# - python -m pip install mysql-python
55+
install: # now just our code
56+
- pip install geoalchemy2
57+
- pip install -r requirements_tests.txt --allow-external pyodbc --allow-unverified pyodbc
58+
- pip list
59+
60+
# don't forget to open up the azure mssql server to these addreses
61+
# https://docs.travis-ci.com/user/ip-addresses/
62+
63+
# command to run tests
64+
script:
65+
66+
- py.test
67+

‎doc/wxFormBuilder/Save Wizard.fbp

Lines changed: 409 additions & 0 deletions
Large diffs are not rendered by default.

‎doc/wxFormBuilder/clsExisting.py

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
# -*- coding: utf-8 -*-
2+
3+
###########################################################################
4+
## Python code generated with wxFormBuilder (version Jun 5 2014)
5+
## http://www.wxformbuilder.org/
6+
##
7+
## PLEASE DO "NOT" EDIT THIS FILE!
8+
###########################################################################
9+
10+
import wx
11+
import wx.xrc
12+
13+
###########################################################################
14+
## Class pnlExisting
15+
###########################################################################
16+
17+
class pnlExisting ( wx.Panel ):
18+
19+
def __init__( self, parent ):
20+
wx.Panel.__init__ ( self, parent, id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.Size( 500,300 ), style = wx.TAB_TRAVERSAL )
21+
22+
bSizer1 = wx.BoxSizer( wx.VERTICAL )
23+
24+
self.lblExisting = wx.StaticText( self, wx.ID_ANY, u"Select an Existing Series:", wx.DefaultPosition, wx.DefaultSize, 0 )
25+
self.lblExisting.Wrap( -1 )
26+
bSizer1.Add( self.lblExisting, 0, wx.ALL, 5 )
27+
28+
self.olvSeriesList = wx.ListCtrl( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LC_ICON )
29+
bSizer1.Add( self.olvSeriesList, 100, wx.ALL|wx.EXPAND, 5 )
30+
31+
self.m_panel1 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
32+
bSizer1.Add( self.m_panel1, 1, wx.EXPAND |wx.ALL, 5 )
33+
34+
bSizer6 = wx.BoxSizer( wx.HORIZONTAL )
35+
36+
self.m_panel3 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
37+
bSizer6.Add( self.m_panel3, 10, wx.EXPAND |wx.ALL, 5 )
38+
39+
bSizer2 = wx.BoxSizer( wx.VERTICAL )
40+
41+
self.rbOverwrite = wx.RadioButton( self, wx.ID_ANY, u"Overwrite Entire Series", wx.DefaultPosition, wx.DefaultSize, 0 )
42+
bSizer2.Add( self.rbOverwrite, 0, wx.ALL, 5 )
43+
44+
self.rbAppend = wx.RadioButton( self, wx.ID_ANY, u"Append To Series", wx.DefaultPosition, wx.DefaultSize, 0 )
45+
bSizer2.Add( self.rbAppend, 0, wx.ALL, 5 )
46+
47+
bSizer5 = wx.BoxSizer( wx.HORIZONTAL )
48+
49+
self.m_panel2 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
50+
bSizer5.Add( self.m_panel2, 10, wx.EXPAND |wx.ALL, 5 )
51+
52+
bSizer3 = wx.BoxSizer( wx.VERTICAL )
53+
54+
self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"If Data Overlaps:", wx.DefaultPosition, wx.DefaultSize, 0 )
55+
self.m_staticText2.Wrap( -1 )
56+
self.m_staticText2.Enable( False )
57+
58+
bSizer3.Add( self.m_staticText2, 0, wx.ALL, 5 )
59+
60+
self.rbNew = wx.RadioButton( self, wx.ID_ANY, u"Keep New", wx.DefaultPosition, wx.DefaultSize, 0 )
61+
self.rbNew.Enable( False )
62+
63+
bSizer3.Add( self.rbNew, 0, wx.ALL, 5 )
64+
65+
self.rbOriginal = wx.RadioButton( self, wx.ID_ANY, u"Keep Original", wx.DefaultPosition, wx.DefaultSize, 0 )
66+
self.rbOriginal.Enable( False )
67+
68+
bSizer3.Add( self.rbOriginal, 0, wx.ALL, 5 )
69+
70+
71+
bSizer5.Add( bSizer3, 90, wx.EXPAND, 5 )
72+
73+
74+
bSizer2.Add( bSizer5, 1, wx.EXPAND, 5 )
75+
76+
77+
bSizer6.Add( bSizer2, 90, wx.EXPAND, 5 )
78+
79+
80+
bSizer1.Add( bSizer6, 1, wx.EXPAND, 5 )
81+
82+
83+
self.SetSizer( bSizer1 )
84+
self.Layout()
85+
86+
# Connect Events
87+
self.olvSeriesList.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnOLVItemSelected )
88+
self.rbOverwrite.Bind( wx.EVT_RADIOBUTTON, self.onOverwrite )
89+
self.rbAppend.Bind( wx.EVT_RADIOBUTTON, self.onAppend )
90+
91+
def __del__( self ):
92+
pass
93+
94+
95+
# Virtual event handlers, overide them in your derived class
96+
def OnOLVItemSelected( self, event ):
97+
event.Skip()
98+
99+
def onOverwrite( self, event ):
100+
event.Skip()
101+
102+
def onAppend( self, event ):
103+
event.Skip()
104+
105+

‎doc/wxFormBuilder/clsIntro.py

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
# -*- coding: utf-8 -*-
2+
3+
###########################################################################
4+
## Python code generated with wxFormBuilder (version Jun 5 2014)
5+
## http://www.wxformbuilder.org/
6+
##
7+
## PLEASE DO "NOT" EDIT THIS FILE!
8+
###########################################################################
9+
10+
import wx
11+
import wx.xrc
12+
import wx.aui
13+
14+
###########################################################################
15+
## Class pnlIntro
16+
###########################################################################
17+
18+
class pnlIntro ( wx.Panel ):
19+
20+
def __init__( self, parent ):
21+
wx.Panel.__init__ ( self, parent, id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.Size( 500,300 ), style = wx.TAB_TRAVERSAL )
22+
23+
self.m_mgr = wx.aui.AuiManager()
24+
self.m_mgr.SetManagedWindow( self )
25+
self.m_mgr.SetFlags(wx.aui.AUI_MGR_DEFAULT)
26+
27+
self.m_panel2 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
28+
self.m_mgr.AddPane( self.m_panel2, wx.aui.AuiPaneInfo() .Center() .CaptionVisible( False ).CloseButton( False ).PaneBorder( False ).Movable( False ).Dock().Resizable().FloatingSize( wx.DefaultSize ).BottomDockable( False ).TopDockable( False ).LeftDockable( False ).RightDockable( False ).Floatable( False ) )
29+
30+
bSizer2 = wx.BoxSizer( wx.VERTICAL )
31+
32+
self.lblHow = wx.StaticText( self.m_panel2, wx.ID_ANY, u"How would you like to save the series?", wx.DefaultPosition, wx.DefaultSize, 0 )
33+
self.lblHow.Wrap( -1 )
34+
bSizer2.Add( self.lblHow, 0, wx.ALL, 15 )
35+
36+
bSizer3 = wx.BoxSizer( wx.HORIZONTAL )
37+
38+
self.m_panel3 = wx.Panel( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
39+
bSizer3.Add( self.m_panel3, 10, wx.EXPAND |wx.ALL, 5 )
40+
41+
self.rbSave = wx.RadioButton( self.m_panel2, wx.ID_ANY, u"Save ", wx.DefaultPosition, wx.DefaultSize, wx.RB_GROUP )
42+
self.rbSave.SetValue( True )
43+
bSizer3.Add( self.rbSave, 90, wx.ALL, 5 )
44+
45+
46+
bSizer2.Add( bSizer3, 1, wx.EXPAND, 5 )
47+
48+
bSizer4 = wx.BoxSizer( wx.HORIZONTAL )
49+
50+
self.m_panel4 = wx.Panel( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
51+
bSizer4.Add( self.m_panel4, 10, wx.EXPAND |wx.ALL, 5 )
52+
53+
self.rbSaveAsOption = wx.RadioButton( self.m_panel2, wx.ID_ANY, u"Save As.. ", wx.DefaultPosition, wx.DefaultSize, 0 )
54+
self.rbSaveAsOption.Enable( False )
55+
56+
bSizer4.Add( self.rbSaveAsOption, 90, wx.ALL, 5 )
57+
58+
59+
bSizer2.Add( bSizer4, 1, wx.EXPAND, 0 )
60+
61+
bSizer5 = wx.BoxSizer( wx.HORIZONTAL )
62+
63+
self.m_panel5 = wx.Panel( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
64+
bSizer5.Add( self.m_panel5, 20, wx.EXPAND |wx.ALL, 5 )
65+
66+
self.rbSaveExisting = wx.RadioButton( self.m_panel2, wx.ID_ANY, u"Existing Series", wx.DefaultPosition, wx.DefaultSize, 0 )
67+
bSizer5.Add( self.rbSaveExisting, 90, wx.ALL, 5 )
68+
69+
70+
bSizer2.Add( bSizer5, 1, wx.EXPAND, 5 )
71+
72+
bSizer51 = wx.BoxSizer( wx.HORIZONTAL )
73+
74+
self.m_panel51 = wx.Panel( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
75+
bSizer51.Add( self.m_panel51, 20, wx.EXPAND |wx.ALL, 5 )
76+
77+
self.rbSaveAs = wx.RadioButton( self.m_panel2, wx.ID_ANY, u"New Series", wx.DefaultPosition, wx.DefaultSize, 0 )
78+
bSizer51.Add( self.rbSaveAs, 90, wx.ALL, 5 )
79+
80+
81+
bSizer2.Add( bSizer51, 1, wx.EXPAND, 5 )
82+
83+
84+
bSizer2.AddSpacer( ( 10, 150), 1, wx.EXPAND, 5 )
85+
86+
87+
self.m_panel2.SetSizer( bSizer2 )
88+
self.m_panel2.Layout()
89+
bSizer2.Fit( self.m_panel2 )
90+
91+
self.m_mgr.Update()
92+
93+
# Connect Events
94+
self.rbSave.Bind( wx.EVT_RADIOBUTTON, self.OnBtnSaveRadiobutton )
95+
self.rbSaveAsOption.Bind( wx.EVT_RADIOBUTTON, self.OnBtnSaveAsRadiobutton )
96+
self.rbSaveExisting.Bind( wx.EVT_RADIOBUTTON, self.OnBtnSaveExistingRadiobuton )
97+
self.rbSaveAs.Bind( wx.EVT_RADIOBUTTON, self.OnBtnSaveExistingRadiobuton )
98+
99+
def __del__( self ):
100+
self.m_mgr.UnInit()
101+
102+
103+
104+
# Virtual event handlers, overide them in your derived class
105+
def OnBtnSaveRadiobutton( self, event ):
106+
event.Skip()
107+
108+
def OnBtnSaveAsRadiobutton( self, event ):
109+
event.Skip()
110+
111+
def OnBtnSaveExistingRadiobuton( self, event ):
112+
event.Skip()
113+
114+
115+

0 commit comments

Comments
 (0)