Skip to content

Commit 097c7f0

Browse files
committed
optimization for linux
1 parent e22a906 commit 097c7f0

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

COMTool/Main.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
import sys,os
2-
import parameters,helpAbout,autoUpdate
3-
from Combobox import ComboBox
2+
try:
3+
import parameters,helpAbout,autoUpdate
4+
from Combobox import ComboBox
5+
except ImportError:
6+
from COMTool import parameters,helpAbout,autoUpdate
7+
from COMTool.Combobox import ComboBox
8+
49
# from COMTool.wave import Wave
510
from PyQt5.QtCore import pyqtSignal,Qt
611
from PyQt5.QtWidgets import (QApplication, QWidget,QToolTip,QPushButton,QMessageBox,QDesktopWidget,QMainWindow,
@@ -270,6 +275,7 @@ def initWindow(self):
270275
if sys.platform == "win32":
271276
ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID("comtool")
272277
self.show()
278+
print("config file path:",os.getcwd()+"comtool.settings.config")
273279
return
274280

275281
def initEvent(self):
@@ -640,7 +646,7 @@ def programExitSaveParameters(self):
640646
else:
641647
paramObj.dtr = 0
642648
paramObj.encodingIndex = self.encodingCombobox.currentIndex()
643-
f = open("settings.config","wb")
649+
f = open("comtool.settings.config","wb")
644650
f.truncate()
645651
pickle.dump(paramObj, f)
646652
pickle.dump(paramObj.sendHistoryList,f)
@@ -650,12 +656,12 @@ def programExitSaveParameters(self):
650656
def programStartGetSavedParameters(self):
651657
paramObj = parameters.ParametersToSave()
652658
try:
653-
f = open("settings.config", "rb")
659+
f = open("comtool.settings.config", "rb")
654660
paramObj = pickle.load( f)
655661
paramObj.sendHistoryList = pickle.load(f)
656662
f.close()
657663
except Exception as e:
658-
f = open("settings.config", "wb")
664+
f = open("comtool.settings.config", "wb")
659665
f.close()
660666
self.serailBaudrateCombobox.setCurrentIndex(paramObj.baudRate)
661667
self.serailBytesCombobox.setCurrentIndex(paramObj.dataBytes)

COMTool/autoUpdate.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import webbrowser
22
import urllib.request
33
from bs4 import BeautifulSoup
4-
import helpAbout,parameters
4+
try:
5+
import helpAbout,parameters
6+
except ImportError:
7+
from COMTool import helpAbout,parameters
8+
59

610
class AutoUpdate:
711
updateUrl = "https://github.com/Neutree/COMTool/releases"
@@ -13,7 +17,7 @@ def detectNewVersion(self):
1317
for v in soup.select('.label-latest .css-truncate-target'):
1418
versionStr = v.get_text()
1519
version = list(map(int, versionStr[1:].split(".")))
16-
print("The latest is %s, now:V%d.%d" %(versionStr,helpAbout.versionMajor,helpAbout.versionMinor))
20+
print("The latest is %s, now:V%d.%d.%d" %(versionStr,helpAbout.versionMajor,helpAbout.versionMinor, helpAbout.versionDev))
1721
if version[0]*10+version[1] > helpAbout.versionMajor*10+helpAbout.versionMinor:
1822
return True
1923
return False

COMTool/helpAbout.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
versionMajor = 1
99
versionMinor = 7
10-
versionDev = 3
10+
versionDev = 6
1111
date = "2018.11.13"
1212

1313
def strAbout():

0 commit comments

Comments
 (0)