Skip to content

Commit edb3cf2

Browse files
author
Stephanie Reeder
authored
Merge pull request #291 from ODM2/Beta_1.2.7
Beta 1.2.7
2 parents 10d5fcd + ff730a7 commit edb3cf2

30 files changed

+570
-126
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,5 @@ setup/Output/setup.exe
6565
Temp
6666

6767
*.app
68-
*.spec
6968

7069

‎.travis.yml

+8-11
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ addons:
4242
- wx2.8-i18n
4343

4444

45-
# mariadb: '10.1'
46-
before_script:
47-
- ./ci-helpers/travis/mysql_setup.sh
48-
- ./ci-helpers/travis/postgres_setup.sh
49-
- ./ci-helpers/travis/freetds.sh
45+
5046

5147

5248
before_install:
@@ -65,12 +61,13 @@ install: # now just our code
6561

6662
# mariadb: '10.1'
6763
before_script:
68-
- chmod +x ./tests/scripts/mysql_setup.sh
69-
# - chmod +x ./tests/scripts/postgres_setup.sh
70-
- chmod +x ./tests/scripts/freetds.sh
71-
- ./tests/scripts/mysql_setup.sh
72-
# - ./tests/scripts/postgres_setup.sh
73-
- ./tests/scripts/freetds.sh
64+
- chmod +x ./ci-helpers/travis/mysql_setup.sh
65+
# - chmod +x ./ci-helpers/travis/postgres_setup.sh
66+
- chmod +x ./ci-helpers/travis/freetds.sh
67+
68+
- ./ci-helpers/travis/mysql_setup.sh
69+
# - ./ci-helpers/travis/postgres_setup.sh
70+
- ./ci-helpers/travis/freetds.sh
7471

7572
# command to run tests
7673
script:

‎appveyor.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ install:
9393
# the parent CMD process).
9494
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
9595
# add databases
96-
- "SET PATH=%POSTGRES_PATH%\bin;%MYSQL_PATH%\bin;%PATH%"
96+
- "SET PATH=%POSTGRES_PATH%\\bin;%MYSQL_PATH%\\bin;%PATH%"
9797
- "activate test"
9898

9999
# Check that we have the expected version and architecture for Python
@@ -110,12 +110,12 @@ build_script:
110110
- sqlcmd -S localhost,1433 -U sa -P Password12! -Q "CREATE DATABASE odm" -d "master"
111111
- sqlcmd -S localhost,1433 -U sa -P Password12! -i tests\data\sampledb\odm_mssql.sql -d "odm"
112112
- sqlcmd -S localhost,1433 -U sa -P Password12! -Q "select table_name from information_schema.tables" -d "odm"
113-
# # postgres
114-
# - psql createdb odm
115-
# - psql -d odm -a -f tests\data\sampledb\odm_postgres.sql
116-
# # mysql
117-
# - mysql -e "drop database test; create database odm;" --user=root
118-
# - mysql odm < tests\data\sampledb\odm_mysql.sql --user=root
113+
# postgres
114+
- psql createdb odm
115+
- psql -d odm -a -f tests\data\sampledb\odm_postgres.sql
116+
# mysql
117+
- mysql -e "drop database test; create database odm;" --user=root
118+
- mysql odm < tests\data\sampledb\odm_mysql.sql --user=root
119119

120120
test_script:
121121
# Run the project tests

‎ci-helpers/travis/mysql_setup.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ mysql -e "create database IF NOT EXISTS odm2test;" --user=root
2121
#####
2222
# install
2323
#####
24-
ls -al ./tests/scripts/sampledb/odm_mysql.sql ./tests/scripts/sampledb/odm_postgres.sql
25-
mysql --user=ODM --password=odm odm < ./tests/scripts/sampledb/odm_mysql.sql
24+
ls -al ./tests/data/sampledb/odm_mysql.sql ./tests/data/sampledb/odm_postgres.sql
25+
mysql --user=ODM --password=odm odm < ./tests/data/sampledb/odm_mysql.sql
2626
mysql --user=root -e "show databases;"
2727
mysql --user=root -e "GRANT ALL PRIVILEGES ON odm.* TO 'ODM'@'localhost';FLUSH PRIVILEGES;"
2828
# these should produce results, if they don't the lower_case_table_names failed

‎ci-helpers/travis/postgres_setup.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
psql -U postgres -c "create extension postgis"
33
psql -c 'DROP DATABASE IF EXISTS odmtest;' -U postgres;
44
psql -c 'create database odmtest;' -U postgres;
5-
#psql -U postgres -d odmtest -a -f ./tests/scripts/sampledb/odm_postgres.sql
5+
#psql -U postgres -d odmtest -a -f ./tests/data/sampledb/odm_postgres.sql
66
psql -c 'DROP DATABASE IF EXISTS odm;' -U postgres;
77
psql -c 'create database odm;' -U postgres;
88
## install
99
# add -a to psql to see full log, -q is quiet
10-
psql -U postgres -q -f ./tests/scripts/sampledb/odm_postgres.sql
10+
psql -U postgres -q -f ./tests/data/sampledb/odm_postgres.sql

‎doc/wxFormBuilder/Data Filter Form.fbp

+90-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<property name="internationalize">0</property>
1818
<property name="name">frmDataFilter</property>
1919
<property name="namespace"></property>
20-
<property name="path">/home/denver/Desktop</property>
20+
<property name="path">C:\Users\Stephanie\Desktop</property>
2121
<property name="precompiled_header"></property>
2222
<property name="relative_path">1</property>
2323
<property name="skip_lua_events">1</property>
@@ -44,7 +44,7 @@
4444
<property name="minimum_size">358,452</property>
4545
<property name="name">clsDataFilters</property>
4646
<property name="pos">599,384</property>
47-
<property name="size">382,499</property>
47+
<property name="size">382,547</property>
4848
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
4949
<property name="subclass"></property>
5050
<property name="title">Data Filter</property>
@@ -2342,6 +2342,94 @@
23422342
</object>
23432343
</object>
23442344
</object>
2345+
<object class="sizeritem" expanded="1">
2346+
<property name="border">5</property>
2347+
<property name="flag">wxALL</property>
2348+
<property name="proportion">0</property>
2349+
<object class="wxRadioButton" expanded="1">
2350+
<property name="BottomDockable">1</property>
2351+
<property name="LeftDockable">1</property>
2352+
<property name="RightDockable">1</property>
2353+
<property name="TopDockable">1</property>
2354+
<property name="aui_layer"></property>
2355+
<property name="aui_name"></property>
2356+
<property name="aui_position"></property>
2357+
<property name="aui_row"></property>
2358+
<property name="best_size"></property>
2359+
<property name="bg"></property>
2360+
<property name="caption"></property>
2361+
<property name="caption_visible">1</property>
2362+
<property name="center_pane">0</property>
2363+
<property name="close_button">1</property>
2364+
<property name="context_help"></property>
2365+
<property name="context_menu">1</property>
2366+
<property name="default_pane">0</property>
2367+
<property name="dock">Dock</property>
2368+
<property name="dock_fixed">0</property>
2369+
<property name="docking">Left</property>
2370+
<property name="enabled">1</property>
2371+
<property name="fg"></property>
2372+
<property name="floatable">1</property>
2373+
<property name="font"></property>
2374+
<property name="gripper">0</property>
2375+
<property name="hidden">0</property>
2376+
<property name="id">wxID_ANY</property>
2377+
<property name="label"> Duplicate Values</property>
2378+
<property name="max_size"></property>
2379+
<property name="maximize_button">0</property>
2380+
<property name="maximum_size"></property>
2381+
<property name="min_size"></property>
2382+
<property name="minimize_button">0</property>
2383+
<property name="minimum_size"></property>
2384+
<property name="moveable">1</property>
2385+
<property name="name">rbDuplicate</property>
2386+
<property name="pane_border">1</property>
2387+
<property name="pane_position"></property>
2388+
<property name="pane_size"></property>
2389+
<property name="permission">protected</property>
2390+
<property name="pin_button">1</property>
2391+
<property name="pos">10,8</property>
2392+
<property name="resize">Resizable</property>
2393+
<property name="show">1</property>
2394+
<property name="size"></property>
2395+
<property name="style"></property>
2396+
<property name="subclass"></property>
2397+
<property name="toolbar_pane">0</property>
2398+
<property name="tooltip"></property>
2399+
<property name="validator_data_type"></property>
2400+
<property name="validator_style">wxFILTER_NONE</property>
2401+
<property name="validator_type">wxDefaultValidator</property>
2402+
<property name="validator_variable"></property>
2403+
<property name="value">0</property>
2404+
<property name="window_extra_style"></property>
2405+
<property name="window_name"></property>
2406+
<property name="window_style"></property>
2407+
<event name="OnChar"></event>
2408+
<event name="OnEnterWindow"></event>
2409+
<event name="OnEraseBackground"></event>
2410+
<event name="OnKeyDown"></event>
2411+
<event name="OnKeyUp"></event>
2412+
<event name="OnKillFocus"></event>
2413+
<event name="OnLeaveWindow"></event>
2414+
<event name="OnLeftDClick"></event>
2415+
<event name="OnLeftDown"></event>
2416+
<event name="OnLeftUp"></event>
2417+
<event name="OnMiddleDClick"></event>
2418+
<event name="OnMiddleDown"></event>
2419+
<event name="OnMiddleUp"></event>
2420+
<event name="OnMotion"></event>
2421+
<event name="OnMouseEvents"></event>
2422+
<event name="OnMouseWheel"></event>
2423+
<event name="OnPaint"></event>
2424+
<event name="OnRadioButton"></event>
2425+
<event name="OnRightDClick"></event>
2426+
<event name="OnRightDown"></event>
2427+
<event name="OnRightUp"></event>
2428+
<event name="OnSetFocus"></event>
2429+
<event name="OnSize"></event>
2430+
<event name="OnUpdateUI"></event>
2431+
</object>
2432+
</object>
23452433
<object class="sizeritem" expanded="0">
23462434
<property name="border">5</property>
23472435
<property name="flag">wxALL|wxEXPAND</property>

‎make.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,13 @@ def run_pyinstaller(console=False):
154154
'--distpath=%s ' % WIN_DIR +
155155
'--workpath=%s ' % WORK_DIR +
156156
'--specpath=%s ' % WIN_DIR +
157-
'--upx-dir=%s ' % BASE_DIR +
157+
#'--upx-dir=%s ' % BASE_DIR +
158+
'--noupx '
158159
'--icon=%s ' % WIN_ICON_FILE +
159160
'--version-file=%s ' % VERSION_FILE +
161+
'--onedir '
160162
# '--onefile ' +
163+
'--exclude=
161164
'--noconfirm ' + APP_FILE)
162165
else:
163166
## Non Console Version
@@ -166,8 +169,10 @@ def run_pyinstaller(console=False):
166169
'--distpath=%s ' % WIN_DIR +
167170
'--workpath=%s ' % WORK_DIR +
168171
'--specpath=%s ' % WIN_DIR +
169-
'--upx-dir=%s ' % BASE_DIR +
172+
#'--upx-dir=%s ' % BASE_DIR +
173+
'--noupx '
170174
'--icon=%s ' % WIN_ICON_FILE +
175+
'--onedir '
171176
# '--onefile ' +
172177
'--version-file=%s ' % VERSION_FILE +
173178
'--noconsole '
@@ -248,7 +253,6 @@ def main():
248253
run_inno(scriptpath)
249254

250255
print "Create No Installer "
251-
252256
## Create Shortcut
253257
## Create File
254258
## Zip Executable

‎odmtools/controller/frmDataFilters.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def __init__(self, parent, series):
2727
self.Center()
2828

2929
# self.chkToggleFilterSelection.SetValue(self.recordService.get_toggle())
30-
# self.setDates()
30+
self.setDates()
3131

3232

3333
def onCheckBox(self, event):
@@ -115,6 +115,9 @@ def onBtnApplyButton(self, event):
115115
elif self.txtVChangeLT.GetValue():
116116
self.recordService.value_change_threshold(float(self.txtVChangeLT.GetValue()), '<')
117117

118+
elif self.rbDuplicate.GetValue():
119+
self.recordService.duplicate_value_filter()
120+
118121
event.Skip()
119122

120123

‎odmtools/controller/logicEditTools.py

+7
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@ def value_change_threshold(self, value, operator):
6565
self._script("edit_service.change_value_threshold(%s,'%s')\n" % (value, operator), 'black')
6666
Publisher.sendMessage("scroll")
6767

68+
def duplicate_value_filter(self):
69+
self._edit_service.duplicate_value_filter()
70+
self.refresh_selection()
71+
if self._record:
72+
self._script("edit_service.duplicate_value_filter()\n" , 'black')
73+
Publisher.sendMessage("scroll")
74+
6875
def filter_from_previous(self, value):
6976
'''
7077

‎odmtools/gui/frmODMTools.py

+12-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from odmtools.controller.frmDataTable import FrmDataTable
1313
import mnuRibbon
1414
import pnlPlot
15+
import pnlPlot
1516
import pnlDataTable
1617
import wx.lib.agw.aui as aui
1718
import wx.py.crust
@@ -55,6 +56,7 @@ def __init__(self, **kwargs):
5556

5657
self.service_manager = ServiceManager()
5758
self.record_service = None
59+
self.scriptcreate = False
5860

5961
series_service = self._init_database()
6062
if series_service:
@@ -384,7 +386,7 @@ def onSetScriptTitle(self, title):
384386
def addEdit(self, event):
385387

386388
with wx.BusyInfo("Please wait for a moment while ODMTools fetches the data and stores it in our database", parent=self):
387-
389+
self.scriptcreate = True
388390
isSelected, seriesID = self.pnlSelector.onReadyToEdit()
389391
logger.info("Beginning editing seriesID: %s"%str(seriesID))
390392

@@ -496,6 +498,15 @@ def onClose(self, event):
496498
Closes ODMTools Python
497499
Closes AUI Manager then closes MainWindow
498500
"""
501+
502+
#check to see if a script has been created
503+
if self.scriptcreate:
504+
msg = wx.MessageDialog(None, 'Would you like to save your editing script?',
505+
'Save Script', wx.YES_NO | wx.ICON_QUESTION)
506+
value = msg.ShowModal()
507+
if value == wx.ID_YES:
508+
self.txtPythonScript.OnSaveAs(event)
509+
499510
# deinitialize the frame manager
500511
self.pnlPlot.Close()
501512
try:

0 commit comments

Comments
 (0)