Merge pull request #91 from ODM2/development

Development

Author: sreeder

Developer_setup.md

@@ -18,4 +18,4 @@
  
 
 ### Feedback
-Comments and concenrns can be posted on our GitHib page: https://github.com/ODM2/ODM2StreamingDataLoader/issues.
+Comments and concerns can be posted on our GitHib page: https://github.com/ODM2/ODM2StreamingDataLoader/issues.

setup.py

@@ -212,7 +212,13 @@ def mac_pyinstaller(Name = None, File = None):
             '--noconfirm ' + File)
 
         APP_DIR = os.path.join(MAC_DIR, 'Dist', Name+".app")
-        os.system("cp /Users/denversmith/miniconda/envs/SDL-env/lib/libwx_osx_cocoau-3.0.0.0.0.dylib %s" % os.path.join(APP_DIR, "Contents", "MacOS"))
+
+
+        #/Users/denversmith/miniconda/envs/SDL-env/lib/libwx_osx_cocoau-3.0.0.0.0.dylib
+        path = os.path.dirname(os.path.dirname(sys.executable))
+
+        python = os.path.join(path, 'lib', 'libwx_osx_cocoau-3.0.0.0.0.dylib')
+        os.system("cp  %s %s" %(python, os.path.join(APP_DIR, "Contents", "MacOS")))
 
         return True
     except Exception as e:

setup/Windows/sdl_setup.iss

@@ -4,11 +4,11 @@
 #define MyAppName "StreamingDataLoader"
 #define MyAppInstaller "SDL"
 #define MyWizExeName "SDLLoader"
-#define MyAppVersion "v0.6.0-beta"
+#define MyAppVersion "v0.7.0-beta"
 #define MyAppPublisher "ODM2"
 #define MyAppURL "https://github.com/ODM2/ODM2StreamingDataLoader"
 
-#define MyAppDir "D:\DEV\SDL"
+#define MyAppDir "D:\DEV\SDL\dist"
 
 
 [Setup]
@@ -28,7 +28,7 @@ DefaultGroupName={#MyAppName}
 LicenseFile={#MyAppDir}\LICENSE.txt
 OutputBaseFilename={#MyAppInstaller}_{#MyAppVersion}_Installer
 ;SetupIconFile={#MyAppDir}\src\common\icons\SDL.ico
-SetupIconFile=D:\DEV\Releases\SDL\sdl_beta_source_code\src\common\icons\SDL.ico
+SetupIconFile=D:\DEV\SDL\src\common\icons\SDL.ico
 Compression=lzma
 SolidCompression=yes
 OutputDir={#MyAppDir}\setup\Dist

setup/hooks/hook-sqlalchemy.py

@@ -18,7 +18,7 @@
 
 # Contributed by Greg Copeland
 
-from PyInstaller.hooks.hookutils import exec_statement
+from PyInstaller.utils.hooks import exec_statement
 
 # include most common database bindings
 # some database bindings are detected and include some

src/StreamingDataLoader.py

@@ -14,14 +14,14 @@
 
 import os
 import sys
-sys.path.insert(0,os.path.dirname(os.path.dirname(__file__)))
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 
 from argparse import ArgumentParser
 import logging
 
-from models.YamlConfiguration import YamlConfiguration
-from controllers.Mapper import Mapper
-from lib.Appdirs.appdirs import user_config_dir
+from src.models.YamlConfiguration import YamlConfiguration
+from src.controllers.Mapper import Mapper
+from src.lib.Appdirs.appdirs import user_config_dir
 
 import numpy as np
 

src/asdf

@@ -5,8 +5,8 @@
 import logging
 import datetime
 from dateutil.parser import parse
-from handlers.csvHandler import CSVReader
-from controllers.Database import Database
+from src.handlers.csvHandler import CSVReader
+from src.controllers.Database import Database
 
 logger = logging.getLogger('SDL_logger')
 

src/controllers/Mapper.py

@@ -1,5 +1,5 @@
 app_name = "Streaming Data Loader"
-version = "0.6.0_Beta"
+version = "0.7.0_Beta"
 copyright = "Copyright (c) 2013 - 2015, Utah State University. All rights reserved."
 description = "Streaming Data Loader a program for streaming continuous sensor data into an instance of the Observations Data Model (ODM)"
 

src/meta/data.py

@@ -9,6 +9,8 @@
 from src.wizard.controller.frmChainedDialogPage import ChainedDialogPage
 from src.controllers.Database import Database
 
+from urllib import quote_plus as urlquote
+
 class DatabaseConfigPanel(ChainedDialogPage,
     clsDBConfiguration):
 
@@ -39,23 +41,26 @@ def setInput(self, data):
 
     def onTestConnection(self, event):
         conn_dict = self.getFieldValues()
-        if self.validateInput(conn_dict['Database']):
+        try:
+            self.validateInput(conn_dict['Database'])
             self.conn_dict = conn_dict
             self.parent.nextButton.Enable(True) 
-        else:
+        except:
             self.parent.nextButton.Enable(False)
-
-    def sanitizeFieldValues(self, value):
-        value = value.replace(';','')
-        return value
+            message = "Invalid connection!"
+            title = "Connection Error"
+            ico = wx.ICON_EXCLAMATION
+            wx.MessageBox(message=message,
+                          caption=title,
+                          style=wx.OK | ico)
 
     def getFieldValues(self):
         conn_dict = {}
         conn_dict['Engine'] = self.choices[self.cbDatabaseType.GetValue()] if self.cbDatabaseType.GetValue() != ''  else ''
-        conn_dict['UserName'] = self.sanitizeFieldValues(str(self.txtUser.GetValue()))
-        conn_dict['Password'] = self.sanitizeFieldValues(str(self.txtPass.GetValue()))
-        conn_dict['Address'] = self.sanitizeFieldValues(str(self.txtServer.GetValue()))
-        conn_dict['DatabaseName'] = self.sanitizeFieldValues(str(self.txtDBName.GetValue()))
+        conn_dict['UserName'] = (str(self.txtUser.GetValue()))
+        conn_dict['Password'] = (str(self.txtPass.GetValue()))
+        conn_dict['Address'] = (str(self.txtServer.GetValue()))
+        conn_dict['DatabaseName'] = (str(self.txtDBName.GetValue()))
         return {'Database': conn_dict}
 
     def validateInput(self, conn_dict):

src/wizard/controller/frmDatabaseConfigPanel.py

@@ -53,6 +53,13 @@ def __populate_date_fields(self):
         if self.existing_result is None:
             return
 
+        if self.existing_result.SampledMediumCV is not None:
+            self.comboSamp.SetValue(self.existing_result.SampledMediumCV)
+
+        if self.existing_result.AggregationStatisticCV is not None:
+            self.comboAgg.SetValue(self.existing_result.AggregationStatisticCV)
+
+
         # Set Result Date Time
         if self.existing_result.ResultDateTime is not None:
             year = self.existing_result.ResultDateTime.year