From 4d4fd6c7329306b165ccbe750488813f4acd9568 Mon Sep 17 00:00:00 2001 From: madgrizzle Date: Wed, 15 Apr 2020 08:13:58 -0400 Subject: [PATCH] Revert "PR attempt" --- DataStructures/data.py | 2 +- File/gcodeFile.py | 16 +++---- ReleaseManager/releaseManager.py | 74 ++++++++++--------------------- defaultwebcontrol.json | 22 ++++----- main.py | 1 + static/scripts/touch.js | 48 -------------------- templates/frontpage3d_mobile.html | 1 - 7 files changed, 44 insertions(+), 120 deletions(-) delete mode 100644 static/scripts/touch.js diff --git a/DataStructures/data.py b/DataStructures/data.py index 9d36e56a..9c9ab173 100644 --- a/DataStructures/data.py +++ b/DataStructures/data.py @@ -38,7 +38,7 @@ class Data: Version Updater ''' lastChecked = -1 - pyInstallCurrentVersion = 0.933 + pyInstallCurrentVersion = 0.830 pyInstallUpdateAvailable = False pyInstallUpdateBrowserUrl = "" pyInstallUpdateVersion = 0 diff --git a/File/gcodeFile.py b/File/gcodeFile.py index bfae9c4f..b027b21c 100644 --- a/File/gcodeFile.py +++ b/File/gcodeFile.py @@ -338,14 +338,14 @@ def drawMCommand(self, mString): self.line3D[-1].dashed = False def getSpindleSpeed(self, mString): - sPos = mString.find("S") - speed = "" - if sPos != -1: - speed = mString[sPos+1:] - if speed != "": - return float(speed) - else: - return 0 + code = mString[mString.find("S")+1:] + try: + if code!="": + return float(code) + else: + return 0 + except: + return -1 def getToolNumber(self, mString): code0 = mString.find("T") diff --git a/ReleaseManager/releaseManager.py b/ReleaseManager/releaseManager.py index a49113fb..11191dd3 100644 --- a/ReleaseManager/releaseManager.py +++ b/ReleaseManager/releaseManager.py @@ -21,16 +21,7 @@ def __init__(self): latestRelease = None def getReleases(self): - tempReleases = [] - enableExperimental = self.data.config.getValue("WebControl Settings", "experimentalReleases") - for release in self.releases: - if not enableExperimental: - if not self.isExperimental(re.sub(r'[v]', r'', release.tag_name)): - tempReleases.append(release) - else: - tempReleases.append(release) - return tempReleases - + return self.releases def getLatestRelease(self): return self.latestRelease @@ -39,23 +30,18 @@ def checkForLatestPyRelease(self): if True: # self.data.platform=="PYINSTALLER": print("Checking latest pyrelease.") try: - enableExperimental = self.data.config.getValue("WebControl Settings", "experimentalReleases") g = Github() repo = g.get_repo("madgrizzle/WebControl") self.releases = repo.get_releases() latestVersionGithub = 0 self.latestRelease = None + # type = self.data.pyInstallType + platform = self.data.pyInstallPlatform for release in self.releases: tag_name = re.sub(r'[v]', r'', release.tag_name) tag_float = float(tag_name) - eligible = False - if not enableExperimental: - if not self.isExperimental(tag_name): - eligible = True - else: - eligible = True - #print("tag:"+tag_name+", eligible:"+str(eligible)) - if eligible and tag_float > latestVersionGithub: + # print(tag_name) + if tag_float > latestVersionGithub: latestVersionGithub = tag_float self.latestRelease = release @@ -64,7 +50,7 @@ def checkForLatestPyRelease(self): print("Latest release tag: " + self.latestRelease.tag_name) assets = self.latestRelease.get_assets() for asset in assets: - if asset.name.find(self.data.pyInstallType) != -1 and asset.name.find(self.data.pyInstallPlatform) != -1: + if asset.name.find(type) != -1 and asset.name.find(platform) != -1: print(asset.name) print(asset.url) self.data.ui_queue1.put("Action", "pyinstallUpdate", "on") @@ -74,20 +60,6 @@ def checkForLatestPyRelease(self): except Exception as e: print("Error checking pyrelease: " + str(e)) - def isExperimental(self, tag): - ''' - Deternmines if release is experimental. All even releases are stable, odd releases are experimental - :param tag: - :return: - ''' - if float(tag) <= 0.931: # all releases before now are 'stable' - return False - lastDigit = tag[-1] - if (int(lastDigit) % 2) == 0: # only even releases are 'stable' - return False - else: - return True - def processAbsolutePath(self, path): index = path.find("main.py") self.data.pyInstallInstalledPath = path[0:index - 1] @@ -151,22 +123,22 @@ def make_executable(self, path): def update(self, version): - ''' - Need to clean this up. - :param version: - :return: - ''' - for release in self.releases: - if release.tag_name == version: - assets = release.get_assets() - for asset in assets: - if asset.name.find(self.data.pyInstallType) != -1 and asset.name.find(self.data.pyInstallPlatform) != -1: - print(asset.name) - print(asset.url) - self.data.pyInstallUpdateBrowserUrl = asset.browser_download_url - print(self.data.pyInstallUpdateBrowserUrl) - return self.updatePyInstaller(True) - print("hmmm.. issue") - return False + if version == self.latestRelease.tag_name: + return self.updatePyInstaller() + else: + print("downgrade to ") + print(version) + type = self.data.pyInstallType + platform = self.data.pyInstallPlatform + for release in self.releases: + if release.tag_name == version: + assets = release.get_assets() + for asset in assets: + if asset.name.find(type) != -1 and asset.name.find(platform) != -1: + print(asset.name) + print(asset.url) + self.data.pyInstallUpdateBrowserUrl = asset.browser_download_url + print(self.data.pyInstallUpdateBrowserUrl) + return self.updatePyInstaller(True) diff --git a/defaultwebcontrol.json b/defaultwebcontrol.json index de9d960d..021557c7 100644 --- a/defaultwebcontrol.json +++ b/defaultwebcontrol.json @@ -975,13 +975,13 @@ "value": ".nc, .ngc, .text, .gcode" }, { - "default": 0, + "default": "0", "desc": "Use 3D render with orbital controls in lieu of standard 2D rendering with pan/zoom\ndefault setting: False", "key": "enable3D", "section": "WebControl Settings", "title": "Enable 3D Display", "type": "bool", - "value": 0 + "value": "0" }, { "default": 5000, @@ -991,15 +991,6 @@ "title": "Web Port Number", "type": "int", "value": 5000 - }, - { - "default": 0, - "desc": "Enable experimental releases to appear in release list\ndefault setting: No", - "key": "experimentalReleases", - "section": "WebControl Settings", - "title": "Enable Experimental Releases", - "type": "bool", - "value": 0 } ], "Camera Settings": [ @@ -1271,5 +1262,14 @@ "value": "" } + + + + + + + + + ] } \ No newline at end of file diff --git a/main.py b/main.py index 81cda332..b20fb2a0 100644 --- a/main.py +++ b/main.py @@ -7,6 +7,7 @@ import os import sys + monkey.patch_all() diff --git a/static/scripts/touch.js b/static/scripts/touch.js deleted file mode 100644 index eab10b48..00000000 --- a/static/scripts/touch.js +++ /dev/null @@ -1,48 +0,0 @@ -var onlongtouch; -var timer; -var touchduration = 1500; //length of time we want the user to touch before we do something -var lastTouchEvent = null; - - -function touchstart(e) { - e.preventDefault(); - lastTouchEvent = e; - if (!timer) { - timer = setTimeout(function() { - onlongtouch(lastTouchEvent); - timer = null; - lastTouchEvent = null; - }, touchduration); - } -} - -function touchend(e) { - //stops short touches from firing the event - if (timer) { - clearTimeout(timer); - timer = null; - lastTouchEvent = null; - } -} - -onlongtouch = function(e) { - console.log("long touch detected", e.touches[0].clientX, e.touches[0].clientY); - event = { - clientX: e.touches[0].clientX, - clientY: e.touches[0].clientY - } - var pos = cursorPosition(); - x = pos.x; - x = x.toFixed(4); - pos.x = x; - - y = pos.y; - y = y.toFixed(4); - pos.y = y; - requestPage("screenAction",pos) -}; - -document.addEventListener("DOMContentLoaded", function(event) { - $("#workarea")[0].addEventListener("touchstart", touchstart, false); - $("#workarea")[0].addEventListener("touchend", touchend, false); -}); diff --git a/templates/frontpage3d_mobile.html b/templates/frontpage3d_mobile.html index d3df7ca9..812d0db1 100644 --- a/templates/frontpage3d_mobile.html +++ b/templates/frontpage3d_mobile.html @@ -12,7 +12,6 @@ -