abs-path instead relative, cleanup code

This commit is contained in:
2024-09-25 07:20:57 +02:00
parent 3a0367073e
commit 457ea0e675
4 changed files with 13 additions and 13 deletions

View File

@@ -91,13 +91,14 @@ logging.basicConfig(level=logging.INFO, format='%(levelname)s:%(module)s:%(linen
_log = logging.getLogger("swissmx")
if __name__=="__main__":
import sys,socket
import os,sys,socket
if socket.gethostname()=='ganymede':
sys.path.insert(0, os.path.expanduser('~/Documents/prj/SwissFEL/PBTools'))
base=os.path.abspath(os.path.dirname(__file__))
sys.path.insert(0, os.path.abspath(os.path.join(base,'../PBSwissMX/python')))
sys.path.insert(0, os.path.abspath(os.path.join(base,'../../PBTools')))
else:
sys.path.insert(0, '/sf/cristallina/applications/SwissMX/PBTools')
sys.path.insert(0, '/sf/cristallina/applications/SwissMX/PBSwissMX/python')
#_log.info(sys.path)
import time
class timestamp():
@@ -235,8 +236,7 @@ class StartupSplash:
app.processEvents()
time.sleep(.1)
Ui_MainWindow, QMainWindow = loadUiType("swissmx.ui")
Ui_MainWindow, QMainWindow = loadUiType(os.path.join(os.path.dirname(__file__),"swissmx.ui"))
class WndSwissMx(QMainWindow, Ui_MainWindow):
sigNewCamImg = pyqtSignal() # index in self._grids
@@ -273,7 +273,8 @@ class WndSwissMx(QMainWindow, Ui_MainWindow):
self.setWindowTitle(title)
self._do_quit = False
qtawesome.load_font("material", "MaterialIcons-Regular.ttf", "MaterialIcons-Regular.json", "fonts/",)
path=os.path.join(os.path.dirname(__file__),"fonts")
qtawesome.load_font("material", "MaterialIcons-Regular.ttf", "MaterialIcons-Regular.json", path)
QtGui.QFontDatabase.addApplicationFont("fonts/Inconsolata-Bold.ttf")
QtGui.QFontDatabase.addApplicationFont("fonts/Baloo-Regular.ttf")
@@ -798,7 +799,7 @@ class WndSwissMx(QMainWindow, Ui_MainWindow):
# ctypes.string_at(0)
def load_stylesheet(self):
with open("swissmx.css", "r") as sheet:
with open(os.path.join(os.path.dirname(__file__),"swissmx.css"), "r") as sheet:
self.setStyleSheet(sheet.read())
def setup_sliders(self):