Skip to content

Commit 5c53759

Browse files
author
Stephanie Reeder
committed
Merge pull request #282 from ODM2/Beta_1.2.4
 Beta 1.2.4
2 parents 8d3429b + 7b7ed9d commit 5c53759

Some content is hidden

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

52 files changed

+272707
-198
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+

‎odmtools/common/__init__.py

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,8 @@
11
__author__ = 'Jacob'
2-
from icons.icons import *
3-
from icons.icons4addpoint import *
2+
43
from logger import LoggerTool
54

6-
__all__=["add",
7-
"binning",
8-
"bitmap_editor",
9-
"blank",
10-
"box_whisker",
11-
"box_whisker_type",
12-
"brush",
13-
"calendar",
14-
"chart_xy",
15-
"color_setting",
16-
"curve_points",
17-
"date_setting",
18-
"delete",
19-
"derive_new_series",
20-
"edit",
21-
"edit_view",
22-
"file_new",
23-
"filter_list",
24-
"flag",
25-
"full_date_range",
26-
"histogram",
27-
"his_type",
28-
"interpolate",
29-
"legend",
30-
"line_chart",
31-
"lin_drift",
32-
"open_file",
33-
"plot_type",
34-
"probability",
35-
"record",
36-
"restore",
37-
"save",
38-
"save_data",
39-
"script",
40-
"stop_edit",
41-
"summary",
42-
"table",
43-
"tsa_icon",
44-
"tsa_type",
45-
"gtk_execute",
46-
"Undo",
47-
"window_command_line",
48-
"window_enter",
49-
"LoggerTool",
5+
__all__=["LoggerTool",
506
"logger",
51-
"newscript",
52-
"openscript",
53-
"savescript",
54-
"deletered",
557

568
]

‎odmtools/common/icons/__init__.py

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,53 @@
11
__author__ = 'Jacob'
2+
from icons import *
3+
from icons4addpoint import *
4+
__all__=["add",
5+
"binning",
6+
"bitmap_editor",
7+
"blank",
8+
"box_whisker",
9+
"box_whisker_type",
10+
"brush",
11+
"calendar",
12+
"chart_xy",
13+
"color_setting",
14+
"curve_points",
15+
"date_setting",
16+
"delete",
17+
"derive_new_series",
18+
"edit",
19+
"edit_view",
20+
"file_new",
21+
"filter_list",
22+
"flag",
23+
"full_date_range",
24+
"histogram",
25+
"his_type",
26+
"interpolate",
27+
"legend",
28+
"line_chart",
29+
"lin_drift",
30+
"open_file",
31+
"plot_type",
32+
"probability",
33+
"record",
34+
"restore",
35+
"save",
36+
"save_data",
37+
"script",
38+
"stop_edit",
39+
"summary",
40+
"table",
41+
"tsa_icon",
42+
"tsa_type",
43+
"gtk_execute",
44+
"Undo",
45+
"window_command_line",
46+
"window_enter",
47+
48+
"newscript",
49+
"openscript",
50+
"savescript",
51+
"deletered",
52+
53+
]

‎odmtools/common/icons/icons4addpoint.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,3 @@
240240
"fyFkZ8W5EwnwX4WlCUrEwmMFZkmMQPAcCJtVkoD4EMZKSAS83/OIZpUkIGkyMR0zSkDa4aQd"
241241
"M1ogpsNJJKIFttbvuQ/ulVA1tikCBXDWEsImM5JQa894HkhCT0SFKtQK4I8S8HPlTrhEwEhE"
242242
"JgM+pRN1vhJAqemmBC4LChiWfQsq9brIX7OZ6v/BfANr87/zITFiXQAAAABJRU5ErkJggg==")
243-

‎odmtools/common/icons/img2py.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from wx.tools import img2py
1111

12-
output = 'icons4addpoint.py'
12+
output = 'test_icons.py'
1313

1414
# get the list of BMP files
1515
#files = [f for f in os.listdir('.') if re.search(r'odm\d*x\d*\.png', f)]

‎odmtools/common/icons/plotToolbar.py

Lines changed: 75 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
"CsZqSyMGTTeLOYWm1zaUxPzXpURydi7x7fvSwtupGScWi13keX6xIsHszPP3bkmgmZX1RPJz"
125125
"KpFaSCefPpvcxjH6D2k3O6c42VTiAAAAAElFTkSuQmCC")
126126

127+
127128
#----------------------------------------------------------------------
128129
zoom_to_rect = PyEmbeddedImage(
129130
"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBj"
@@ -176,17 +177,80 @@
176177
"t7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxSfNTws+7PbaOWo6fH"
177178
"XMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+tfa5zvMf"
178179
"fnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/"
179-
"6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEgAACxIB0t1+/AAAABp0RVh0U29m"
180-
"dHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAB3ElEQVQ4T5WTbU/aUBTH+VjEfQPdZxDZ"
181-
"+/p68GZB4hIVNAV1T7plU5z4EETdEqYmGoeOvRgzQZ2FTJfJ1irIQ4XWIvx3z00g1qqZJ/kn"
182-
"t/9z7u+etvfYcCUMw8Dq+gZejr3mWmNr8u4KWzP5eWsbnn4fPiW+InWc5Yptf+HeJsvdFhyw"
183-
"Gd/C2PswJFnBr3wefwpFpJUT/kx6FZrmNTeFTdM09PoGcXiaQ8/TfkyEwiaRRznvgB9Uez1s"
184-
"sZVVxJPf8bdYgl98jtSPnyaRd3xWQPxbErGVNSsgEByBzDYXKhUEn43j6LdsEnlKqcwOKCIw"
185-
"PGoFiIFh5NRzlFh7L8bfIndWMom8/HkFp2UVIjvM8gpLHz5iZ28fZU3Hm3dT0C8Mk8ijXDK1"
186-
"i2VWawHIsgzfkAjNqN36ESnX5xsC1VoAtVoNkYUoItFFXNbrN2o+EoXD+QhiIIhGo2Fi8Hug"
187-
"qipm5+bhZ51IUhp1VlRnsIMDCf5BET3eXrS1PYDL5WJymyCtm1itVtlmCZOhKTzxeLloTZ6i"
188-
"KHB0OWG32+F2u/H4CqQFoE6oPV3XQTASrckjZbNZdDq6LBAT4K6huQ4RBAHT4Rn8N6DZIXUi"
189-
"CN1o73iIBBu8ewGaEPqdmUyGz8Y/d/qJcLWhfigAAAAASUVORK5CYII=")
180+
"6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAABp0RVh0U29m"
181+
"dHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAABpUlEQVQ4T52Q20oCURSGeyyxN6ieIbP7"
182+
"6Tq9CZWCTJPRzmnRQSsqzE5gKhSmVhdZYKcJOpDVWJqHEsvSv70HLMeZCrr4Nmuv9a9vD1MH"
183+
"QIR/cwsj9jGBAKlr57V8FdvhCHRGEzZ29xCL3wp4IztCL0hmlVwtwhEMhWGfmQPHJ3CdSuEu"
184+
"ncF54kG4U0ads6CZ6sUKwtFp6sXlYxL6LiOmnHMiaI/ODD1mEpUReH1+hKIHuM9kYWaHEDu9"
185+
"EEF78ac0QvtReH0BslMjsNr6wZPldD4P26ADVze8CNpLZHPkgQysfQNSAWvtQ/L5BdlCAcOO"
186+
"CSSfsiJoL/WSx2PuGSx5TCJYWVvH4fEJcoVXjE+68PpWFEF7dBaNHWGVZCUCnudhsrAoFN9/"
187+
"/Il01m2ySJYpwuFe8sDtWcZHqSTLotsDlboVrNVG4jICyvzCIszkSzjuHKVyGSWyeHbGwdzL"
188+
"Qm/ohFJZD41GQ9CSuIyAwnEcpp0udOgMArSuzFQtaigUCmi1WrRXSUSCv2hWtUgkssHfqEgY"
189+
"hiHXfwgoDNOGhsYmUv5T8A3qPgH1xhJNvEHJKAAAAABJRU5ErkJggg==")
190+
191+
192+
# PyEmbeddedImage(
193+
# "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBj"
194+
# "SFJNAACHDwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3No"
195+
# "b3AgSUNDIHByb2ZpbGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0"
196+
# "sSGiAhFFRJoiSFDEgNFQJFZEsRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3P"
197+
# "WhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTsAIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6"
198+
# "WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4JUuQLrbPipgalyxmGCVmvihBEcuJOWGR"
199+
# "DT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR3xKxRoowlSviN+LYVA4zAwAU"
200+
# "SWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQdli7d1NqaQffkZKVw"
201+
# "BALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtFehn4uWcQ"
202+
# "rf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX"
203+
# "wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGc"
204+
# "eA6fwxNFhImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR"
205+
# "+8Vd/6NvvvgwIH554SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd"
206+
# "6ABDYAasgC1wBG7AG/iDEBAJVgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL"
207+
# "4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50Gao"
208+
# "GCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyCqbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+Ad"
209+
# "cCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiEj6xHipAKpAFpRbqRPuQmMorM"
210+
# "IG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I1kfboL3QEegEdBa6"
211+
# "EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9rB3WH8vE"
212+
# "CrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG"
213+
# "fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemR"
214+
# "XEjRJCFpB+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSRe"
215+
# "UlPSSXK1ZK5kheQJyeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJa"
216+
# "Mm4ybJkCmYMyF2TGKQhFneJCYVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sie"
217+
# "lh2lITQtmhcthVZKO04bpr1borTEaQlnyfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bf"
218+
# "Jd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48vvacIK+opBimuVTyo2K84p6Ss5KGUrlSl"
219+
# "dEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0CvpvfRZVUVVT1Whar3qgOqCmrZa"
220+
# "qFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15LWytca6tWp9aUtpy2"
221+
# "l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AAbWBtwDNo"
222+
# "MBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z"
223+
# "llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQw"
224+
# "ShiXrdHWztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/aj"
225+
# "DqoOTIcGh8eO6o5sxybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P"
226+
# "3NXcE9xb3Gc9LDzWepzzRHv6eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7e"
227+
# "frv9HqzQXMFb0ekP/L38d/s/DNAOWBPwYyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuh"
228+
# "OqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmRXVHYqLCopqi5lW4r96yciLaILoweXqW9"
229+
# "KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNmWS6svaxnbEd2OXuaY8cp40zG"
230+
# "28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wlxqae5Mnwknm9acpp"
231+
# "2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2dDYvuz9H"
232+
# "L2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8"
233+
# "V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN"
234+
# "6TeV33zaEb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7"
235+
# "Ryt9K7uqNKp2Vr2vTqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiI"
236+
# "OZh58EljWGPft4xvm5sUmoqbPhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWyt"
237+
# "b6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+"
238+
# "o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h/HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9"
239+
# "Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavrXTesb3QPLh88M+QwdP6m681L"
240+
# "t7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxSfNTws+7PbaOWo6fH"
241+
# "XMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+tfa5zvMf"
242+
# "fnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/"
243+
# "6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEgAACxIB0t1+/AAAABp0RVh0U29m"
244+
# "dHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAB3ElEQVQ4T5WTbU/aUBTH+VjEfQPdZxDZ"
245+
# "+/p68GZB4hIVNAV1T7plU5z4EETdEqYmGoeOvRgzQZ2FTJfJ1irIQ4XWIvx3z00g1qqZJ/kn"
246+
# "t/9z7u+etvfYcCUMw8Dq+gZejr3mWmNr8u4KWzP5eWsbnn4fPiW+InWc5Yptf+HeJsvdFhyw"
247+
# "Gd/C2PswJFnBr3wefwpFpJUT/kx6FZrmNTeFTdM09PoGcXiaQ8/TfkyEwiaRRznvgB9Uez1s"
248+
# "sZVVxJPf8bdYgl98jtSPnyaRd3xWQPxbErGVNSsgEByBzDYXKhUEn43j6LdsEnlKqcwOKCIw"
249+
# "PGoFiIFh5NRzlFh7L8bfIndWMom8/HkFp2UVIjvM8gpLHz5iZ28fZU3Hm3dT0C8Mk8ijXDK1"
250+
# "i2VWawHIsgzfkAjNqN36ESnX5xsC1VoAtVoNkYUoItFFXNbrN2o+EoXD+QhiIIhGo2Fi8Hug"
251+
# "qipm5+bhZ51IUhp1VlRnsIMDCf5BET3eXrS1PYDL5WJymyCtm1itVtlmCZOhKTzxeLloTZ6i"
252+
# "KHB0OWG32+F2u/H4CqQFoE6oPV3XQTASrckjZbNZdDq6LBAT4K6huQ4RBAHT4Rn8N6DZIXUi"
253+
# "CN1o73iIBBu8ewGaEPqdmUyGz8Y/d/qJcLWhfigAAAAASUVORK5CYII=")
190254

191255
#----------------------------------------------------------------------
192256
scroll_left = PyEmbeddedImage(

‎odmtools/controller/frmBulkInsert.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ def readDataFromCSV(self, filepath):
6363
8: str.strip,
6464
9: str.strip})
6565
except CParserError as e:
66+
6667
msg = wx.MessageDialog(None, "There was an issue trying to parse your file. "
6768
"Please compare your csv with the template version as the file"
6869
" you provided "

‎odmtools/controller/frmSeriesSelector.py

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ def refreshTableSeries(self, db):
8484
8585
:return:
8686
"""
87-
88-
chcklist= self.tblSeries.GetCheckedObjects()
89-
90-
9187
self.memDB.set_series_service(db)
9288
object = self.series_service.get_all_series()
9389
#checkedObjs = self.tblSeries.GetCheckedObjects()
@@ -97,10 +93,6 @@ def refreshTableSeries(self, db):
9793
if x.id not in idList:
9894
self.tblSeries.AddObject(x)
9995

100-
101-
for c in chcklist:
102-
self.tblSeries.SetCheckState(c, True)
103-
10496
#for x in checkedObjs:
10597
# super(FastObjectListView, self.tblSeries).SetCheckState(x, True)
10698

@@ -109,18 +101,10 @@ def refreshSeries(self):
109101
110102
:return:
111103
"""
112-
chcklist= self.tblSeries.GetCheckedObjects()
113104
self.series_service = None
114-
115105
self.series_service = self.parent.Parent.createService()
116106
#self.refreshTableSeries(self.dbservice)
117107
self.resetDB(self.series_service)
118-
for c in chcklist:
119-
for val in self.tblSeries.GetObjects():
120-
if c == val:
121-
self.tblSeries.SetCheckState(val, True)
122-
break
123-
124108
logger.debug("Repopulate Series Selector")
125109

126110
def initSVBoxes(self):
@@ -574,14 +558,9 @@ def stopEdit(self):
574558
575559
:return:
576560
"""
577-
578561
self.isEditing = False
579-
chcklist= self.tblSeries.GetCheckedObjects()
580-
581562
self.tblSeries.RefreshObject(self.tblSeries.editingObject)
582-
for c in chcklist:
583-
self.tblSeries.SetCheckState(c, True)
584-
563+
self.tblSeries.editingObject = None
585564
self.memDB.stopEdit()
586565

587566
def isEditing(self):

0 commit comments

Comments
 (0)