Browse Source

修改为相对路径

rmy 5 months ago
parent
commit
5e6b96716a
2 changed files with 16 additions and 13 deletions
  1. 13
    12
      Front/main_new.py
  2. 3
    1
      Front/modules/ui_functions.py

+ 13
- 12
Front/main_new.py View File

@@ -287,7 +287,7 @@ class MainWindow(QMainWindow):
287 287
         self.useCustomTheme = useCustomTheme
288 288
         self.absPath = absPath
289 289
         # themeFile = r"Front\themes\py_dracula_light.qss"
290
-        themeFile = r"D:\4work_now\20240819GS\20241211\Front\themes\py_dracula_light.qss"
290
+        themeFile = os.path.abspath(os.path.join(self.absPath, "themes/py_dracula_light.qss"))
291 291
 
292 292
         # 设置主题和HACKS
293 293
         if useCustomTheme:
@@ -568,7 +568,8 @@ class MainWindow(QMainWindow):
568 568
     #初始化数据一览(数据库全展示)
569 569
     def sql_init(self):
570 570
         #初始化全部数据库
571
-        inpath = r'D:\4work_now\20240819GS\20241211\SQL'
571
+        # inpath = r'D:\4work_now\20240819GS\20241211\SQL'
572
+        inpath = os.path.abspath('../SQL')
572 573
         #读取所有的数据库名
573 574
         sqlitem = []
574 575
         id = 1
@@ -576,17 +577,17 @@ class MainWindow(QMainWindow):
576 577
             #数据库
577 578
             dbname = filename.split('.',-1)[0]
578 579
             dbpath = os.path.join(inpath,filename)
579
-            sqlitem.append(TreeWidgetItem(id,0,dbname,icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-clone.png")))
580
+            sqlitem.append(TreeWidgetItem(id,0,dbname,icon=QIcon(os.path.abspath(os.path.join(self.absPath, "images/icons/cil-clone.png")))))
580 581
             pid = id
581 582
             id = id + 1
582 583
             #三种方法
583
-            sqlitem.append(TreeWidgetItem(id, pid, '水准测段高差稳定计算', icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-description.png")))
584
+            sqlitem.append(TreeWidgetItem(id, pid, '水准测段高差稳定计算', icon=QIcon(os.path.join(self.absPath, "images/icons/cil-description.png"))))
584 585
             gcid = id
585 586
             id = id + 1
586
-            sqlitem.append(TreeWidgetItem(id, pid, '控制网复测平面基准计算', icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-description.png")))
587
+            sqlitem.append(TreeWidgetItem(id, pid, '控制网复测平面基准计算', icon=QIcon(os.path.join(self.absPath, "images/icons/cil-description.png"))))
587 588
             gsid = id
588 589
             id = id + 1
589
-            sqlitem.append(TreeWidgetItem(id, pid, '平面控制网稳定性计算', icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-description.png")))
590
+            sqlitem.append(TreeWidgetItem(id, pid, '平面控制网稳定性计算', icon=QIcon(os.path.join(self.absPath, "images/icons/cil-description.png"))))
590 591
             wdid = id
591 592
             id = id + 1
592 593
             #读取所有的表名(三种方式往下)
@@ -604,7 +605,7 @@ class MainWindow(QMainWindow):
604 605
                 list1.append(str1)
605 606
                 self.dblist.append(list1)
606 607
                 sqlitem.append(TreeWidgetItem(id, gcid, str1, icon=QIcon(
607
-                    "D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png"),extend={'listData': list1}))
608
+                    os.path.join(self.absPath, "images/icons/cil-file.png")),extend={'listData': list1}))
608 609
                 id = id + 1
609 610
             sqlstr2 = 'SELECT TableName FROM GS_Input_Param;'
610 611
             cursor1.execute(sqlstr2)
@@ -616,7 +617,7 @@ class MainWindow(QMainWindow):
616 617
                 list2.append('控制网复测平面基准计算')
617 618
                 list2.append(str2)
618 619
                 self.dblist.append(list2)
619
-                sqlitem.append(TreeWidgetItem(id, gsid, str2, icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png"),extend={'listData': list2}))
620
+                sqlitem.append(TreeWidgetItem(id, gsid, str2, icon=QIcon(os.path.join(self.absPath, "images/icons/cil-file.png")),extend={'listData': list2}))
620 621
                 id = id + 1
621 622
             sqlstr3 = 'SELECT TableName FROM WD_Input_Param;'
622 623
             cursor1.execute(sqlstr3)
@@ -628,7 +629,7 @@ class MainWindow(QMainWindow):
628 629
                 list3.append('平面控制网稳定性计算')
629 630
                 list3.append(str3)
630 631
                 self.dblist.append(list3)
631
-                sqlitem.append(TreeWidgetItem(id, wdid, str3, icon=QIcon("D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png"),extend={'listData': list3}))
632
+                sqlitem.append(TreeWidgetItem(id, wdid, str3, icon=QIcon(os.path.join(self.absPath, "images/icons/cil-file.png")),extend={'listData': list3}))
632 633
                 id = id + 1
633 634
         button = ElTree(ElTreeData(sqlitem))
634 635
         return button
@@ -664,7 +665,7 @@ class MainWindow(QMainWindow):
664 665
                 pid = id
665 666
                 str2 = ''
666 667
                 sqlitem.append(TreeWidgetItem(id, 0, dbname, icon=QIcon(
667
-                    "D:/4work_now/20240819GS/20241211/Front/images/icons/cil-clone.png")))
668
+                    os.path.join(self.absPath, "images/icons/cil-clone.png"))))
668 669
             zdy1 = []
669 670
             zdy1.append(id)
670 671
             zdy1.append(0)
@@ -676,7 +677,7 @@ class MainWindow(QMainWindow):
676 677
                 str2 = mename
677 678
                 fid = id
678 679
                 sqlitem.append(TreeWidgetItem(id, pid, mename, icon=QIcon(
679
-                    "D:/4work_now/20240819GS/20241211/Front/images/icons/cil-description.png")))
680
+                    os.path.join(self.absPath, "images/icons/cil-description.png"))))
680 681
             zdy1 = []
681 682
             zdy1.append(id)
682 683
             zdy1.append(pid)
@@ -684,7 +685,7 @@ class MainWindow(QMainWindow):
684 685
             zdy.append(zdy1)
685 686
             id = id + 1
686 687
             sqlitem.append(TreeWidgetItem(id, fid, list2[2], icon=QIcon(
687
-                "D:/4work_now/20240819GS/20241211/Front/images/icons/cil-file.png"), extend={'listData': list2}))
688
+                os.path.join(self.absPath, "images/icons/cil-file.png")), extend={'listData': list2}))
688 689
             zdy1 = []
689 690
             zdy1.append(id)
690 691
             zdy1.append(fid)

+ 3
- 1
Front/modules/ui_functions.py View File

@@ -16,6 +16,8 @@
16 16
 
17 17
 # MAIN FILE
18 18
 # ///////////////////////////////////////////////////////////////
19
+
20
+
19 21
 from main import *
20 22
 import importlib
21 23
 from Back.GC import GC
@@ -333,7 +335,7 @@ class UIFunctions(MainWindow):
333 335
             GCcompute.main_function(file_path, db_path)
334 336
             GCshow.main_function(self.ui, db_path, utf_en)
335 337
         elif current_text == "控制网复测平面基准计算":
336
-            GScompute.main_function(file_path, db_path)
338
+            # GScompute.main_function(file_path, db_path)
337 339
             GSshow.main_function(self.ui, db_path, utf_en)
338 340
             # GSshow.main_function(self.ui, file_path, db_path)
339 341
         elif current_text == "平面控制网稳定性计算":

Loading…
Cancel
Save