Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
0458926
fix frmFlagValues issue when no flags in db
Dec 18, 2015
2f563cf
add background code for new save_appending functionality, double chec…
Dec 21, 2015
8b6706d
Merge branch 'append_gui' into append_save
Dec 29, 2015
fc1a084
add gui for new save appending functionality
Dec 29, 2015
2005161
remove extra files:
Dec 29, 2015
ed715bb
add sql server driver specification
Jan 6, 2016
e60c9c4
remove radio button from 'save as' label
Apr 6, 2016
e151d3f
change save message to 'append' instead of 'overwrite'
Apr 6, 2016
c5c7bd5
fix save message so only a keyword is changed
Apr 6, 2016
af8c4b2
fix saving append issues
Apr 7, 2016
315bcdf
remove unneeded print statements
Apr 7, 2016
365682e
add requirements files
Apr 25, 2016
509c872
add conda environment config file
Apr 25, 2016
8ea9a38
Merge pull request #254 from ODM2/flag_issue
Apr 25, 2016
88c5cec
add basic travis setup
Apr 25, 2016
9371821
update testing code
Apr 26, 2016
1612e80
Merge pull request #265 from ODM2/append_save
Apr 26, 2016
0447c58
fix .travis.yml file
Apr 26, 2016
2271b28
update tests
Apr 28, 2016
f7244b3
add message box before stop edit
Apr 28, 2016
d848f9a
fix requirements_test.txt
Apr 28, 2016
ff59e7c
deselect lasso and fix error when edit series is not selected for pl…
Apr 29, 2016
adaffe5
fix issue #264
Apr 29, 2016
50c53a0
retain plotting series after saving
May 4, 2016
2868517
add testing data
May 4, 2016
b739c06
update db connection to ehlp switch connections
May 5, 2016
19c2cbe
update version
May 9, 2016
5ce5e4b
Merge pull request #268 from ODM2/fix_editing
May 9, 2016
8d3429b
Merge pull request #269 from ODM2/Dev
May 9, 2016
ca77c98
update tests, add iss files for windows setup
May 10, 2016
4ac6385
Merging
May 10, 2016
b923f7e
update all tests
May 10, 2016
4ada630
test changing req file
May 11, 2016
939df75
try to fix numpy error with Travis CI
May 11, 2016
34a6cab
try removing matplotlib req for travis CI
May 11, 2016
8953214
testing travis
May 11, 2016
866587e
test travis
May 11, 2016
5830599
updat version number
May 17, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
language: python
sudo: required
# if the https://travis-ci.org/ODM2/ODMToolsPython/requests ever says: missing config
# validate at: http://lint.travis-ci.org/
python:
# - "2.6"
- "2.7"
# - "3.2"
# - "3.3"
# - "3.4"
# - "3.5"
# - "3.5-dev" # 3.5 development branch
# - "nightly" # currently points to 3.6-dev
# command to install dependencies
cache:
directories:
- $HOME/.cache/pip/wheels
- $HOME/virtualenv/python2.7.9
services:
- mysql
- postgresql
addons:
apt:
packages:
- cmake
- unixodbc
- unixodbc-dev
- odbcinst1debian2
- odbcinst
- freetds-dev
- freetds-bin
- tdsodbc
- libc6
- e2fsprogs
- mysql-client
- libproj-dev
- python-wxgtk2.8
- python-wxtools
- wx2.8-doc
- wx2.8-examples
- wx2.8-headers
- wx2.8-i18n

# mariadb: '10.1'
before_script:
- ./scripts/tests/mysql_setup.sh
- ./scripts/tests/postgres_setup.sh
- ./scripts/tests/freetds.sh

before_install:
# python -m pip makes the install go into the virtualenv
- python -m pip install pandas
- export PYMSSQL_BUILD_WITH_BUNDLED_FREETDS=1;python -m pip install pymssql
# - python -m pip install mysql-python
install: # now just our code
- pip install geoalchemy2
- pip install -r requirements_tests.txt --allow-external pyodbc --allow-unverified pyodbc
- pip list

# don't forget to open up the azure mssql server to these addreses
# https://docs.travis-ci.com/user/ip-addresses/

# command to run tests
script:

- py.test

409 changes: 409 additions & 0 deletions doc/wxFormBuilder/Save Wizard.fbp

Large diffs are not rendered by default.

105 changes: 105 additions & 0 deletions doc/wxFormBuilder/clsExisting.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# -*- coding: utf-8 -*-

###########################################################################
## Python code generated with wxFormBuilder (version Jun 5 2014)
## http://www.wxformbuilder.org/
##
## PLEASE DO "NOT" EDIT THIS FILE!
###########################################################################

import wx
import wx.xrc

###########################################################################
## Class pnlExisting
###########################################################################

class pnlExisting ( wx.Panel ):

def __init__( self, parent ):
wx.Panel.__init__ ( self, parent, id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.Size( 500,300 ), style = wx.TAB_TRAVERSAL )

bSizer1 = wx.BoxSizer( wx.VERTICAL )

self.lblExisting = wx.StaticText( self, wx.ID_ANY, u"Select an Existing Series:", wx.DefaultPosition, wx.DefaultSize, 0 )
self.lblExisting.Wrap( -1 )
bSizer1.Add( self.lblExisting, 0, wx.ALL, 5 )

self.olvSeriesList = wx.ListCtrl( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LC_ICON )
bSizer1.Add( self.olvSeriesList, 100, wx.ALL|wx.EXPAND, 5 )

self.m_panel1 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
bSizer1.Add( self.m_panel1, 1, wx.EXPAND |wx.ALL, 5 )

bSizer6 = wx.BoxSizer( wx.HORIZONTAL )

self.m_panel3 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
bSizer6.Add( self.m_panel3, 10, wx.EXPAND |wx.ALL, 5 )

bSizer2 = wx.BoxSizer( wx.VERTICAL )

self.rbOverwrite = wx.RadioButton( self, wx.ID_ANY, u"Overwrite Entire Series", wx.DefaultPosition, wx.DefaultSize, 0 )
bSizer2.Add( self.rbOverwrite, 0, wx.ALL, 5 )

self.rbAppend = wx.RadioButton( self, wx.ID_ANY, u"Append To Series", wx.DefaultPosition, wx.DefaultSize, 0 )
bSizer2.Add( self.rbAppend, 0, wx.ALL, 5 )

bSizer5 = wx.BoxSizer( wx.HORIZONTAL )

self.m_panel2 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
bSizer5.Add( self.m_panel2, 10, wx.EXPAND |wx.ALL, 5 )

bSizer3 = wx.BoxSizer( wx.VERTICAL )

self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"If Data Overlaps:", wx.DefaultPosition, wx.DefaultSize, 0 )
self.m_staticText2.Wrap( -1 )
self.m_staticText2.Enable( False )

bSizer3.Add( self.m_staticText2, 0, wx.ALL, 5 )

self.rbNew = wx.RadioButton( self, wx.ID_ANY, u"Keep New", wx.DefaultPosition, wx.DefaultSize, 0 )
self.rbNew.Enable( False )

bSizer3.Add( self.rbNew, 0, wx.ALL, 5 )

self.rbOriginal = wx.RadioButton( self, wx.ID_ANY, u"Keep Original", wx.DefaultPosition, wx.DefaultSize, 0 )
self.rbOriginal.Enable( False )

bSizer3.Add( self.rbOriginal, 0, wx.ALL, 5 )


bSizer5.Add( bSizer3, 90, wx.EXPAND, 5 )


bSizer2.Add( bSizer5, 1, wx.EXPAND, 5 )


bSizer6.Add( bSizer2, 90, wx.EXPAND, 5 )


bSizer1.Add( bSizer6, 1, wx.EXPAND, 5 )


self.SetSizer( bSizer1 )
self.Layout()

# Connect Events
self.olvSeriesList.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnOLVItemSelected )
self.rbOverwrite.Bind( wx.EVT_RADIOBUTTON, self.onOverwrite )
self.rbAppend.Bind( wx.EVT_RADIOBUTTON, self.onAppend )

def __del__( self ):
pass


# Virtual event handlers, overide them in your derived class
def OnOLVItemSelected( self, event ):
event.Skip()

def onOverwrite( self, event ):
event.Skip()

def onAppend( self, event ):
event.Skip()


115 changes: 115 additions & 0 deletions doc/wxFormBuilder/clsIntro.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
# -*- coding: utf-8 -*-

###########################################################################
## Python code generated with wxFormBuilder (version Jun 5 2014)
## http://www.wxformbuilder.org/
##
## PLEASE DO "NOT" EDIT THIS FILE!
###########################################################################

import wx
import wx.xrc
import wx.aui

###########################################################################
## Class pnlIntro
###########################################################################

class pnlIntro ( wx.Panel ):

def __init__( self, parent ):
wx.Panel.__init__ ( self, parent, id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.Size( 500,300 ), style = wx.TAB_TRAVERSAL )

self.m_mgr = wx.aui.AuiManager()
self.m_mgr.SetManagedWindow( self )
self.m_mgr.SetFlags(wx.aui.AUI_MGR_DEFAULT)

self.m_panel2 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
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 ) )

bSizer2 = wx.BoxSizer( wx.VERTICAL )

self.lblHow = wx.StaticText( self.m_panel2, wx.ID_ANY, u"How would you like to save the series?", wx.DefaultPosition, wx.DefaultSize, 0 )
self.lblHow.Wrap( -1 )
bSizer2.Add( self.lblHow, 0, wx.ALL, 15 )

bSizer3 = wx.BoxSizer( wx.HORIZONTAL )

self.m_panel3 = wx.Panel( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
bSizer3.Add( self.m_panel3, 10, wx.EXPAND |wx.ALL, 5 )

self.rbSave = wx.RadioButton( self.m_panel2, wx.ID_ANY, u"Save ", wx.DefaultPosition, wx.DefaultSize, wx.RB_GROUP )
self.rbSave.SetValue( True )
bSizer3.Add( self.rbSave, 90, wx.ALL, 5 )


bSizer2.Add( bSizer3, 1, wx.EXPAND, 5 )

bSizer4 = wx.BoxSizer( wx.HORIZONTAL )

self.m_panel4 = wx.Panel( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
bSizer4.Add( self.m_panel4, 10, wx.EXPAND |wx.ALL, 5 )

self.rbSaveAsOption = wx.RadioButton( self.m_panel2, wx.ID_ANY, u"Save As.. ", wx.DefaultPosition, wx.DefaultSize, 0 )
self.rbSaveAsOption.Enable( False )

bSizer4.Add( self.rbSaveAsOption, 90, wx.ALL, 5 )


bSizer2.Add( bSizer4, 1, wx.EXPAND, 0 )

bSizer5 = wx.BoxSizer( wx.HORIZONTAL )

self.m_panel5 = wx.Panel( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
bSizer5.Add( self.m_panel5, 20, wx.EXPAND |wx.ALL, 5 )

self.rbSaveExisting = wx.RadioButton( self.m_panel2, wx.ID_ANY, u"Existing Series", wx.DefaultPosition, wx.DefaultSize, 0 )
bSizer5.Add( self.rbSaveExisting, 90, wx.ALL, 5 )


bSizer2.Add( bSizer5, 1, wx.EXPAND, 5 )

bSizer51 = wx.BoxSizer( wx.HORIZONTAL )

self.m_panel51 = wx.Panel( self.m_panel2, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
bSizer51.Add( self.m_panel51, 20, wx.EXPAND |wx.ALL, 5 )

self.rbSaveAs = wx.RadioButton( self.m_panel2, wx.ID_ANY, u"New Series", wx.DefaultPosition, wx.DefaultSize, 0 )
bSizer51.Add( self.rbSaveAs, 90, wx.ALL, 5 )


bSizer2.Add( bSizer51, 1, wx.EXPAND, 5 )


bSizer2.AddSpacer( ( 10, 150), 1, wx.EXPAND, 5 )


self.m_panel2.SetSizer( bSizer2 )
self.m_panel2.Layout()
bSizer2.Fit( self.m_panel2 )

self.m_mgr.Update()

# Connect Events
self.rbSave.Bind( wx.EVT_RADIOBUTTON, self.OnBtnSaveRadiobutton )
self.rbSaveAsOption.Bind( wx.EVT_RADIOBUTTON, self.OnBtnSaveAsRadiobutton )
self.rbSaveExisting.Bind( wx.EVT_RADIOBUTTON, self.OnBtnSaveExistingRadiobuton )
self.rbSaveAs.Bind( wx.EVT_RADIOBUTTON, self.OnBtnSaveExistingRadiobuton )

def __del__( self ):
self.m_mgr.UnInit()



# Virtual event handlers, overide them in your derived class
def OnBtnSaveRadiobutton( self, event ):
event.Skip()

def OnBtnSaveAsRadiobutton( self, event ):
event.Skip()

def OnBtnSaveExistingRadiobuton( self, event ):
event.Skip()



Loading