updated daq and hmi, removed unused code

- removed separate handler files for daq
- removed seperate HMIVariable model
- added restart of daq when Variable or Device model are changed
- added support for different byte order of aquired data
- fixed support for U/INT64 and U/INT32 datatypes
- removed chart_set from hmi
- updated docs
- removed unused code

Author: trombastic

CHANGELOG.txt

@@ -5,3 +5,14 @@
  - readded log notifications in HMI
  - added loading animation for data prefetch in HMI
  - changed id in Log model to timestame + id schema
+
+0.7.0b3
+ - removed separate handler files for daq
+ - removed seperate HMIVariable model
+ - added restart of daq when Variable or Device model are changed
+ - added support for different byte order of aquired data
+ - fixed support for U/INT64 and U/INT32 datatypes
+ - removed chart_set from hmi
+ - updated docs
+ - removed unused code
+ 

README.rst

@@ -22,7 +22,7 @@ Dependencies
 
 - core/HMI
 	* python 2.7
-	* django>=1.6
+	* django>=1.7
 	* numpy>=1.6.0
 	* pillow
 	* python-daemon

docs/backend.rst

@@ -87,19 +87,6 @@ values to the server the coresponding function code will be selected automaticly
 .. image:: pic/backend_modbus_save_device.png
 
 
-To use the Variable in the HMI a *Hmi variable* entry has to be added, to do so open 
-the *Hmi variable* table in the *PyScada HMI* section and click 
-*add hmi variable* in the upper right corner.
-
-*TODO* add picture
-
-Select the Variable to assign by clicking on the magnifier symbol or writing the 
-id of the Variable. Provide a *short_name* that will be used in the HMI or leave 
-the field blank to use the *name* of the *Variable*. Select the *color* and 
-*line thickness* for charts. (a default set of colors can be added by loading 
-the color.json fixture, *TODO* link to the commandline example)
-
-*TODO* add picture
 
 Add a new View
 --------------

docs/nginx_setup.rst

@@ -9,10 +9,10 @@ nginx configuration
 ::
         
         # debian
-        sudo wget https://raw.githubusercontent.com/trombastic/PyScada/dev/0.6.x/extras/nginx_sample.conf -O /etc/nginx/sites-available/pyscada.conf
+        sudo wget https://raw.githubusercontent.com/trombastic/PyScada/dev/0.7.x/extras/nginx_sample.conf -O /etc/nginx/sites-available/pyscada.conf
         sudo nano /etc/nginx/sites-available/pyscada.conf
         # Fedora
-        sudo wget https://raw.githubusercontent.com/trombastic/PyScada/dev/0.6.x/extras/nginx_sample.conf -O /etc/nginx/conf.d/pyscada.conf
+        sudo wget https://raw.githubusercontent.com/trombastic/PyScada/dev/0.7.x/extras/nginx_sample.conf -O /etc/nginx/conf.d/pyscada.conf
         sudo nano /etc/nginx/conf.d/pyscada.conf
 
 

pyscada/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #__import__('pkg_resources').declare_namespace('pyscada')
 
-__version__ = '0.7.0b2'
+__version__ = '0.7.0b3'
 __author__  = 'Martin Schröder'
 
 default_app_config = 'pyscada.apps.PyScadaConfig'

pyscada/admin.py

@@ -6,7 +6,6 @@
 from pyscada.models import DeviceWriteTask
 from pyscada.models import Log
 from pyscada.models import BackgroundTask
-from pyscada.models import RecordedDataCache
 from pyscada.models import Event
 from pyscada.models import RecordedEvent
 from pyscada.models import Mail
@@ -121,24 +120,6 @@ def has_add_permission(self, request):
     def has_delete_permission(self, request, obj=None):
         return False
 
-class RecordedDataCacheAdmin(admin.ModelAdmin):
-    list_display = ('id','last_change','name','value','unit','last_update',)
-    list_display_links = ('name',)
-    list_filter = ('variable__device','variable__unit')
-    search_fields = ['variable__name',]
-    readonly_fields = ('last_change','last_update','time',)
-    def name(self,instance):
-        return instance.variable.name
-    def  unit(self,instance):
-        return instance.variable.unit.unit
-    def last_change(self,instance):
-        return datetime.datetime.fromtimestamp(int(instance.last_change.timestamp)).strftime('%Y-%m-%d %H:%M:%S')
-    def last_update(self,instance):
-        return datetime.datetime.fromtimestamp(int(instance.time.timestamp)).strftime('%Y-%m-%d %H:%M:%S')
-    def has_add_permission(self, request):
-        return False
-    def has_delete_permission(self, request, obj=None):
-        return False
 
 
 class BackgroundTaskAdmin(admin.ModelAdmin):
@@ -187,4 +168,3 @@ class EventAdmin(admin.ModelAdmin):
 admin.site.register(DeviceWriteTask,DeviceWriteTaskAdmin)
 admin.site.register(Log,LogAdmin)
 admin.site.register(BackgroundTask,BackgroundTaskAdmin)
-admin.site.register(RecordedDataCache,RecordedDataCacheAdmin)