Merge pull request #282 from ODM2/Beta_1.2.4

 Beta 1.2.4

.gitignore

@@ -3,6 +3,7 @@
 *.so
 *.log
 __pycache__
+.cache
 htmlcov
 
 # Packages

.travis.yml

@@ -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
+

odmtools/common/__init__.py

@@ -1,56 +1,8 @@
 __author__ = 'Jacob'
-from icons.icons import *
-from icons.icons4addpoint import *
+
 from logger import LoggerTool
 
-__all__=["add",
-        "binning",
-        "bitmap_editor",
-        "blank",
-        "box_whisker",
-        "box_whisker_type",
-        "brush",
-        "calendar",
-        "chart_xy",
-        "color_setting",
-        "curve_points",
-        "date_setting",
-        "delete",
-        "derive_new_series",
-        "edit",
-        "edit_view",
-        "file_new",
-        "filter_list",
-        "flag",
-        "full_date_range",
-        "histogram",
-        "his_type",
-        "interpolate",
-        "legend",
-        "line_chart",
-        "lin_drift",
-        "open_file",
-        "plot_type",
-        "probability",
-        "record",
-        "restore",
-        "save",
-        "save_data",
-        "script",
-        "stop_edit",
-        "summary",
-        "table",
-        "tsa_icon",
-        "tsa_type",
-        "gtk_execute",
-        "Undo",
-        "window_command_line",
-        "window_enter",
-        "LoggerTool",
+__all__=["LoggerTool",
         "logger",
-        "newscript",
-        "openscript",
-        "savescript",
-        "deletered",
 
         ]

odmtools/common/icons/__init__.py

@@ -1 +1,53 @@
 __author__ = 'Jacob'
+from icons import *
+from icons4addpoint import *
+__all__=["add",
+        "binning",
+        "bitmap_editor",
+        "blank",
+        "box_whisker",
+        "box_whisker_type",
+        "brush",
+        "calendar",
+        "chart_xy",
+        "color_setting",
+        "curve_points",
+        "date_setting",
+        "delete",
+        "derive_new_series",
+        "edit",
+        "edit_view",
+        "file_new",
+        "filter_list",
+        "flag",
+        "full_date_range",
+        "histogram",
+        "his_type",
+        "interpolate",
+        "legend",
+        "line_chart",
+        "lin_drift",
+        "open_file",
+        "plot_type",
+        "probability",
+        "record",
+        "restore",
+        "save",
+        "save_data",
+        "script",
+        "stop_edit",
+        "summary",
+        "table",
+        "tsa_icon",
+        "tsa_type",
+        "gtk_execute",
+        "Undo",
+        "window_command_line",
+        "window_enter",
+
+        "newscript",
+        "openscript",
+        "savescript",
+        "deletered",
+
+        ]

odmtools/common/icons/icons4addpoint.py

@@ -240,4 +240,3 @@
     "fyFkZ8W5EwnwX4WlCUrEwmMFZkmMQPAcCJtVkoD4EMZKSAS83/OIZpUkIGkyMR0zSkDa4aQd"
     "M1ogpsNJJKIFttbvuQ/ulVA1tikCBXDWEsImM5JQa894HkhCT0SFKtQK4I8S8HPlTrhEwEhE"
     "JgM+pRN1vhJAqemmBC4LChiWfQsq9brIX7OZ6v/BfANr87/zITFiXQAAAABJRU5ErkJggg==")
-

odmtools/common/icons/img2py.py

@@ -9,7 +9,7 @@
 
 from wx.tools import img2py
 
-output = 'icons4addpoint.py'
+output = 'test_icons.py'
 
 # get the list of BMP files
 #files = [f for f in os.listdir('.') if re.search(r'odm\d*x\d*\.png', f)]

odmtools/common/icons/plotToolbar.py

@@ -124,6 +124,7 @@
     "CsZqSyMGTTeLOYWm1zaUxPzXpURydi7x7fvSwtupGScWi13keX6xIsHszPP3bkmgmZX1RPJz"
     "KpFaSCefPpvcxjH6D2k3O6c42VTiAAAAAElFTkSuQmCC")
 
+
 #----------------------------------------------------------------------
 zoom_to_rect = PyEmbeddedImage(
     "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBj"
@@ -176,17 +177,80 @@
     "t7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxSfNTws+7PbaOWo6fH"
     "XMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+tfa5zvMf"
     "fnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/"
-    "6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEgAACxIB0t1+/AAAABp0RVh0U29m"
-    "dHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAB3ElEQVQ4T5WTbU/aUBTH+VjEfQPdZxDZ"
-    "+/p68GZB4hIVNAV1T7plU5z4EETdEqYmGoeOvRgzQZ2FTJfJ1irIQ4XWIvx3z00g1qqZJ/kn"
-    "t/9z7u+etvfYcCUMw8Dq+gZejr3mWmNr8u4KWzP5eWsbnn4fPiW+InWc5Yptf+HeJsvdFhyw"
-    "Gd/C2PswJFnBr3wefwpFpJUT/kx6FZrmNTeFTdM09PoGcXiaQ8/TfkyEwiaRRznvgB9Uez1s"
-    "sZVVxJPf8bdYgl98jtSPnyaRd3xWQPxbErGVNSsgEByBzDYXKhUEn43j6LdsEnlKqcwOKCIw"
-    "PGoFiIFh5NRzlFh7L8bfIndWMom8/HkFp2UVIjvM8gpLHz5iZ28fZU3Hm3dT0C8Mk8ijXDK1"
-    "i2VWawHIsgzfkAjNqN36ESnX5xsC1VoAtVoNkYUoItFFXNbrN2o+EoXD+QhiIIhGo2Fi8Hug"
-    "qipm5+bhZ51IUhp1VlRnsIMDCf5BET3eXrS1PYDL5WJymyCtm1itVtlmCZOhKTzxeLloTZ6i"
-    "KHB0OWG32+F2u/H4CqQFoE6oPV3XQTASrckjZbNZdDq6LBAT4K6huQ4RBAHT4Rn8N6DZIXUi"
-    "CN1o73iIBBu8ewGaEPqdmUyGz8Y/d/qJcLWhfigAAAAASUVORK5CYII=")
+    "6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAABp0RVh0U29m"
+    "dHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAABpUlEQVQ4T52Q20oCURSGeyyxN6ieIbP7"
+    "6Tq9CZWCTJPRzmnRQSsqzE5gKhSmVhdZYKcJOpDVWJqHEsvSv70HLMeZCrr4Nmuv9a9vD1MH"
+    "QIR/cwsj9jGBAKlr57V8FdvhCHRGEzZ29xCL3wp4IztCL0hmlVwtwhEMhWGfmQPHJ3CdSuEu"
+    "ncF54kG4U0ads6CZ6sUKwtFp6sXlYxL6LiOmnHMiaI/ODD1mEpUReH1+hKIHuM9kYWaHEDu9"
+    "EEF78ac0QvtReH0BslMjsNr6wZPldD4P26ADVze8CNpLZHPkgQysfQNSAWvtQ/L5BdlCAcOO"
+    "CSSfsiJoL/WSx2PuGSx5TCJYWVvH4fEJcoVXjE+68PpWFEF7dBaNHWGVZCUCnudhsrAoFN9/"
+    "/Il01m2ySJYpwuFe8sDtWcZHqSTLotsDlboVrNVG4jICyvzCIszkSzjuHKVyGSWyeHbGwdzL"
+    "Qm/ohFJZD41GQ9CSuIyAwnEcpp0udOgMArSuzFQtaigUCmi1WrRXSUSCv2hWtUgkssHfqEgY"
+    "hiHXfwgoDNOGhsYmUv5T8A3qPgH1xhJNvEHJKAAAAABJRU5ErkJggg==")
+
+
+# PyEmbeddedImage(
+#     "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBj"
+#     "SFJNAACHDwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3No"
+#     "b3AgSUNDIHByb2ZpbGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0"
+#     "sSGiAhFFRJoiSFDEgNFQJFZEsRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3P"
+#     "WhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTsAIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6"
+#     "WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4JUuQLrbPipgalyxmGCVmvihBEcuJOWGR"
+#     "DT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR3xKxRoowlSviN+LYVA4zAwAU"
+#     "SWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQdli7d1NqaQffkZKVw"
+#     "BALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtFehn4uWcQ"
+#     "rf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX"
+#     "wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGc"
+#     "eA6fwxNFhImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR"
+#     "+8Vd/6NvvvgwIH554SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd"
+#     "6ABDYAasgC1wBG7AG/iDEBAJVgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL"
+#     "4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50Gao"
+#     "GCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyCqbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+Ad"
+#     "cCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiEj6xHipAKpAFpRbqRPuQmMorM"
+#     "IG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I1kfboL3QEegEdBa6"
+#     "EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9rB3WH8vE"
+#     "CrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG"
+#     "fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemR"
+#     "XEjRJCFpB+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSRe"
+#     "UlPSSXK1ZK5kheQJyeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJa"
+#     "Mm4ybJkCmYMyF2TGKQhFneJCYVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sie"
+#     "lh2lITQtmhcthVZKO04bpr1borTEaQlnyfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bf"
+#     "Jd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48vvacIK+opBimuVTyo2K84p6Ss5KGUrlSl"
+#     "dEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0CvpvfRZVUVVT1Whar3qgOqCmrZa"
+#     "qFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15LWytca6tWp9aUtpy2"
+#     "l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AAbWBtwDNo"
+#     "MBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z"
+#     "llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQw"
+#     "ShiXrdHWztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/aj"
+#     "DqoOTIcGh8eO6o5sxybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P"
+#     "3NXcE9xb3Gc9LDzWepzzRHv6eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7e"
+#     "frv9HqzQXMFb0ekP/L38d/s/DNAOWBPwYyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuh"
+#     "OqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmRXVHYqLCopqi5lW4r96yciLaILoweXqW9"
+#     "KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNmWS6svaxnbEd2OXuaY8cp40zG"
+#     "28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wlxqae5Mnwknm9acpp"
+#     "2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2dDYvuz9H"
+#     "L2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8"
+#     "V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN"
+#     "6TeV33zaEb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7"
+#     "Ryt9K7uqNKp2Vr2vTqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiI"
+#     "OZh58EljWGPft4xvm5sUmoqbPhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWyt"
+#     "b6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+"
+#     "o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h/HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9"
+#     "Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavrXTesb3QPLh88M+QwdP6m681L"
+#     "t7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxSfNTws+7PbaOWo6fH"
+#     "XMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+tfa5zvMf"
+#     "fnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/"
+#     "6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEgAACxIB0t1+/AAAABp0RVh0U29m"
+#     "dHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAAB3ElEQVQ4T5WTbU/aUBTH+VjEfQPdZxDZ"
+#     "+/p68GZB4hIVNAV1T7plU5z4EETdEqYmGoeOvRgzQZ2FTJfJ1irIQ4XWIvx3z00g1qqZJ/kn"
+#     "t/9z7u+etvfYcCUMw8Dq+gZejr3mWmNr8u4KWzP5eWsbnn4fPiW+InWc5Yptf+HeJsvdFhyw"
+#     "Gd/C2PswJFnBr3wefwpFpJUT/kx6FZrmNTeFTdM09PoGcXiaQ8/TfkyEwiaRRznvgB9Uez1s"
+#     "sZVVxJPf8bdYgl98jtSPnyaRd3xWQPxbErGVNSsgEByBzDYXKhUEn43j6LdsEnlKqcwOKCIw"
+#     "PGoFiIFh5NRzlFh7L8bfIndWMom8/HkFp2UVIjvM8gpLHz5iZ28fZU3Hm3dT0C8Mk8ijXDK1"
+#     "i2VWawHIsgzfkAjNqN36ESnX5xsC1VoAtVoNkYUoItFFXNbrN2o+EoXD+QhiIIhGo2Fi8Hug"
+#     "qipm5+bhZ51IUhp1VlRnsIMDCf5BET3eXrS1PYDL5WJymyCtm1itVtlmCZOhKTzxeLloTZ6i"
+#     "KHB0OWG32+F2u/H4CqQFoE6oPV3XQTASrckjZbNZdDq6LBAT4K6huQ4RBAHT4Rn8N6DZIXUi"
+#     "CN1o73iIBBu8ewGaEPqdmUyGz8Y/d/qJcLWhfigAAAAASUVORK5CYII=")
 
 #----------------------------------------------------------------------
 scroll_left = PyEmbeddedImage(

odmtools/controller/frmBulkInsert.py

@@ -63,6 +63,7 @@ def readDataFromCSV(self, filepath):
                                 8: str.strip,
                                 9: str.strip})
         except CParserError as e:
+
             msg = wx.MessageDialog(None, "There was an issue trying to parse your file. "
                                          "Please compare your csv with the template version as the file"
                                          " you provided "

odmtools/controller/frmSeriesSelector.py

@@ -84,10 +84,6 @@ def refreshTableSeries(self, db):
 
         :return:
         """
-
-        chcklist=  self.tblSeries.GetCheckedObjects()
-
-
         self.memDB.set_series_service(db)
         object = self.series_service.get_all_series()
         #checkedObjs = self.tblSeries.GetCheckedObjects()
@@ -97,10 +93,6 @@ def refreshTableSeries(self, db):
             if x.id not in idList:
                 self.tblSeries.AddObject(x)
 
-
-        for c in chcklist:
-            self.tblSeries.SetCheckState(c, True)
-
         #for x in checkedObjs:
         #    super(FastObjectListView, self.tblSeries).SetCheckState(x, True)
 
@@ -109,18 +101,10 @@ def refreshSeries(self):
 
         :return:
         """
-        chcklist=  self.tblSeries.GetCheckedObjects()
         self.series_service = None
-
         self.series_service = self.parent.Parent.createService()
         #self.refreshTableSeries(self.dbservice)
         self.resetDB(self.series_service)
-        for c in chcklist:
-            for val in self.tblSeries.GetObjects():
-                if c == val:
-                    self.tblSeries.SetCheckState(val, True)
-                    break
-
         logger.debug("Repopulate Series Selector")
 
     def initSVBoxes(self):
@@ -574,14 +558,9 @@ def stopEdit(self):
 
         :return:
         """
-
         self.isEditing = False
-        chcklist= self.tblSeries.GetCheckedObjects()
-
         self.tblSeries.RefreshObject(self.tblSeries.editingObject)
-        for c in chcklist:
-            self.tblSeries.SetCheckState(c, True)
-
+        self.tblSeries.editingObject = None
         self.memDB.stopEdit()
 
     def isEditing(self):