Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding2/ControlNetwork

Back/GC/GCshow.py

@@ -1,6 +1,7 @@
 import sqlite3
 
 from PySide6.QtGui import QStandardItemModel, QStandardItem
+from PySide6.QtCore import QItemSelectionModel
 
 
 def main_function(ui, db_path, utf_en):
@@ -167,6 +168,11 @@ def search_show_function(ui, db_path, utf_en):
     ui.reconTableView1.setModel(output_model)
     ui.reconTableView1.show()
 
+    # 返回一个选择模型
+    selectionModel = QItemSelectionModel(input_model)  # Item选择模型
+    ui.resultTableView1.setSelectionModel(selectionModel)
+    return selectionModel
+
     # 关闭数据库连接
     cursor1.close()
     db1.close()

Back/GS/GSshow.py

@@ -2,7 +2,7 @@ import sqlite3
 
 from PySide6.QtGui import QStandardItemModel
 from Back.Program_Run.data_show import *
-
+from PySide6.QtCore import QItemSelectionModel
 
 def main_function(ui, db_path, utf_en):
     # 就用已有的选项卡
@@ -84,6 +84,10 @@ li.checked::marker {{ content: "\\2612"; }}
 
     ui.printTableView.setHtml(str0)
 
+    # 关闭数据库连接
+    cursor1.close()
+    db1.close()
+
 
 def search_show_function(ui, db_path, utf_en):
     # 就用已有的选项卡
@@ -182,3 +186,12 @@ li.checked::marker {{ content: "\\2612"; }}
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;">          </span><span style=" font-size:14pt; font-weight:700;">X、Y</span><span style=" font-size:14pt;">为{str1}已知系统的{str2}归算坐标。</span></p></body></html>"""
 
     ui.printTableView1.setHtml(str0)
+
+    # 关闭数据库连接
+    cursor1.close()
+    db1.close()
+
+    # 返回一个选择模型
+    selectionModel = QItemSelectionModel(model0)  # Item选择模型
+    ui.resultTableView1.setSelectionModel(selectionModel)
+    return selectionModel

Back/WD/WDshow.py

@@ -2,6 +2,7 @@ from Back.Program_Run.data_show import *
 import sqlite3
 
 from PySide6.QtGui import QStandardItemModel
+from PySide6.QtCore import QItemSelectionModel
 
 
 # 计算结束后的显示
@@ -74,6 +75,10 @@ li.checked::marker { content: "\2612"; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;">          </span><span style=" font-size:14pt; font-weight:700;">X、Y</span><span style=" font-size:14pt;">为""" + str1 + """已知系统的""" + str2 + """归算坐标。</span></p></body></html>"""
     ui.printTableView.setHtml(str0)
 
+    # 关闭数据库连接
+    cursor1.close()
+    db1.close()
+
 
 def search_show_function(ui, db_path, utf_en):
     # 只显示头两个tab
@@ -165,3 +170,12 @@ li.checked::marker { content: "\2612"; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;">式中：</span><span style=" font-size:14pt; font-weight:700; color:#000000;">x、y</span><span style=" font-size:14pt;">为</span><span style=" font-size:14pt; color:#000000;">""" + str2 + """</span><span style=" font-size:14pt;">坐标；</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;">          </span><span style=" font-size:14pt; font-weight:700;">X、Y</span><span style=" font-size:14pt;">为""" + str1 + """已知系统的""" + str2 + """归算坐标。</span></p></body></html>"""
     ui.printTableView1.setHtml(str0)
+
+    # 关闭数据库连接
+    cursor1.close()
+    db1.close()
+
+    #返回一个选择模型
+    selectionModel = QItemSelectionModel(model0)  # Item选择模型
+    ui.resultTableView1.setSelectionModel(selectionModel)
+    return selectionModel

Front/main.py

@@ -469,6 +469,30 @@ class MainWindow(QMainWindow):
         # tree_button.itemClicked.connect(self.itembuttonClick)
         # tree_button.itemDoubleClicked.connect(self.itembuttonClick)
 
+
+    #单元格的右键
+    def show_custom_context_menu(self, pos):
+        # 创建一个右键菜单
+        menu = QMenu(self.ui.resultTableView1)
+        menu.setStyleSheet("QMenu { background-color: #FFFFFF; }")
+        # 获取选中单元格的索引
+        index = self.ui.resultTableView1.indexAt(pos)
+        # # 添加菜单项和对应的操作
+        # action_1 = QAction("操作1", self)
+        # action_1.triggered.connect(lambda: self.do_something(index))
+        # menu.addAction(action_1)
+        # 添加菜单项和对应的操作
+        action_1 = QAction("删除该行", self)
+        action_1.triggered.connect(self.seleceModel_itemclicked)
+        menu.addAction(action_1)
+        action_2 = QAction("编辑单元格", self)
+        action_2.triggered.connect(self.seleceModel_itemclicked)
+        menu.addAction(action_2)
+        action_3 = QAction("添加数据", self)
+        action_3.triggered.connect(self.seleceModel_itemclicked)
+        menu.addAction(action_3)
+        menu.exec(self.ui.resultTableView1.mapToGlobal(pos))
+
     def closeEvent(self, event):
         # 停止监控
         self.observer.stop()
@@ -754,6 +778,8 @@ class MainWindow(QMainWindow):
         # 隐藏默认label
         self.ui.defaultLabel.setVisible(False)
 
+
+
     # 全树的item展示
     def itembuttonClick(self):
         # 判定是否获取的是根节点
@@ -781,7 +807,20 @@ class MainWindow(QMainWindow):
             inpath = os.path.abspath('../SQL')
             file_path = inpath + '/' + str3 + '.db'
             # 数据库路径，哪种方法，表名
-            UIFunctions.search_data_to_show(self, file_path, current_text, str1)
+            self.selectModel = UIFunctions.search_data_to_show(self, file_path, current_text, str1)
+            # self.ui.resultTableView1.doubleClicked.connect(self.seleceModel_itemclicked)
+
+            # 设置右键菜单策略为CustomContextMenu
+            self.ui.resultTableView1.setContextMenuPolicy(Qt.CustomContextMenu)
+
+            # 关联自定义的右键菜单方法到customContextMenuRequested信号
+            self.ui.resultTableView1.customContextMenuRequested.connect(self.show_custom_context_menu)
+
+    #右键对应行可删除对应行（只是视图上）
+    def seleceModel_itemclicked(self):
+        curIndex = self.selectModel.currentIndex()
+        self.ui.resultTableView1.model().removeRow(curIndex.row())
+        kk = 1
 
     # 搜索的item展示
     def itembuttonClick1(self):
@@ -811,6 +850,13 @@ class MainWindow(QMainWindow):
             file_path = inpath + '/' + str3 + '.db'
             # 数据库路径，哪种方法，表名
             UIFunctions.search_data_to_show(self, file_path, current_text, str1)
+            # self.ui.resultTableView1.doubleClicked.connect(self.seleceModel_itemclicked)
+
+            # 设置右键菜单策略为CustomContextMenu
+            self.ui.resultTableView1.setContextMenuPolicy(Qt.CustomContextMenu)
+
+            # 关联自定义的右键菜单方法到customContextMenuRequested信号
+            self.ui.resultTableView1.customContextMenuRequested.connect(self.show_custom_context_menu)
 
     # 键盘回车事件，目前用于搜索按钮
     def datainfo_keyPressEvent(self, event):

Front/modules/ui_functions.py

@@ -20,6 +20,9 @@ from PySide6.QtWidgets import QMessageBox
 
 from main import *
 import importlib
+
+from select import select
+
 from Back.GC import GC, GCExport
 from Back.GS import GS, GSExport
 from Back.WD import WD, WDExport
@@ -365,11 +368,13 @@ class UIFunctions(MainWindow):
     # 数据一览，点击查询
     def search_data_to_show(self, file_path, current_text, tablename):
         utf_en = tablename.encode('utf-8')  # 转换文件名为utf-8编码形式
-        # 高差部分我没改
         if current_text == "水准测段高差稳定计算":
-            GCshow.search_show_function(self.ui, file_path, utf_en)
+            selectModel = GCshow.search_show_function(self.ui, file_path, utf_en)
+            return selectModel
         elif current_text == "控制网复测平面基准计算":
-            GSshow.search_show_function(self.ui, file_path, utf_en)
+            selectModel = GSshow.search_show_function(self.ui, file_path, utf_en)
+            return selectModel
         elif current_text == "平面控制网稳定性计算":
-            WDshow.search_show_function(self.ui, file_path, utf_en)
+            selectModel = WDshow.search_show_function(self.ui, file_path, utf_en)
+            return selectModel
     # END - GUI DEFINITIONS