Merge pull request #59 from Roastero/issue57

Issue57 branch - resolves issue #57

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.2.0rc3
+current_version = 1.2.1
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<iter>\d+))?

build-app-requirements.txt

@@ -1,3 +1,3 @@
 PyQt5>=5.8,<5.9
 matplotlib>=2.0,<2.1
-freshroastsr700>=0.2.1
+freshroastsr700>=0.2.3

docs/wiki/developers_building_a_distributable_pkg.md

@@ -29,7 +29,8 @@ Alternately, if you already have git installed, you should clone the Openroast p
 6. Type `build_win.ps1 -tool_install` and press Enter.  The following things will happen:
     1. installer downloads for python 3.5 for Windows, git, and NSIS. (Note that the git installer insists on re-installing git every time.  If this is something you want to avoid, you should modify build_win.ps1 to not download nor install git.)
     2. Install python 3.5 for Windows, git, and NSIS
-7. You are now in a position to fetch the source code from github, if you haven't done so already.
+7. In order for the build script to invoke git, you will need to close the PowerShell prompt and re-start it.
+8. You are now in a position to fetch the source code from github, if you haven't done so already.
 
 ## 2. Getting the source code
 
@@ -97,7 +98,13 @@ Assuming you have a Terminal window opened to the directory of interest as direc
 1. At the Terminal prompt, type `./build_mac.sh -n -f` and press Enter.  You are now fetching the head of the master branch. (To fetch a different branch, type `./build_mac.sh -n -b <name> -f` instead, where `<name>` is the name of the branch you want to fetch.)
 2. You now have the code locally.  You'll want to `cd Roastero/Openroast` and continue working from there.
 
-## 3. Incrementing the version number
+## 3. Getting project dependencies
+
+1. Type `./build_mac.sh -n -p` and press Enter.  The following things will happen:
+    1. Install application dependencies.
+    2. Install a couple of python-based tools.
+
+## 4. Incrementing the version number
 
 This is not a mandatory step.
 
@@ -109,11 +116,11 @@ If you want to increment any part of the version number, you can do so by
 3. This will only work if your repository is clean (meaning, all changes have been committed). If that isn't the case, bumpversion will refuse to increment the version number.
 4. Once you have executed this successfully, you should `git push --tags origin <branch-name>` to commit the version tag and associated file changes to the Openroast project origin.  (If this is unclear to you, you should contact a project maintainer for guidance...)
 
-## 4. Creating a Mac app contained in a DMG
+## 5. Creating a Mac app contained in a DMG
 
 Assuming you're in Terminal and currently in the `[YourWhateverFolderPath]\Roastero\Openroast` folder, you can create an app build by typing `./build_mac.sh -n -m` and pressing Enter.  A disk image (DMG) containing the app will be created in the folder `[YourWhateverFolderPath]/Roastero/Openroast/dmg`.   You'll want to test this app on a separate Mac machine to verify functionality.
 
-## 5. Posting the installer on Github
+## 6. Posting the installer on Github
 
 At this point, you have an app packaged as a DMG that you believe is functional and ready for distribution.
 

openroast/version.py

@@ -1,2 +1,2 @@
-__version__ = "1.2.0rc3"
+__version__ = "1.2.1"
 

openroast/views/roasttab.py

@@ -20,6 +20,11 @@ def __init__(self, roaster, recipes):
         self.sectTimeSliderPressed = False
         self.tempSliderPressed = False
 
+        # Use a blinker for connect_state == CS_CONNECTING...
+        self._connecting_blinker = True
+        self.CONNECT_TXT_PLEASE_CONNECT = "Please connect your roaster."
+        self.CONNECT_TXT_CONNECTING = "Found roaster, connecting. This could take >20 seconds "
+
         # process-safe flag to schedule controller vars update from recipe obj
         self._flag_update_controllers = sharedctypes.Value('i', 0)
 
@@ -65,7 +70,7 @@ def create_ui(self):
         self.layout.addLayout(self.progressBar, 1, 0, 1, 2, QtCore.Qt.AlignCenter)
 
         # Create not connected label.
-        self.connectionStatusLabel = QtWidgets.QLabel("Please connect your roaster.")
+        self.connectionStatusLabel = QtWidgets.QLabel(self.CONNECT_TXT_PLEASE_CONNECT)
         self.connectionStatusLabel.setObjectName("connectionStatus")
         self.connectionStatusLabel.setAlignment(QtCore.Qt.AlignCenter)
         self.layout.addWidget(self.connectionStatusLabel, 0, 0)
@@ -110,6 +115,18 @@ def update_data(self):
             self.connectionStatusLabel.setHidden(True)
             self.setEnabled(True)
         else:
+            if self.roaster.connect_state == self.roaster.CS_CONNECTING:
+                # this means that the roaster has just been plugged in
+                # sometimes, it takes a while to complete the connection...
+                connecting_str = self.CONNECT_TXT_CONNECTING
+                if self._connecting_blinker:
+                    connecting_str += "  ...   "
+                else:
+                    connecting_str += "     ..."
+                self._connecting_blinker = not self._connecting_blinker
+                self.connectionStatusLabel.setText(connecting_str)
+            else:
+                self.connectionStatusLabel.setText(self.CONNECT_TXT_PLEASE_CONNECT)
             self.connectionStatusLabel.setHidden(False)
             self.setEnabled(False)
 

setup.py

@@ -50,7 +50,7 @@ def package_files(directory):
     long_description=long_description,
 
     # The project's main homepage.
-    url='https://github.com/Roastero/openroast',
+    url='https://github.com/Roastero/Openroast',
 
     # Author details
     author='Roastero',
@@ -65,7 +65,7 @@ def package_files(directory):
         #   3 - Alpha
         #   4 - Beta
         #   5 - Production/Stable
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 5 - Production/Stable',
 
         # Indicate who your project is intended for
         'Intended Audience :: Developers',