fix sample file so that it is not throwing an error when plotting

Author: Stephanie Reeder

Examples/Sample.py

@@ -1,17 +1,11 @@
 __author__ = 'stephanie'
-import sys
-import os
+
 
 
 import matplotlib.pyplot as plt
 from matplotlib import dates
 
 
-#this will be removed when we can installthe api
-# this_file = os.path.realpath(__file__)
-# directory = os.path.dirname(os.path.dirname(this_file))
-# print directory
-# sys.path.insert(0, directory)
 
 from odm2api.ODMconnection import dbconnection
 from odm2api.ODM2.services.readService import *
@@ -20,16 +14,15 @@
 
 
 #connect to database
-#createconnection (dbtype, servername, dbname, username, password)
+# createconnection (dbtype, servername, dbname, username, password)
+# session_factory = dbconnection.createConnection('connection type: sqlite|mysql|mssql|postgresql', '/your/path/to/db/goes/here', 2.0)#sqlite
 # session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
-#session_factory = dbconnection.createConnection('connection type: sqlite|mysql|mssql|postgresql', '/your/path/to/db/goes/here', 2.0)#sqlite
 # session_factory= dbconnection.createConnection('mssql', "(local)", "LBRODM2", "ODM", "odm")#win MSSQL
 session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
 
 
 
 #_session = session_factory.getSession()
-
 read = ReadODM2(session_factory)
 
 
@@ -152,25 +145,17 @@
 # Print a few Time Series Values to the console
 # tsValues.set_index('ValueDateTime', inplace=True)
 try:
+    print "tsValues "
     print tsValues.head()
 except Exception as e:
     print e
 
 # Plot the time series
 
 try:
-    fig = plt.figure()
-    ax = fig.add_subplot(111)
-    tsValues.plot(x='ValueDateTime', y='DataValue', kind='line',
-                  title=tsResult.ResultObj.VariableObj.VariableNameCV + " at " + tsResult.ResultObj.FeatureActionObj.SamplingFeatureObj.SamplingFeatureName,
-                  ax=ax)
-    ax.set_ylabel(tsResult.ResultObj.VariableObj.VariableNameCV + " (" + tsResult.ResultObj.UnitsObj.UnitsAbbreviation + ")")
-    ax.set_xlabel("Date/Time")
-    ax.xaxis.set_minor_locator(dates.MonthLocator())
-    ax.xaxis.set_minor_formatter(dates.DateFormatter('%b'))
-    ax.xaxis.set_major_locator(dates.YearLocator())
-    ax.xaxis.set_major_formatter(dates.DateFormatter('\n%Y'))
-    ax.grid(True)
+    plt.figure()
+    ax=tsValues.plot(x='ValueDateTime', y='DataValue')
+
     plt.show()
 except Exception as e:
     print "Unable to demo plotting of tsValues: ", e

odm2api/ODM2/models.py

@@ -480,10 +480,6 @@ def __repr__(self):
 # ################################################################################
 
 
-
-
-
-
 class DataLoggerProgramFiles(Base):
     __tablename__ = u'dataloggerprogramfiles'
     __table_args__ = {u'schema': 'odm2'}
@@ -510,8 +506,6 @@ class DataLoggerFiles(Base):
     ProgramObj = relationship(DataLoggerProgramFiles)
 
 
-
-
 class EquipmentModels(Base):
     __tablename__ = u'equipmentmodels'
     __table_args__ = {u'schema': 'odm2'}

odm2api/ODM2/services/readService.py

@@ -656,15 +656,26 @@ def getResultValues(self, resultid, starttime=None, endtime=None):
 
 
         """
-
-
-        q = self._session.query(Results).filter_by(ResultID=id)
-        if starttime: q = q.filter(Results.ValueDateTime >= starttime)
-        if endtime: q = q.filter(Results.ValueDateTime <= endtime)
+        type= self._session.query(Results).filter_by(ResultID=resultid).first().ResultTypeCV
+        Result = TimeSeriesResults
+        if "categorical" in type.lower():Result = CategoricalResultValues
+        elif "measurement" in type.lower():Result = MeasurementResultValues
+        elif "point" in type.lower():Result = PointCoverageResultValues
+        elif "profile" in type.lower():Result = ProfileResultValues
+        elif "section" in type.lower():Result = SectionResults
+        elif "spectra" in type.lower():Result = SpectraResultValues
+        elif "time" in type.lower():Result = TimeSeriesResultValues
+        elif "trajectory" in type.lower():Result = TrajectoryResultValues
+        elif "transect" in type.lower():Result = TransectResultValues
+
+
+        q = self._session.query(Result).filter_by(ResultID=resultid)
+        if starttime: q = q.filter(Result.ValueDateTime >= starttime)
+        if endtime: q = q.filter(Result.ValueDateTime <= endtime)
         try:
-            q = q.order_by(Results.ValueDateTime).all()
-            df = pd.DataFrame([dv.list_repr() for dv in q.all()])
-            df.columns = q[0].get_columns()
+            vals = q.order_by(Result.ValueDateTime)
+            df = pd.DataFrame([dv.list_repr() for dv in vals.all()])
+            df.columns = vals[0].get_columns()
             return df
         except:
             return None