sheppy/ths-datenlogger
1
0
Fork 0
mirror of https://github.com/FAUSheppy/ths-datenlogger synced 2026-01-21 21:07:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor filenames

Browse Source
This commit is contained in:
Yannik Schmidt
2020-08-16 15:49:28 +02:00
parent f8e94ad36a
commit fa6e2893ad
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/main/python/plot_imageutils.py → src/main/python/imageutils.py
View File

12
src/main/python/input_backend.py
View File

@@ -5,7 +5,7 @@ import requests
import os import os
from dbfread import DBF from dbfread import DBF
import plot_timeutils import timeutils
line_colors = ['b', 'r', 'g', 'c', 'm', 'y'] line_colors = ['b', 'r', 'g', 'c', 'm', 'y']
tname = CFG("temperatur_plot_name") tname = CFG("temperatur_plot_name")
@@ -142,7 +142,7 @@ def processExternalData(datapoints, plotNameKey, fromTime, toTime, dtype):
try: try:
timeStr, value = l.split(";") timeStr, value = l.split(";")
timestamp = plot_timeutils.time_from_csv(timeStr, CFG("nff_input_timeformat")) timestamp = timeutils.time_from_csv(timeStr, CFG("nff_input_timeformat"))
datapoints[plotNameKey].data += [float(value.replace(",","."))] datapoints[plotNameKey].data += [float(value.replace(",","."))]
datapoints[plotNameKey].times += [timestamp] datapoints[plotNameKey].times += [timestamp]
@@ -223,7 +223,7 @@ def read_in_file(path, backend=None, outsideData=False, plotOutsideTemp=True, pl
def dbfread(path,datapoints,pt,ph,pd): def dbfread(path,datapoints,pt,ph,pd):
for record in DBF(path): for record in DBF(path):
parse_line(datapoints,record,'DATETIME',[ ('TEMPCELS',pt) , ('HUMIDITY',ph) , ('DEWCELS',pd) ] ,plot_timeutils.time_from_dbf) parse_line(datapoints,record,'DATETIME',[ ('TEMPCELS',pt) , ('HUMIDITY',ph) , ('DEWCELS',pd) ] ,timeutils.time_from_dbf)
def csvread(path,datapoints,pt,ph,pd): def csvread(path,datapoints,pt,ph,pd):
count = 0; count = 0;
@@ -240,7 +240,7 @@ def csvread(path,datapoints,pt,ph,pd):
row["hum"] = float(row_arg[4]) row["hum"] = float(row_arg[4])
row["taupunkt"] = float(row_arg[5]) row["taupunkt"] = float(row_arg[5])
parse_line(datapoints,row,'datetime',[ ('temp',pt) , ('hum',ph) , ('taupunkt',pd) ],\ parse_line(datapoints,row,'datetime',[ ('temp',pt) , ('hum',ph) , ('taupunkt',pd) ],\
plot_timeutils.time_from_csv,timeformat="%d-%m-%Y%H:%M:%S") timeutils.time_from_csv,timeformat="%d-%m-%Y%H:%M:%S")
print("Info: Ignored %d lines at beginning of file"%count) print("Info: Ignored %d lines at beginning of file"%count)
import codecs import codecs
@@ -260,7 +260,7 @@ def csvread_txt(path,datapoints,pt,ph,pd):
row["hum"] = float(row_arg[7]) row["hum"] = float(row_arg[7])
row["taupunkt"] = 0.0 row["taupunkt"] = 0.0
parse_line(datapoints,row,'datetime',[ ('temp',pt) , ('hum',ph) , ('taupunkt',pd) ],\ parse_line(datapoints,row,'datetime',[ ('temp',pt) , ('hum',ph) , ('taupunkt',pd) ],\
plot_timeutils.time_from_csv,timeformat="%d-%m-%Y_%H:%M") timeutils.time_from_csv,timeformat="%d-%m-%Y_%H:%M")
except (UnicodeError, IndexError): except (UnicodeError, IndexError):
count = csvread_txt_fallback(path,datapoints,pt,ph,pd) count = csvread_txt_fallback(path,datapoints,pt,ph,pd)
@@ -283,7 +283,7 @@ def csvread_txt_fallback(path,datapoints,pt,ph,pd):
row["hum"] = float(hum) row["hum"] = float(hum)
row["taupunkt"] = 0.0 row["taupunkt"] = 0.0
parse_line(datapoints,row,'datetime',[ ('temp',pt) , ('hum',ph) , ('taupunkt',pd) ],\ parse_line(datapoints,row,'datetime',[ ('temp',pt) , ('hum',ph) , ('taupunkt',pd) ],\
plot_timeutils.time_from_csv,timeformat="%d-%m-%Y_%H:%M") timeutils.time_from_csv,timeformat="%d-%m-%Y_%H:%M")
return count return count

4
src/main/python/main.py
View File

@@ -15,7 +15,7 @@ import sys
import datetime as dt import datetime as dt
import input_backend import input_backend
import plot_main import plot
import config_parse as cp import config_parse as cp
class WidgetGallery(QDialog): class WidgetGallery(QDialog):
@@ -180,7 +180,7 @@ class WidgetGallery(QDialog):
endDateTime = dt.datetime.combine(self.endDateEdit.date().toPyDate(), zeroTime) endDateTime = dt.datetime.combine(self.endDateEdit.date().toPyDate(), zeroTime)
endDateTime += endTimeOffset endDateTime += endTimeOffset
self.truePath = plot_main.plot(self.datapoints, path=target, self.truePath = plot.plot(self.datapoints, path=target,
date1=startDateTime, date1=startDateTime,
date2=endDateTime, date2=endDateTime,
forcePath=forcePath) forcePath=forcePath)

8
src/main/python/plot_main.py → src/main/python/plot.py
View File

@@ -15,13 +15,13 @@ import matplotlib.dates
import matplotlib.ticker as ticker import matplotlib.ticker as ticker
import plot_graphutils import plot_graphutils
import plot_imageutils import imageutils
import plot_timeutils import timeutils
def plot(datapoints, path=None, date1=None, date2=None, forcePath=False): def plot(datapoints, path=None, date1=None, date2=None, forcePath=False):
plotname = "" if CFG("name_of_plot") == "None" else CFG("name_of_plot") plotname = "" if CFG("name_of_plot") == "None" else CFG("name_of_plot")
tup = [None,None,plot_timeutils.between_dates,plotname] tup = [None,None,timeutils.between_dates,plotname]
return __plot(tup, datapoints, path, date1, date2, forcePath) return __plot(tup, datapoints, path, date1, date2, forcePath)
def __plot(tup, datapoints, path, date1=None, date2=None, forcePath=False): def __plot(tup, datapoints, path, date1=None, date2=None, forcePath=False):
@@ -80,7 +80,7 @@ def __plot(tup, datapoints, path, date1=None, date2=None, forcePath=False):
tup[FIGURE].savefig(pic_path,dpi=DPI,pad_inches=0.1,bbox_inches='tight',transparent=CFG("transparent_background")) tup[FIGURE].savefig(pic_path,dpi=DPI,pad_inches=0.1,bbox_inches='tight',transparent=CFG("transparent_background"))
### do operations on the finished png ### ### do operations on the finished png ###
plot_imageutils.check_and_rotate(pic_path) imageutils.check_and_rotate(pic_path)
return pic_path return pic_path

0
src/main/python/plot_timeutils.py → src/main/python/timeutils.py
View File