Просмотр исходного кода

修改了模型展示表格的顺序

wzp 5 месяцев назад
Родитель
Сommit
3b10365444
4 измененных файлов: 28 добавлений и 30 удалений
  1. 1
    1
      Back/GC/GCshow.py
  2. 2
    2
      Back/GS/GSshow.py
  3. 2
    2
      Back/WD/WDshow.py
  4. 23
    25
      Front/modules/ui_main.py

+ 1
- 1
Back/GC/GCshow.py Просмотреть файл

76
     if not isinstance(utf_en, bytes):
76
     if not isinstance(utf_en, bytes):
77
         utf_en = utf_en.encode('utf-8')
77
         utf_en = utf_en.encode('utf-8')
78
 
78
 
79
-    tabs_to_show = [(0, '输入数据'), (2, '水准测段高差计算成果表')]
79
+    tabs_to_show = [(0, '输入数据'), (1, '水准测段高差计算成果表')]
80
     for index in range(ui.View.count()):
80
     for index in range(ui.View.count()):
81
         visible = index in [t[0] for t in tabs_to_show]
81
         visible = index in [t[0] for t in tabs_to_show]
82
         ui.View.setTabVisible(index, visible)
82
         ui.View.setTabVisible(index, visible)

+ 2
- 2
Back/GS/GSshow.py Просмотреть файл

93
     ui.View.setTabVisible(3, True)
93
     ui.View.setTabVisible(3, True)
94
     # 重新设置文字名称
94
     # 重新设置文字名称
95
     ui.View.setTabText(0, '输入数据')
95
     ui.View.setTabText(0, '输入数据')
96
-    ui.View.setTabText(1, '基准归算模型')
97
-    ui.View.setTabText(2, '复测基准归算表')
96
+    ui.View.setTabText(1, '复测基准归算表')
97
+    ui.View.setTabText(2, '基准归算模型')
98
     ui.View.setTabText(3, '复测成果表')
98
     ui.View.setTabText(3, '复测成果表')
99
 
99
 
100
     # 连接到数据库
100
     # 连接到数据库

+ 2
- 2
Back/WD/WDshow.py Просмотреть файл

82
     ui.View.setTabVisible(2, True)
82
     ui.View.setTabVisible(2, True)
83
     ui.View.setTabVisible(3, False)
83
     ui.View.setTabVisible(3, False)
84
     # 重新设置文字名称
84
     # 重新设置文字名称
85
-    ui.View.setTabText(1, '自由网成果归算模型')
86
-    ui.View.setTabText(2, '稳定性分析成果表')
85
+    ui.View.setTabText(1, '稳定性分析成果表')
86
+    ui.View.setTabText(2, '自由网成果归算模型')
87
     ui.View.setTabText(0, '输入数据')
87
     ui.View.setTabText(0, '输入数据')
88
     # 链接数据库并显示
88
     # 链接数据库并显示
89
     # 连接到数据库
89
     # 连接到数据库

+ 23
- 25
Front/modules/ui_main.py Просмотреть файл

9
 ################################################################################
9
 ################################################################################
10
 
10
 
11
 import sys
11
 import sys
12
+
12
 sys.path.append("../..")
13
 sys.path.append("../..")
13
 
14
 
14
 import sqlite3
15
 import sqlite3
24
                                QFrame, QGridLayout, QHBoxLayout, QHeaderView,
25
                                QFrame, QGridLayout, QHBoxLayout, QHeaderView,
25
                                QLabel, QLineEdit, QListView, QMainWindow,
26
                                QLabel, QLineEdit, QListView, QMainWindow,
26
                                QPushButton, QSizePolicy, QStackedWidget, QTabWidget,
27
                                QPushButton, QSizePolicy, QStackedWidget, QTabWidget,
27
-                               QTableView, QTextEdit, QVBoxLayout, QWidget, QMessageBox,QTreeWidget)
28
-from Back.Program_Run.data_show import Arrange_Data, Arrange_Data1, Arrange_Data2, Data_in_Cell, Data_in_Cell1, Data_in_Cell2
28
+                               QTableView, QTextEdit, QVBoxLayout, QWidget, QMessageBox, QTreeWidget)
29
+from Back.Program_Run.data_show import Arrange_Data, Arrange_Data1, Arrange_Data2, Data_in_Cell, Data_in_Cell1, \
30
+    Data_in_Cell2
29
 from Back.Program_Run.database_operations import create_database_and_tables
31
 from Back.Program_Run.database_operations import create_database_and_tables
30
 from Back.Program_Run.file_system_watching import ComboBoxUpdater
32
 from Back.Program_Run.file_system_watching import ComboBoxUpdater
31
 from watchdog.observers import Observer
33
 from watchdog.observers import Observer
1504
         self.tabWidget.setTabsClosable(False)
1506
         self.tabWidget.setTabsClosable(False)
1505
         self.tabWidget.setTabBarAutoHide(False)
1507
         self.tabWidget.setTabBarAutoHide(False)
1506
 
1508
 
1507
-
1508
-
1509
-
1510
-
1511
         self.resultTable = QWidget()
1509
         self.resultTable = QWidget()
1512
         self.resultTable.setObjectName(u"resultTable")
1510
         self.resultTable.setObjectName(u"resultTable")
1513
         self.verticalLayout_29 = QVBoxLayout(self.resultTable)
1511
         self.verticalLayout_29 = QVBoxLayout(self.resultTable)
1536
         self.printTable.setTabletTracking(False)
1534
         self.printTable.setTabletTracking(False)
1537
         self.verticalLayout_28 = QVBoxLayout(self.printTable)
1535
         self.verticalLayout_28 = QVBoxLayout(self.printTable)
1538
         self.verticalLayout_28.setObjectName(u"verticalLayout_28")
1536
         self.verticalLayout_28.setObjectName(u"verticalLayout_28")
1539
-        self.printTableView =  QTextEdit(self.printTable)
1537
+        self.printTableView = QTextEdit(self.printTable)
1540
         self.printTableView.setObjectName(u"printTableView")
1538
         self.printTableView.setObjectName(u"printTableView")
1541
         self.printTableView.setReadOnly(True)
1539
         self.printTableView.setReadOnly(True)
1542
         self.verticalLayout_28.addWidget(self.printTableView)
1540
         self.verticalLayout_28.addWidget(self.printTableView)
1589
         self.tabWidget.setTabVisible(1, False)
1587
         self.tabWidget.setTabVisible(1, False)
1590
         self.tabWidget.setTabVisible(2, False)
1588
         self.tabWidget.setTabVisible(2, False)
1591
 
1589
 
1592
-
1593
         self.search = QPushButton(self.datainfo)
1590
         self.search = QPushButton(self.datainfo)
1594
         self.search.setObjectName(u"search")
1591
         self.search.setObjectName(u"search")
1595
         sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
1592
         sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
1648
         self.verticalLayout_30.setObjectName(u"verticalLayout_30")
1645
         self.verticalLayout_30.setObjectName(u"verticalLayout_30")
1649
         self.horizontalLayout_11 = QHBoxLayout()
1646
         self.horizontalLayout_11 = QHBoxLayout()
1650
         self.horizontalLayout_11.setObjectName(u"horizontalLayout_11")
1647
         self.horizontalLayout_11.setObjectName(u"horizontalLayout_11")
1651
-        #留个空,什么编辑排序筛选可以放在这儿
1648
+        # 留个空,什么编辑排序筛选可以放在这儿
1652
         self.edit_button = QPushButton(self.datainfo)
1649
         self.edit_button = QPushButton(self.datainfo)
1653
         self.edit_button.setObjectName(u"edit_button")
1650
         self.edit_button.setObjectName(u"edit_button")
1654
         sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
1651
         sizePolicy4 = QSizePolicy(QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed)
1704
         icon51.addFile(u":/icons/images/icons/1.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
1701
         icon51.addFile(u":/icons/images/icons/1.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
1705
         self.View.addTab(self.resultTable1, icon51, "")
1702
         self.View.addTab(self.resultTable1, icon51, "")
1706
 
1703
 
1704
+        self.reconTable1 = QWidget()
1705
+        self.reconTable1.setObjectName(u"reconTable1")
1706
+        # self.reconTable.setCursor(QCursor(Qt.CursorShape.UpArrowCursor))
1707
+        self.reconTable1.setMouseTracking(False)
1708
+        self.reconTable1.setTabletTracking(False)
1709
+        self.verticalLayout_36 = QVBoxLayout(self.reconTable1)
1710
+        self.verticalLayout_36.setObjectName(u"verticalLayout_36")
1711
+        self.reconTableView1 = QTableView(self.reconTable1)
1712
+        self.reconTableView1.setObjectName(u"modelTableView1")
1713
+        self.verticalLayout_36.addWidget(self.reconTableView1)
1714
+        icon7 = QIcon()
1715
+        icon7.addFile(u":/icons/images/icons/2.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
1716
+        self.View.addTab(self.reconTable1, icon7, "")
1717
+
1707
         self.printTable1 = QWidget()
1718
         self.printTable1 = QWidget()
1708
         self.printTable1.setObjectName(u"printTable1")
1719
         self.printTable1.setObjectName(u"printTable1")
1709
         self.printTable1.setMouseTracking(False)
1720
         self.printTable1.setMouseTracking(False)
1715
         self.printTableView1.setReadOnly(True)
1726
         self.printTableView1.setReadOnly(True)
1716
         self.verticalLayout_35.addWidget(self.printTableView1)
1727
         self.verticalLayout_35.addWidget(self.printTableView1)
1717
         icon6 = QIcon()
1728
         icon6 = QIcon()
1718
-        icon6.addFile(u":/icons/images/icons/2.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
1729
+        icon6.addFile(u":/icons/images/icons/3.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
1719
         self.View.addTab(self.printTable1, icon6, "")
1730
         self.View.addTab(self.printTable1, icon6, "")
1720
 
1731
 
1721
-        self.reconTable1 = QWidget()
1722
-        self.reconTable1.setObjectName(u"reconTable1")
1723
-        # self.reconTable.setCursor(QCursor(Qt.CursorShape.UpArrowCursor))
1724
-        self.reconTable1.setMouseTracking(False)
1725
-        self.reconTable1.setTabletTracking(False)
1726
-        self.verticalLayout_36 = QVBoxLayout(self.reconTable1)
1727
-        self.verticalLayout_36.setObjectName(u"verticalLayout_36")
1728
-        self.reconTableView1 = QTableView(self.reconTable1)
1729
-        self.reconTableView1.setObjectName(u"modelTableView1")
1730
-        self.verticalLayout_36.addWidget(self.reconTableView1)
1731
-        icon7 = QIcon()
1732
-        icon7.addFile(u":/icons/images/icons/3.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
1733
-        self.View.addTab(self.reconTable1, icon7, "")
1734
 
1732
 
1735
         self.inputTable1 = QWidget()
1733
         self.inputTable1 = QWidget()
1736
         self.inputTable1.setObjectName(u"inputTable1")
1734
         self.inputTable1.setObjectName(u"inputTable1")
1746
         icon8.addFile(u":/icons/images/icons/4.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
1744
         icon8.addFile(u":/icons/images/icons/4.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
1747
         self.View.addTab(self.inputTable1, icon8, "")
1745
         self.View.addTab(self.inputTable1, icon8, "")
1748
 
1746
 
1749
-        # 设置到处结果显示页面(View)的默认隐藏2.3页
1747
+        # 设置导出结果显示页面(View)的默认隐藏2.3页
1750
         self.View.setTabVisible(1, False)
1748
         self.View.setTabVisible(1, False)
1751
         self.View.setTabVisible(2, False)
1749
         self.View.setTabVisible(2, False)
1752
         self.View.setTabVisible(3, False)
1750
         self.View.setTabVisible(3, False)
1866
 
1864
 
1867
         self.stackedWidget.setCurrentIndex(1)
1865
         self.stackedWidget.setCurrentIndex(1)
1868
         self.tabWidget.setCurrentIndex(0)
1866
         self.tabWidget.setCurrentIndex(0)
1867
+
1869
     # setupUi
1868
     # setupUi
1870
 
1869
 
1871
     # UI中的文字样式以及文字内容,Unicode编码的形式进行文字编辑的
1870
     # UI中的文字样式以及文字内容,Unicode编码的形式进行文字编辑的
2029
         self.btn_message.setText(QCoreApplication.translate("MainWindow", u"\u5207\u6362\u4e3b\u9898", None))
2028
         self.btn_message.setText(QCoreApplication.translate("MainWindow", u"\u5207\u6362\u4e3b\u9898", None))
2030
         self.creditsLabel.setText(QCoreApplication.translate("MainWindow", u"\u7248\u6743\u4fe1\u606f", None))
2029
         self.creditsLabel.setText(QCoreApplication.translate("MainWindow", u"\u7248\u6743\u4fe1\u606f", None))
2031
         self.version.setText(QCoreApplication.translate("MainWindow", u"v1.0.0", None))
2030
         self.version.setText(QCoreApplication.translate("MainWindow", u"v1.0.0", None))
2032
-

Загрузка…
Отмена
Сохранить