Skip to content

Commit

Permalink
optimization for linux
Browse files Browse the repository at this point in the history
  • Loading branch information
Neutree committed Nov 13, 2018
1 parent e22a906 commit 097c7f0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
16 changes: 11 additions & 5 deletions COMTool/Main.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import sys,os
import parameters,helpAbout,autoUpdate
from Combobox import ComboBox
try:
import parameters,helpAbout,autoUpdate
from Combobox import ComboBox
except ImportError:
from COMTool import parameters,helpAbout,autoUpdate
from COMTool.Combobox import ComboBox

# from COMTool.wave import Wave
from PyQt5.QtCore import pyqtSignal,Qt
from PyQt5.QtWidgets import (QApplication, QWidget,QToolTip,QPushButton,QMessageBox,QDesktopWidget,QMainWindow,
Expand Down Expand Up @@ -270,6 +275,7 @@ def initWindow(self):
if sys.platform == "win32":
ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID("comtool")
self.show()
print("config file path:",os.getcwd()+"comtool.settings.config")
return

def initEvent(self):
Expand Down Expand Up @@ -640,7 +646,7 @@ def programExitSaveParameters(self):
else:
paramObj.dtr = 0
paramObj.encodingIndex = self.encodingCombobox.currentIndex()
f = open("settings.config","wb")
f = open("comtool.settings.config","wb")
f.truncate()
pickle.dump(paramObj, f)
pickle.dump(paramObj.sendHistoryList,f)
Expand All @@ -650,12 +656,12 @@ def programExitSaveParameters(self):
def programStartGetSavedParameters(self):
paramObj = parameters.ParametersToSave()
try:
f = open("settings.config", "rb")
f = open("comtool.settings.config", "rb")
paramObj = pickle.load( f)
paramObj.sendHistoryList = pickle.load(f)
f.close()
except Exception as e:
f = open("settings.config", "wb")
f = open("comtool.settings.config", "wb")
f.close()
self.serailBaudrateCombobox.setCurrentIndex(paramObj.baudRate)
self.serailBytesCombobox.setCurrentIndex(paramObj.dataBytes)
Expand Down
8 changes: 6 additions & 2 deletions COMTool/autoUpdate.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import webbrowser
import urllib.request
from bs4 import BeautifulSoup
import helpAbout,parameters
try:
import helpAbout,parameters
except ImportError:
from COMTool import helpAbout,parameters


class AutoUpdate:
updateUrl = "https://github.com/Neutree/COMTool/releases"
Expand All @@ -13,7 +17,7 @@ def detectNewVersion(self):
for v in soup.select('.label-latest .css-truncate-target'):
versionStr = v.get_text()
version = list(map(int, versionStr[1:].split(".")))
print("The latest is %s, now:V%d.%d" %(versionStr,helpAbout.versionMajor,helpAbout.versionMinor))
print("The latest is %s, now:V%d.%d.%d" %(versionStr,helpAbout.versionMajor,helpAbout.versionMinor, helpAbout.versionDev))
if version[0]*10+version[1] > helpAbout.versionMajor*10+helpAbout.versionMinor:
return True
return False
Expand Down
2 changes: 1 addition & 1 deletion COMTool/helpAbout.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

versionMajor = 1
versionMinor = 7
versionDev = 3
versionDev = 6
date = "2018.11.13"

def strAbout():
Expand Down

0 comments on commit 097c7f0

Please sign in to comment.