- improved custom event annotation rendering

- fixed Fuji PXR "RampSoak ON"
- fixed WebLCDs

README.md

@@ -73,6 +73,7 @@ Version History
 
 | Version | Date | Comment |
 |---------|------|---------|
+| v0.9.4 | 06.06.2015 | Bug fixes |
 | v0.9.3 | 15.05.2015 | Phidget 1051, [Hottop KN-8828B-2K+](http://artisan-roasterscope.blogspot.de/2015/05/hottop-kn-8828b-2k.html), one extra background curve, bug fixes |
 | v0.9.2 | 16.01.2015 | Bug fixes |
 | v0.9.1 | 03.01.2015 | [Acaia](http://acaia.co/) scale support, QR code, bug fixes |

README.txt

@@ -175,6 +175,9 @@ Artisan uses the following libraries in unmodified forms:
 
 VERSION HISTORY
 
+v0.9.3 (6.6.2015)
+- bug fixes
+
 v0.9.3 (15.5.2015)
 - adds Phidget 1051 support
 - adds Hottop KN-8828B-2K+ support

artisanlib/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.9.3'
+__version__ = '0.9.4'
 #__revision__ = ''.join(list(filter(str.isdigit, "$Revision$")))
-__revision__ = '3'
+__revision__ = '0'

artisanlib/main.py

@@ -3475,7 +3475,7 @@ def redraw(self, recomputeAllDeltas=True, smooth=False):
 
 
                 #if recorder on
-                if self.flagon:
+                if self.flagon and self.eventsshowflag:
                     #update to last event
                     if Nevents:
                         aw.etypeComboBox.setCurrentIndex(self.specialeventstype[Nevents-1])
@@ -14882,13 +14882,15 @@ def HottopControlOff(self):
         aw.button_10.setStyleSheet(aw.pushbuttonstyles["PID"])
 
     def HottopControlOn(self):
-        # start drum motor
-        aw.qmc.hottop_SET_DRUM_MOTOR = 1
-        aw.button_10.setStyleSheet(aw.pushbuttonstyles["PIDactive"])
-        if not self.HottopControlActive:
-            aw.sendmessage(QApplication.translate("Message","Hottop control turned on", None, QApplication.UnicodeUTF8))            
-        self.HottopControlActive = True
-        self.sendHottopControl()
+        pass
+# deactivated for now due to safety concerns
+#        # start drum motor
+#        aw.qmc.hottop_SET_DRUM_MOTOR = 1
+#        aw.button_10.setStyleSheet(aw.pushbuttonstyles["PIDactive"])
+#        if not self.HottopControlActive:
+#            aw.sendmessage(QApplication.translate("Message","Hottop control turned on", None, QApplication.UnicodeUTF8))            
+#        self.HottopControlActive = True
+#        self.sendHottopControl()
 
     def sendHottopControl(self):
         if self.HottopControlActive:   
@@ -23634,6 +23636,9 @@ def __init__(self):
         self.YOCTOchan2 = None
         #stores the id of the meter HH506RA as a string
         self.HH506RAid = "X"
+        #MS6514 variables
+        self.MS6514PrevTemp1 = -1
+        self.MS6514PrevTemp2 = -1
         #select PID type that controls the roaster.
         # Reads/Controls ET
         self.controlETpid = [0,1]        # index0: type of pid: 0 = FujiPXG, 1 = FujiPXR3, 2 = DTA 
@@ -35393,12 +35398,15 @@ def main():
     # font fix for OS X 10.9
     try:
         v, _, _ = platform.mac_ver()
-        v = float('.'.join(v.split('.')[:2]))
-        if v >= 10.10:
-            # fix Mac OS X 10.10 (Yosemite) font issue
+        #v = float('.'.join(v.split('.')[:2]))
+        v = v.split('.')[:2]
+        major = int(v[0])
+        minor = int(v[1])
+        if major >= 10 and minor >= 10: #v >= 10.10:
+            # fix Mac OS X 10.10 (Yosemite) font issue [seems not to have any effect!?]
             # https://bugreports.qt-project.org/browse/QTBUG-40833
             QFont.insertSubstitution(".Helvetica Neue DeskInterface", "Helvetica Neue")  
-        elif v >= 10.9:
+        if major >= 10 and minor >= 9: #v >= 10.9:
             # fix Mac OS X 10.9 (Mavericks) font issue
             # https://bugreports.qt-project.org/browse/QTBUG-32789
             QFont.insertSubstitution(".Lucida Grande UI", "Lucida Grande")            

debian/usr/share/doc/artisan/changelog

@@ -1,3 +1,10 @@
+artisan (0.9.4-0) precise; urgency=low
+  * new upstream release
+  * changes since 0.9.3:
+   - adds alarm table sorting
+   - bug fixes
+ --  <[email protected]>  Sat, 6 Jun 2015 19:32:14 +0200
+
 artisan (0.9.3-3) precise; urgency=low
   * new upstream release
   * changes since 0.9.2:

setup-install.nsi

@@ -73,7 +73,7 @@ RequestExecutionLevel admin
 ; HM NIS Edit Wizard helper defines
 !define py2exeOutputDir 'dist'
 !define PRODUCT_NAME "Artisan"
-!define PRODUCT_VERSION "0.9.3.3"
+!define PRODUCT_VERSION "0.9.4.0"
 !define PRODUCT_PUBLISHER "The Artisan Team"
 !define PRODUCT_WEB_SITE "http://code.google.com/p/artisan/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\artisan.exe"

setup-packages-mac.txt

@@ -21,7 +21,7 @@ o py2app 0.9
 o pymodbus 1.3.0
 o yoctopuce 1.10.16490
 o requests 2.3.0
-o bottle 0.12.7
+o bottle 0.13 trunk
 o gevent 1.0.1
 o geventwebsocket 0.9.3
 o appnope 0.1