minor adjustments in preparation of the v1.4 release

Author: MAKOMO

src/README.txt

@@ -1,11 +1,11 @@
 Artisan helps coffee roasters record, analyze, and control roast profiles. With the help of a thermocouple data logger, or a proportional–integral–derivative controller (PID controller), this software offers roasting metrics to help make decisions that influence the final coffee flavor.
-
-Artisan is free for personal and commercial use, but asks for a donation <https://www.paypal.me/MarkoLuther>.
+
+Artisan is free for personal and commercial use, but asks for a donation <https://www.paypal.me/MarkoLuther>.
 
 
 HOME
-
-<https://artisan-scope.org>
+
+<https://artisan-scope.org>
 
 The home of its development is on GitHub were all source and binary files are available as well as an issue tracker.
 
@@ -25,25 +25,25 @@ https://artisan-roasterscope.blogspot.de
 
 FEATURES
 
-Runs on 64bit Windows 8, Mac OS X 10.13, Redhat/Debian Linux (incl. Raspberry Pi) and supports a large number of devices and roasting machines. See <https://artisan-scope.org/devices/index> for supported Supported Devices and <https://artisan-scope.org/machines/index> for supported machines.
-
-Artisan offers
-- unlimited number of curves
-- rate-of-rise (RoR), area-under-the-curve (AUC), development-time-ratio (DTR) calculations
-- projection lines and head-up-display (HUD)
-- roast profile evaluation and statistics
-- roast-, production- and ranking reports
-- automated reproduction of roasts via alarm programs, replay of events or PID control
-- batch counter
-- profile designer, cupping editor, spider- and wheel graph
-- user defined buttons and sliders with programable actions
-- many import and export formats
+Runs on 64bit Windows 8, Mac OS X 10.13 (legacy builds support 10.10), Redhat/Debian Linux (incl. Raspberry Pi) and supports a large number of devices and roasting machines. See <https://artisan-scope.org/devices/index> for supported Supported Devices and <https://artisan-scope.org/machines/index> for supported machines.
+
+Artisan offers
+- unlimited number of curves
+- rate-of-rise (RoR), area-under-the-curve (AUC), development-time-ratio (DTR) calculations
+- projection lines and head-up-display (HUD)
+- roast profile evaluation and statistics
+- roast-, production- and ranking reports
+- automated reproduction of roasts via alarm programs, replay of events or PID control
+- batch counter
+- profile designer, cupping editor, spider- and wheel graph
+- user defined buttons and sliders with programable actions
+- many import and export formats
 
 
 INSTALLATION
 
 See <https://github.com/artisan-roaster-scope/artisan/blob/master/wiki/Installation.md>
-
+
 
 
 LICENCE
@@ -83,13 +83,13 @@ Artisan uses the following libraries in unmodified forms:
 - pyinstaller under the GPL license
   http://www.pyinstaller.org
 - pymodbus under the BSD License by Galen Collins
-  https://github.com/bashwork/pymodbus
-- python-snap7 under MIT license
+  https://github.com/bashwork/pymodbus
+- python-snap7 under MIT license
   https://github.com/gijzelaerr/python-snap7 
 - arabic_reshaper.py under GPL by Abd Allah Diab (Mpcabd)
 
 
 
 VERSION HISTORY
-
+
 See <https://github.com/artisan-roaster-scope/artisan>

src/artisanlib/main.py

@@ -11109,6 +11109,11 @@ def __init__(self, parent = None):
 
         #FILE menu
         self.newRoastMenu = self.fileMenu.addMenu(UIconst.FILE_MENU_NEW)
+        # add NEW menu item
+        newRoastAction = QAction(UIconst.FILE_MENU_NEW,self)
+        newRoastAction.setShortcut(QKeySequence.New)
+        newRoastAction.triggered.connect(self.newRoast)
+        self.newRoastMenu.addAction(newRoastAction)
 
         self.fileLoadAction = QAction(UIconst.FILE_MENU_OPEN,self)
         self.fileLoadAction.setShortcut(QKeySequence.Open)
@@ -12845,10 +12850,10 @@ def newRecentRoast(self):
     def updateNewMenuRecentRoasts(self):
         self.newRoastMenu.clear()
         # add NEW menu item
-        self.newRoastAction = QAction(UIconst.FILE_MENU_NEW,self)
-        self.newRoastAction.setShortcut(QKeySequence.New)
-        self.newRoastAction.triggered.connect(self.newRoast)
-        self.newRoastMenu.addAction(self.newRoastAction)
+        newRoastAction = QAction(UIconst.FILE_MENU_NEW,self)
+        newRoastAction.setShortcut(QKeySequence.New)
+        newRoastAction.triggered.connect(self.newRoast)
+        self.newRoastMenu.addAction(newRoastAction)
         # add recent roasts items
         if len(self.recentRoasts) > 0:
             self.newRoastMenu.addSeparator()
@@ -16254,12 +16259,12 @@ def newRoast(self):
         #########################################
         if self.qmc.flagstart:
             if self.qmc.timeindex[0] == -1:
-                self.sendmessage(QApplication.translate("Message","No profile found", None))
+                self.sendmessage(QApplication.translate("Message","NEW ROAST canceled: incomplete profile lacking CHARGE and DROP found", None))
                 return
             #mark drop if not yet done
             if self.qmc.timeindex[6] == 0:
 #                self.qmc.markDrop()
-                self.sendmessage(QApplication.translate("Message","No profile found", None))
+                self.sendmessage(QApplication.translate("Message","NEW ROAST canceled: incomplete profile lacking DROP found", None))
                 return
             #invoke "OFF"
             self.qmc.OffMonitor()
@@ -17850,19 +17855,19 @@ def setProfile(self,filename,profile,quiet=False):
             else:            
                 self.qmc.title = QApplication.translate("Scope Title", "Roaster Scope",None)
 
-##PLUS (for now stored but not loaded)
-##            if "plus_store" in profile:
-##                self.qmc.plus_store = d(profile["plus_store"])
-##            else:
-##                self.qmc.plus_store = None  
-##            if "plus_coffee" in profile:
-##                self.qmc.plus_coffee = d(profile["plus_coffee"])
-##            else:
-##                self.qmc.plus_coffee = None
-##            if "plus_blend" in profile:
-##                self.qmc.plus_blend = d(profile["plus_blend"])
-##            else:
-##                self.qmc.plus_blend = None
+##PLUS
+            if "plus_store" in profile:
+                self.qmc.plus_store = d(profile["plus_store"])
+            else:
+                self.qmc.plus_store = None  
+            if "plus_coffee" in profile:
+                self.qmc.plus_coffee = d(profile["plus_coffee"])
+            else:
+                self.qmc.plus_coffee = None
+            if "plus_blend" in profile:
+                self.qmc.plus_blend = d(profile["plus_blend"])
+            else:
+                self.qmc.plus_blend = None
 
 
             if "beans" in profile:
@@ -18462,6 +18467,7 @@ def getProfile(self):
             profile["volume"] = [self.qmc.volume[0],self.qmc.volume[1],encodeLocal(self.qmc.volume[2])]
             profile["density"] = [self.qmc.density[0],encodeLocal(self.qmc.density[1]),self.qmc.density[2],encodeLocal(self.qmc.density[3])]
             profile["roastertype"] = encodeLocal(self.qmc.roastertype)
+            profile["machinesetup"] = encodeLocal(self.qmc.machinesetup)
             profile["operator"] = encodeLocal(self.qmc.operator)
             profile["drumspeed"] = self.qmc.drumspeed
             profile["heavyFC"] = self.qmc.heavyFC_flag
@@ -18864,16 +18870,17 @@ def settingsLoad(self, filename=None):
 
             if settings.contains("fullscreen"):
                 self.full_screen_mode_active = bool(toBool(settings.value("fullscreen",self.full_screen_mode_active)))
-#PLUS                
-            if settings.contains("plus_account"):
-                self.plus_account = settings.value("plus_account",self.plus_account)
-                self.plus_remember_credentials = bool(toBool(settings.value("plus_remember_credentials",self.plus_remember_credentials)))
-                if self.plus_account is not None:
-                    try:
-                        import plus.controller
-                        plus.controller.start(aw)
-                    except:
-                        pass
+
+#PLUS-COMMENT
+#            if settings.contains("plus_account"):
+#                self.plus_account = settings.value("plus_account",self.plus_account)
+#                self.plus_remember_credentials = bool(toBool(settings.value("plus_remember_credentials",self.plus_remember_credentials)))
+#                if self.plus_account is not None:
+#                    try:
+#                        import plus.controller
+#                        plus.controller.start(aw)
+#                    except:
+#                        pass
 
             #restore mode
             old_mode = self.qmc.mode
@@ -19956,7 +19963,7 @@ def settingsLoad(self, filename=None):
                     else:
                         self.recentRoasts = []
                     self.updateNewMenuRecentRoasts()
-                except:
+                except Exception:
                     pass
 
 #            #update axis limits
@@ -28051,6 +28058,13 @@ def __init__(self, parent = None):
         self.setModal(True)
         self.setWindowTitle(QApplication.translate("Form Caption","Roast Properties",None))        
 
+        # remember parameters related to plus_coffee/plus_blend
+        # if any of those changed manually while in non-plus mode, plus_coffee, plus_blend an plus_stock needs to be reset
+        self.org_beans = aw.qmc.beans
+        self.org_density = aw.qmc.density
+        self.org_beansize_min = aw.qmc.beansize_min
+        self.org_beansize_max = aw.qmc.beansize_max
+        self.org_moisture_greens = aw.qmc.moisture_greens
 
         self.org_specialevents = aw.qmc.specialevents
         self.org_specialeventstype = aw.qmc.specialeventstype
@@ -28651,7 +28665,7 @@ def __init__(self, parent = None):
         titleLine.addSpacing(5)
         titleLine.addWidget(self.titleShowAlwaysFlag) 
 
-#PLUS (keep)
+#PLUS
         self.plus_store_selected = None
         self.plus_coffee_selected = None
         self.plus_blend_selected = None        
@@ -28673,7 +28687,7 @@ def __init__(self, parent = None):
             self.plus_stores_combo = QComboBox()            
             self.plus_coffees_combo = QComboBox()
             self.plus_blends_combo = QComboBox()            
-            self.populatePlusCoffeeBlendCombos()            
+            self.populatePlusCoffeeBlendCombos()
             self.plus_stores_combo.currentIndexChanged.connect(self.storeSelectionChanged)
             self.plus_coffees_combo.currentIndexChanged.connect(self.coffeeSelectionChanged)            
             self.plus_blends_combo.currentIndexChanged.connect(self.blendSelectionChanged)           
@@ -28965,6 +28979,11 @@ def populatePlusCoffeeBlendCombos(self,storeIndex=None):
             self.plus_stores_combo.blockSignals(False)
 
         storeIdx = self.plus_stores_combo.currentIndex()
+        
+        # we reset the store if a coffee or blend is selected and the selected store is not equal to the default store
+        if (self.plus_coffee_selected or self.plus_blend_selected) and self.plus_store_selected != plus.stock.getStoreId(self.plus_stores[storeIdx-1]):
+            storeIdx = None
+        
         if storeIdx:
             self.plus_default_store = plus.stock.getStoreId(self.plus_stores[storeIdx-1])
         else:
@@ -28983,7 +29002,7 @@ def populatePlusCoffeeBlendCombos(self,storeIndex=None):
         if p is None:
             self.plus_coffees_combo.setCurrentIndex(0)
             if self.plus_blend_selected is None:
-                self.beansedit.setReadOnly(False)
+                self.setReadOnlyPlusBlendFields(False)
             self.plus_coffee_selected = None
             self.plus_coffees_combo.blockSignals(False)
         else:
@@ -29011,7 +29030,7 @@ def populatePlusCoffeeBlendCombos(self,storeIndex=None):
         if p is None:
             self.plus_blends_combo.setCurrentIndex(0)
             if self.plus_coffee_selected is None:
-                self.beansedit.setReadOnly(False)
+                self.setReadOnlyPlusCoffeeFields(False)
             self.plus_blend_selected = None
             self.plus_blends_combo.blockSignals(False)
         else:
@@ -29025,6 +29044,20 @@ def populatePlusCoffeeBlendCombos(self,storeIndex=None):
                 self.plus_blends_combo.blockSignals(False)
                 self.plus_blends_combo.setCurrentIndex(p+1)                
 
+    def setReadOnlyPlusCoffeeFields(self,b):
+        self.beansedit.setReadOnly(b)
+        self.bean_density_weightUnitsComboBox.setDisabled(b)
+        self.bean_density_volumeUnitsComboBox.setDisabled(b)
+        self.bean_density_weight_edit.setReadOnly(b)
+        self.bean_density_volume_edit.setReadOnly(b)
+        self.bean_density_weight_edit.setReadOnly(b)
+        self.bean_size_min_edit.setReadOnly(b)
+        self.bean_size_max_edit.setReadOnly(b)
+        self.moisture_greens_edit.setReadOnly(b)
+        
+    def setReadOnlyPlusBlendFields(self,b):
+        self.beansedit.setReadOnly(b)   
+        
     def fillBlendData(self,blend):
         import plus.stock
         try:
@@ -29036,6 +29069,7 @@ def fillBlendData(self,blend):
             self.beansedit.clear()
             for l in blend_lines:
                 self.beansedit.append(l)
+            self.setReadOnlyPlusBlendFields(True)
         except:
             pass
 
@@ -29067,17 +29101,17 @@ def fillCoffeeData(self,coffee):
         else:
             self.bean_size_min_edit.setText("0")
             self.bean_size_max_edit.setText("0")
-        self.standard_density()  
-        self.beansedit.setReadOnly(True)
+        self.standard_density()
+        self.setReadOnlyPlusCoffeeFields(True)
 
     def defaultCoffeeData(self):
         self.beansedit.setPlainText("")
-        self.beansedit.setReadOnly(False)
         self.moisture_greens_edit.setText(str(0))
         self.bean_density_weight_edit.setText(str(0))
         self.standard_density()
         self.bean_size_min_edit.setText("0")
         self.bean_size_max_edit.setText("0")
+        self.setReadOnlyPlusCoffeeFields(False)
 
     def storeSelectionChanged(self,n):
         if n != -1:
@@ -30225,6 +30259,15 @@ def accept(self):
             aw.qmc.roastbatchprefix = u(self.batchprefixedit.text())
             aw.qmc.roastbatchnr = self.batchcounterSpinBox.value()
             aw.qmc.roastbatchpos = self.batchposSpinBox.value()
+            
+        # Reset Plus if any of the plus_coffee related values changed
+        if aw.plus_account is None and aw.qmc.plus_coffee is not None and (self.org_beans != aw.qmc.beans or self.org_density != aw.qmc.density or \
+                self.org_beansize_min != aw.qmc.beansize_min or self.org_beansize_max != aw.qmc.beansize_max or \
+                self.org_moisture_greens != aw.qmc.moisture_greens):
+            aw.qmc.plus_coffee = None
+        if aw.plus_account is None and aw.qmc.plus_blend is not None and self.org_beans != aw.qmc.beans:
+            aw.qmc.plus_blend = None
+            
         aw.sendmessage(QApplication.translate("Message","Roast properties updated but profile not saved to disk", None))
         aw.qmc.redraw(recomputeAllDeltas=False)
         self.close()
@@ -45002,12 +45045,11 @@ def addalarm(self):
         self.setalarmtablerow(nalarms)
 
         header = self.alarmtable.horizontalHeader()
-        header.setStretchLastSection(False)
+        header.setStretchLastSection(True)
 
         if len(aw.qmc.alarmflag) == 1: # only for the first entry we apply some default column width
-            self.alarmtable.resizeColumnsToContents()
-            self.alarmtable.resizeRowsToContents()          
             # improve width of Qlineedit columns
+            self.alarmtable.resizeColumnsToContents()
             self.alarmtable.setColumnWidth(1,50)
             self.alarmtable.setColumnWidth(2,50)
             self.alarmtable.setColumnWidth(3,50)
@@ -45016,13 +45058,14 @@ def addalarm(self):
             self.alarmtable.setColumnWidth(6,70)
             self.alarmtable.setColumnWidth(7,90)
             self.alarmtable.setColumnWidth(8,50)
-            self.alarmtable.setColumnWidth(9,90)
+            self.alarmtable.setColumnWidth(9,90)         
             # remember the columnwidth
             for i in range(len(aw.qmc.alarmtablecolumnwidths)):
                 try:
                     self.alarmtable.setColumnWidth(i,aw.qmc.alarmtablecolumnwidths[i])
                 except:
                     pass
+            self.alarmtable.setSortingEnabled(True)
         else:
             self.deselectAll()
             # select newly added row i.e. the last one

src/artisanlib/modbusport.py

@@ -310,6 +310,7 @@ def writeCoil(self,slave,register,value):
     # write value to register on slave (function 6 for int or function 16 for float)
     # value can be one of string (containing an int or float), an int or a float
     def writeRegister(self,slave,register,value):
+#        print("writeRegister",slave,register,value)
         if stringp(value):
             if "." in value:
                 self.writeWord(slave,register,value)

src/build-mac3.sh

@@ -30,7 +30,7 @@ else
     export PYTHONPATH=$PYTHON/lib/python3.7
     export PYTHON_V=3.7
     export QT_PATH=${PYTHONPATH}/site-packages/PyQt5/Qt
-    export QT_SRC_PATH=~/Qt5.11.1/5.11.1/clang_64
+    export QT_SRC_PATH=~/Qt5.11.2/5.11.2/clang_64
     export MACOSX_DEPLOYMENT_TARGET=10.13
     export DYLD_LIBRARY_PATH=$PYTHON/lib:$DYLD_LIBRARY_PATH
     export ARTISAN_LEGACY_BUILD=false

src/debian/usr/share/doc/artisan/changelog

@@ -1,3 +1,19 @@
+artisan (1.4.0-0) precise; urgency=low
+  * new upstream release
+  * changes since 1.3.1:
+   - adds time guide
+   - adds additional PhasesLCD configurations
+   - adds export/convert to Excel and import/export to Probat Pilot v1.4
+   - adds channel tare
+   - adds playback DROP event
+   - adds always ON mode
+   - adds support for ambient data and Phidget ambient sensors HUM1000 and PRE1000
+   - adds PID P-on-Measurement/Input mode
+   - adds improved curve smoothing
+   - adds additional machine support for Atilla GOLD plus 7", Besca roasting machines, Coffee-Tech Engineering Ghibli and Diedrich Roasters
+   - bug fixes
+ --  <[email protected]>  Wed, 3 Oct 2018 19:32:14 +0200
+
 artisan (1.3.1-0) precise; urgency=low
   * new upstream release
   * changes since 1.3.0:

src/includes/Machines/Atilla/GOLD_plus_7''.aset

@@ -61,7 +61,7 @@ input6float=false
 input6mode=C
 input6register=0
 input6slave=0
-littleEndianFloats=true
+littleEndianFloats=false
 parity=N
 port=502
 stopbits=1