完善了GS的计算和展示，修改了GC,GS的部分提示框

Back/GC/GCcompute.py

@@ -2,6 +2,8 @@ import os
 import sqlite3
 import math
 
+from PySide6.QtWidgets import QMessageBox
+
 
 def calculate_absolute_height_differences(db_path, file_name, field_name):
     """
@@ -271,74 +273,89 @@ def insert_records_to_output_table(db_path, file_name, dis_ass, new_hdiff, corre
 
 
 def main_function(file_path, db_path):
-    # 获取文件名
-    file_name = os.path.basename(file_path)
-    file_name_utf8 = file_name.encode('utf-8')
-    # 处理查询结果
-    abs_last_hdiffs = calculate_absolute_height_differences(db_path, file_name_utf8, "Last_HDiff")
-    abs_new_hdiffs = calculate_absolute_height_differences(db_path, file_name_utf8, "New_HDiff")
-    # 获取稳定测段
-    # last_stable_section = get_last_stable_section(abs_last_hdiffs)
-    # current_stable_section = get_current_stable_section(abs_new_hdiffs, len(abs_last_hdiffs))
-    # 计算较差
-    differences = calculate_differences(abs_last_hdiffs, abs_new_hdiffs)
-    # stable_differences = calculate_stable_differences(last_stable_section, current_stable_section)
-    # 计算限值
-    limit_values = calculate_limits(db_path, file_name_utf8)
-    # total_limit = calculate_limits(db_path, file_name, total=True)
-    # 高程较差的变形判定
-    deformation_results = detect_deformation(differences, limit_values)
-    # 第一次稳定分析
-    corrected_sum_last_1 = calculate_corrected_old_height_difference(abs_last_hdiffs, deformation_results)  # 上期改正高差
-    corrected_sum_new_1 = calculate_corrected_new_height_difference(abs_new_hdiffs, deformation_results,
-                                                                    abs_last_hdiffs)  # 本期改正高差
-    corrected_height_differences_1 = calculate_corrected_height_differences(abs_new_hdiffs, corrected_sum_last_1,
-                                                                            corrected_sum_new_1)  # 改正高差绝对值
-    first_deformation_results = detect_corrected_deformation(corrected_height_differences_1, abs_last_hdiffs,
-                                                             limit_values)  # 第一次稳定分析的变形判定
-    # 第二次稳定分析
-    corrected_sum_last_2 = calculate_corrected_old_height_difference(abs_last_hdiffs, first_deformation_results)
-    corrected_sum_new_2 = calculate_corrected_new_height_difference(abs_new_hdiffs, first_deformation_results,
-                                                                    abs_last_hdiffs)
-    corrected_height_differences_2 = calculate_corrected_height_differences(abs_new_hdiffs, corrected_sum_last_2,
-                                                                            corrected_sum_new_2)
-    second_deformation_results = detect_corrected_deformation(corrected_height_differences_2, abs_last_hdiffs,
-                                                              limit_values)
-    # 第三次稳定分析
-    corrected_sum_last_3 = calculate_corrected_old_height_difference(abs_last_hdiffs, second_deformation_results)
-    corrected_sum_new_3 = calculate_corrected_new_height_difference(abs_new_hdiffs, second_deformation_results,
-                                                                    abs_last_hdiffs)
-    corrected_height_differences_3 = calculate_corrected_height_differences(abs_new_hdiffs, corrected_sum_last_3,
-                                                                            corrected_sum_new_3)
-    third_deformation_results = detect_corrected_deformation(corrected_height_differences_3, abs_last_hdiffs,
-                                                             limit_values)
-    # 第四次稳定分析
-    corrected_sum_last_4 = calculate_corrected_old_height_difference(abs_last_hdiffs, third_deformation_results)
-    corrected_sum_new_4 = calculate_corrected_new_height_difference(abs_new_hdiffs, third_deformation_results,
-                                                                    abs_last_hdiffs)
-    corrected_height_differences_4 = calculate_corrected_height_differences(abs_new_hdiffs, corrected_sum_last_4,
-                                                                            corrected_sum_new_4)
-    fourth_deformation_results = detect_corrected_deformation(corrected_height_differences_4, abs_last_hdiffs,
-                                                              limit_values)
-    # 第五次稳定分析
-    corrected_sum_last_5 = calculate_corrected_old_height_difference(abs_last_hdiffs, fourth_deformation_results)
-    corrected_sum_new_5 = calculate_corrected_new_height_difference(abs_new_hdiffs, fourth_deformation_results,
-                                                                    abs_last_hdiffs)
-    corrected_height_differences_5 = calculate_corrected_height_differences(abs_new_hdiffs, corrected_sum_last_5,
-                                                                            corrected_sum_new_5)
-    fifth_deformation_results = detect_corrected_deformation(corrected_height_differences_5, abs_last_hdiffs,
-                                                             limit_values)  # 第五次稳定分析的变形判定
-    # 更新数据库中的修正系数
-    update_correction_factor(db_path, file_name_utf8, corrected_sum_last_5, corrected_sum_new_5)
-    # 成果的高差
-    new_hdiffs = get_new_hdiffs(db_path, file_name_utf8)
-    old_hdiffs = get_old_hdiffs(db_path, file_name_utf8)
-    result_height_differences = calculate_corrected_height_differences_with_sin(new_hdiffs,
-                                                                                corrected_height_differences_5)  # 结果高差
-    # 修正数
-    correction_numbers = calculate_correction_numbers(result_height_differences, new_hdiffs)
-    # 计算期间差异
-    period_differences = calculate_period_differences(old_hdiffs, result_height_differences)
-    # 插入数据到Outpoint数据库表
-    insert_records_to_output_table(db_path, file_name_utf8, fifth_deformation_results, result_height_differences,
-                                   correction_numbers, period_differences)
+    try:
+        # 获取文件名
+        file_name = os.path.basename(file_path)
+        file_name_utf8 = file_name.encode('utf-8')
+
+        # 处理查询结果
+        abs_last_hdiffs = calculate_absolute_height_differences(db_path, file_name_utf8, "Last_HDiff")
+        abs_new_hdiffs = calculate_absolute_height_differences(db_path, file_name_utf8, "New_HDiff")
+
+        # 计算较差
+        differences = calculate_differences(abs_last_hdiffs, abs_new_hdiffs)
+
+        # 计算限值
+        limit_values = calculate_limits(db_path, file_name_utf8)
+
+        # 高程较差的变形判定
+        deformation_results = detect_deformation(differences, limit_values)
+
+        # 第一次稳定分析
+        corrected_sum_last_1 = calculate_corrected_old_height_difference(abs_last_hdiffs, deformation_results)  # 上期改正高差
+        corrected_sum_new_1 = calculate_corrected_new_height_difference(abs_new_hdiffs, deformation_results,
+                                                                        abs_last_hdiffs)  # 本期改正高差
+        corrected_height_differences_1 = calculate_corrected_height_differences(abs_new_hdiffs, corrected_sum_last_1,
+                                                                                corrected_sum_new_1)  # 改正高差绝对值
+        first_deformation_results = detect_corrected_deformation(corrected_height_differences_1, abs_last_hdiffs,
+                                                                 limit_values)  # 第一次稳定分析的变形判定
+
+        # 第二次稳定分析
+        corrected_sum_last_2 = calculate_corrected_old_height_difference(abs_last_hdiffs, first_deformation_results)
+        corrected_sum_new_2 = calculate_corrected_new_height_difference(abs_new_hdiffs, first_deformation_results,
+                                                                        abs_last_hdiffs)
+        corrected_height_differences_2 = calculate_corrected_height_differences(abs_new_hdiffs, corrected_sum_last_2,
+                                                                                corrected_sum_new_2)
+        second_deformation_results = detect_corrected_deformation(corrected_height_differences_2, abs_last_hdiffs,
+                                                                  limit_values)
+
+        # 第三次稳定分析
+        corrected_sum_last_3 = calculate_corrected_old_height_difference(abs_last_hdiffs, second_deformation_results)
+        corrected_sum_new_3 = calculate_corrected_new_height_difference(abs_new_hdiffs, second_deformation_results,
+                                                                        abs_last_hdiffs)
+        corrected_height_differences_3 = calculate_corrected_height_differences(abs_new_hdiffs, corrected_sum_last_3,
+                                                                                corrected_sum_new_3)
+        third_deformation_results = detect_corrected_deformation(corrected_height_differences_3, abs_last_hdiffs,
+                                                                 limit_values)
+
+        # 第四次稳定分析
+        corrected_sum_last_4 = calculate_corrected_old_height_difference(abs_last_hdiffs, third_deformation_results)
+        corrected_sum_new_4 = calculate_corrected_new_height_difference(abs_new_hdiffs, third_deformation_results,
+                                                                        abs_last_hdiffs)
+        corrected_height_differences_4 = calculate_corrected_height_differences(abs_new_hdiffs, corrected_sum_last_4,
+                                                                                corrected_sum_new_4)
+        fourth_deformation_results = detect_corrected_deformation(corrected_height_differences_4, abs_last_hdiffs,
+                                                                  limit_values)
+
+        # 第五次稳定分析
+        corrected_sum_last_5 = calculate_corrected_old_height_difference(abs_last_hdiffs, fourth_deformation_results)
+        corrected_sum_new_5 = calculate_corrected_new_height_difference(abs_new_hdiffs, fourth_deformation_results,
+                                                                        abs_last_hdiffs)
+        corrected_height_differences_5 = calculate_corrected_height_differences(abs_new_hdiffs, corrected_sum_last_5,
+                                                                                corrected_sum_new_5)
+        fifth_deformation_results = detect_corrected_deformation(corrected_height_differences_5, abs_last_hdiffs,
+                                                                 limit_values)  # 第五次稳定分析的变形判定
+
+        # 更新数据库中的修正系数
+        update_correction_factor(db_path, file_name_utf8, corrected_sum_last_5, corrected_sum_new_5)
+
+        # 成果的高差
+        new_hdiffs = get_new_hdiffs(db_path, file_name_utf8)
+        old_hdiffs = get_old_hdiffs(db_path, file_name_utf8)
+        result_height_differences = calculate_corrected_height_differences_with_sin(new_hdiffs,
+                                                                                    corrected_height_differences_5)  # 结果高差
+
+        # 修正数
+        correction_numbers = calculate_correction_numbers(result_height_differences, new_hdiffs)
+
+        # 计算期间差异
+        period_differences = calculate_period_differences(old_hdiffs, result_height_differences)
+
+        # 插入数据到Outpoint数据库表
+        insert_records_to_output_table(db_path, file_name_utf8, fifth_deformation_results, result_height_differences,
+                                       correction_numbers, period_differences)
+
+        QMessageBox.information(None, "提示", f"文件 '{file_name}' 计算成功！")
+
+    except Exception as e:
+        QMessageBox.critical(None, "错误", f"文件 '{file_name}' 计算失败！错误信息: {str(e)}")

Back/GS/GS.py

@@ -2,38 +2,42 @@ import openpyxl
 import xlrd
 import sqlite3
 import os
+
+from PySide6.QtWidgets import QMessageBox
 from openpyxl import Workbook
-import tkinter as tk
-from tkinter import messagebox
 import math
 import numpy as np
 
+
 def to_utf8(text):
     str1 = text.encode('utf-8')
     return str1
 
+
 # 弹窗提示用户是否更新数据
 def ask_for_update(file_name):
-    root = tk.Tk()
-    root.withdraw()  # 隐藏主窗口
-    response = messagebox.askyesno("提示", f"检测到数据库中存在相同文件名 '{file_name}'，是否更新数据？")
-    return response
+    response = QMessageBox.question(None, "提示", f"检测到数据库中存在相同文件 '{file_name}'，是(Yes)否(No)更新数据？",
+                                    QMessageBox.Yes | QMessageBox.No)
+    return response == QMessageBox.Yes
+
 
 # 读取Excel文件并计算公式结果
-def load_and_calculate_excel(file_path,cell0):
+def load_and_calculate_excel(file_path, cell0):
     # 加载Excel文件并计算单元格的公式结果。
     workbook = openpyxl.load_workbook(file_path, data_only=True)
     sheet = workbook.active
     h1_value = sheet[cell0].value
     return h1_value
 
+
 # 数据库插入函数
-def insert_into_database(database,pastname,newname,excelname,listname1,listpastx1,listpasty1,listcgcs1,listnewx1,listnewy1,pjbc,fxzwc,zrbzwc,points,zbs,zfxs,sf,pjbcs,pjfxs):
-    #先把输入的录入数据库
+def insert_into_database(database, pastname, newname, excelname, listname1, listpastx1, listpasty1, listcgcs1,
+                         listnewx1, listnewy1, pjbc, fxzwc, zrbzwc, points, zbs, zfxs, sf, pjbcs, pjfxs):
+    # 先把输入的录入数据库
     db = sqlite3.connect(database)
-    #获取游标
+    # 获取游标
     cursor = db.cursor()
-    #字符类的都需要转换成字节存进去
+    # 字符类的都需要转换成字节存进去
     utf_pan = to_utf8(pastname)
     utf_nn = to_utf8(newname)
     utf_tn = to_utf8(excelname)
@@ -58,10 +62,10 @@ def insert_into_database(database,pastname,newname,excelname,listname1,listpastx
                 SET Last_ResultName=?,New_ResultName=?,Avg_SL=?,Ms_Dir=?,Ms_WSL=?,Pt_Count=?,SL_Count=?,Dir_Count=?,Scale_Value=?,Avg_MSL=?,Avg_Dir=?
                 WHERE TableName = ?
                 """,
-                (utf_pan,utf_nn,pjbc,fxzwc,zrbzwc,points,zbs,zfxs,sf,pjbcs,pjfxs,utf_tn,)
+                (utf_pan, utf_nn, pjbc, fxzwc, zrbzwc, points, zbs, zfxs, sf, pjbcs, pjfxs, utf_tn,)
             )
             # 更新现有记录GS_Input_Point 
-            #删了已有的数据，重新插入
+            # 删了已有的数据，重新插入
             cursor.execute(
                 """
                 DELETE FROM GS_Input_Point WHERE TableName = ?
@@ -81,11 +85,11 @@ def insert_into_database(database,pastname,newname,excelname,listname1,listpastx
                     """
                     INSERT INTO GS_Input_Point(TableName,Last_ResultName,New_ResultName,Last_X,Last_Y,New_X,New_Y,PointName,cgcs) VALUES (?,?,?,?,?,?,?,?,?)
                     """,
-                    (utf_tn,utf_pan,utf_nn,rr2,rr3,rr5,rr6,utf_rr1,rr4,)
+                    (utf_tn, utf_pan, utf_nn, rr2, rr3, rr5, rr6, utf_rr1, rr4,)
                 )
                 rr = rr + 1
-            messagebox.showinfo("提示",
-                                f"文件 '{excelname}' 已成功更新到本地数据库中，点击确认以关闭此对话框。对话框关闭后，请点击“计算”以重新计算数据")
+            QMessageBox.information(None, "提示",
+                                    f"文件 '{excelname}' 已成功更新到本地数据库中，点击'OK'以关闭此对话框。对话框关闭后，请点击“计算”以重新计算数据")
         else:
             # 插入新记录GS_Input_Param 
             cursor.execute(
@@ -93,7 +97,7 @@ def insert_into_database(database,pastname,newname,excelname,listname1,listpastx
                 INSERT INTO GS_Input_Param (TableName,Last_ResultName,New_ResultName,Avg_SL,Ms_Dir,Ms_WSL,Pt_Count,SL_Count,Dir_Count,Scale_Value,Avg_MSL,Avg_Dir) 
                 VALUES (?,?,?,?,?,?,?,?,?,?,?,?)
                 """,
-                (utf_tn,utf_pan,utf_nn,pjbc,fxzwc,zrbzwc,points,zbs,zfxs,sf,pjbcs,pjfxs,)
+                (utf_tn, utf_pan, utf_nn, pjbc, fxzwc, zrbzwc, points, zbs, zfxs, sf, pjbcs, pjfxs,)
             )
             # 插入新记录GS_Input_Point 
             rr = 0
@@ -109,11 +113,11 @@ def insert_into_database(database,pastname,newname,excelname,listname1,listpastx
                     """
                     INSERT INTO GS_Input_Point(TableName,Last_ResultName,New_ResultName,Last_X,Last_Y,New_X,New_Y,PointName,cgcs) VALUES (?,?,?,?,?,?,?,?,?)
                     """,
-                    (utf_tn,utf_pan,utf_nn,rr2,rr3,rr5,rr6,utf_rr1,rr4,)
+                    (utf_tn, utf_pan, utf_nn, rr2, rr3, rr5, rr6, utf_rr1, rr4,)
                 )
                 rr = rr + 1
-            messagebox.showinfo("提示",
-                                f"文件 '{excelname}' 已成功添加到本地数据库中，点击确认以关闭此对话框。对话框关闭后，请点击“计算”以计算数据")
+            QMessageBox.information(None, "提示",
+                                    f"文件 '{excelname}' 已成功添加到本地数据库中，点击'OK'以关闭此对话框。对话框关闭后，请点击“计算”以计算数据")
 
         db.commit()
     except sqlite3.Error as e:
@@ -123,8 +127,9 @@ def insert_into_database(database,pastname,newname,excelname,listname1,listpastx
     finally:
         db.close()
 
-#读取xls
-def xlrd_read(excelpath,dbpath):
+
+# 读取xls
+def xlrd_read(excelpath, dbpath):
     global gszbx
     global gszby
     listname1 = []
@@ -134,7 +139,7 @@ def xlrd_read(excelpath,dbpath):
     listpasty1 = []
     listcgcs1 = []
 
-    #excel表名就是表名
+    # excel表名就是表名
     excelname = os.path.basename(excelpath)
     # 读取excel
     xlr = xlrd.open_workbook(excelpath)
@@ -164,22 +169,22 @@ def xlrd_read(excelpath,dbpath):
     pjbc = float(tabler.cell(0, 6).value)
     fxzwc = float(tabler.cell(1, 6).value)
     str1 = str(tabler.cell(2, 6).value)
-    #判断下是哪种情况，转化为数值
+    # 判断下是哪种情况，转化为数值
     if '.' in str1:
-        #直接float使用
+        # 直接float使用
         zrbzwc = float(str1)
     else:
-        #转化为分数
+        # 转化为分数
         # 10的6次方
         # ten_to_the_six = 10e6
-        fzstr = float(str1.split('/',-1)[0])
-        fmstr = float(str1.split('/',-1)[1])
-        zrbzwc = float(fzstr/fmstr)
+        fzstr = float(str1.split('/', -1)[0])
+        fmstr = float(str1.split('/', -1)[1])
+        zrbzwc = float(fzstr / fmstr)
     zbs = float(tabler.cell(3, 6).value)
     zfxs = float(tabler.cell(4, 6).value)
     pjbcs = zbs / points
     pjfxs = zfxs / points
-    sf = float(tabler.cell(5,6).value)
+    sf = float(tabler.cell(5, 6).value)
     # 再拆细点
     wy1 = pjbc / 1000
     wy2 = wy1 * zrbzwc * 1e6
@@ -192,27 +197,27 @@ def xlrd_read(excelpath,dbpath):
     wypd0 = wypd
     pastname = tabler.cell(0, 3).value
     newname = tabler.cell(0, 1).value
-    #如果第二次测量或者首次测量为空，则判断为新建
+    # 如果第二次测量或者首次测量为空，则判断为新建
     while row < rows:
         pname = tabler.cell(row, 0).value
         pcgcs = 1
         try:
-            pnewx = round(float(tabler.cell(row, 1).value),4)
+            pnewx = round(float(tabler.cell(row, 1).value), 4)
         except:
             pnewx = 0
             pcgcs = -2
         try:
-            pnewy = round(float(tabler.cell(row, 2).value),4)
+            pnewy = round(float(tabler.cell(row, 2).value), 4)
         except:
             pnewy = 0
             pcgcs = -2
         try:
-            ppastx = round(float(tabler.cell(row, 3).value),4)
+            ppastx = round(float(tabler.cell(row, 3).value), 4)
         except:
             ppastx = 0
             pcgcs = -2
         try:
-            ppasty = round(float(tabler.cell(row, 4).value),4)
+            ppasty = round(float(tabler.cell(row, 4).value), 4)
         except:
             ppasty = 0
             pcgcs = -2
@@ -229,10 +234,11 @@ def xlrd_read(excelpath,dbpath):
         if pcgcs == -2:
             points = points - 1
         row = row + 1
-    #插入数据库
-    insert_into_database(dbpath,pastname,newname,excelname,listname1,listpastx1,listpasty1,listcgcs1,listnewx1,listnewy1,pjbc,fxzwc,zrbzwc,points,zbs,zfxs,sf,pjbcs,pjfxs)
-    #新建点不参与运算
-    rr=0
+    # 插入数据库
+    insert_into_database(dbpath, pastname, newname, excelname, listname1, listpastx1, listpasty1, listcgcs1, listnewx1,
+                         listnewy1, pjbc, fxzwc, zrbzwc, points, zbs, zfxs, sf, pjbcs, pjfxs)
+    # 新建点不参与运算
+    rr = 0
     while rr < len(listname1):
         rr1 = listname1[rr]
         rr2 = listpastx1[rr]
@@ -251,8 +257,9 @@ def xlrd_read(excelpath,dbpath):
             listnewy.append(rr6)
             rr = rr + 1
 
-#读取xlsx
-def openpyxl_read(excelpath,dbpath):
+
+# 读取xlsx
+def openpyxl_read(excelpath, dbpath):
     global gszbx
     global gszby
     listname1 = []
@@ -262,7 +269,7 @@ def openpyxl_read(excelpath,dbpath):
     listpasty1 = []
     listcgcs1 = []
 
-    #excel表名就是表名
+    # excel表名就是表名
     excelname = os.path.basename(excelpath)
     # 读取excel
     xlr = openpyxl.load_workbook(excelpath)
@@ -292,25 +299,25 @@ def openpyxl_read(excelpath,dbpath):
     pjbc = float(tabler['G1'].value)
     fxzwc = float(tabler['G2'].value)
     str1 = str(tabler['G3'].value)
-    #判断下是哪种情况，转化为数值
+    # 判断下是哪种情况，转化为数值
     if '.' in str1:
-        #直接float使用
+        # 直接float使用
         zrbzwc = float(str1)
     else:
-        #转化为分数
+        # 转化为分数
         # 10的6次方
         # ten_to_the_six = 10e6
-        fzstr = float(str1.split('/',-1)[0])
-        fmstr = float(str1.split('/',-1)[1])
-        zrbzwc = float(fzstr/fmstr)
+        fzstr = float(str1.split('/', -1)[0])
+        fmstr = float(str1.split('/', -1)[1])
+        zrbzwc = float(fzstr / fmstr)
     try:
         zbs = float(tabler['G4'].value)
     except:
-        zbs = load_and_calculate_excel(excelpath,'G4')
+        zbs = load_and_calculate_excel(excelpath, 'G4')
     try:
         zfxs = float(tabler['G5'].value)
     except:
-        zfxs = load_and_calculate_excel(excelpath,'G5')
+        zfxs = load_and_calculate_excel(excelpath, 'G5')
     pjbcs = zbs / points
     pjfxs = zfxs / points
     sf = float(tabler['G6'].value)
@@ -326,27 +333,27 @@ def openpyxl_read(excelpath,dbpath):
     wypd0 = wypd
     pastname = tabler['D1'].value
     newname = tabler['B1'].value
-    #如果第二次测量或者首次测量为空，则判断为新建
+    # 如果第二次测量或者首次测量为空，则判断为新建
     while row <= rows:
         pname = tabler.cell(row, 1).value
         pcgcs = 1
         try:
-            pnewx = round(float(tabler.cell(row, 2).value),4)
+            pnewx = round(float(tabler.cell(row, 2).value), 4)
         except:
             pnewx = 0
             pcgcs = -2
         try:
-            pnewy = round(float(tabler.cell(row, 3).value),4)
+            pnewy = round(float(tabler.cell(row, 3).value), 4)
         except:
             pnewy = 0
             pcgcs = -2
         try:
-            ppastx = round(float(tabler.cell(row, 4).value),4)
+            ppastx = round(float(tabler.cell(row, 4).value), 4)
         except:
             ppastx = 0
             pcgcs = -2
         try:
-            ppasty = round(float(tabler.cell(row, 5).value),4)
+            ppasty = round(float(tabler.cell(row, 5).value), 4)
         except:
             ppasty = 0
             pcgcs = -2
@@ -363,10 +370,11 @@ def openpyxl_read(excelpath,dbpath):
         if pcgcs == -2:
             points = points - 1
         row = row + 1
-    #插入数据库
-    insert_into_database(dbpath,pastname,newname,excelname,listname1,listpastx1,listpasty1,listcgcs1,listnewx1,listnewy1,pjbc,fxzwc,zrbzwc,points,zbs,zfxs,sf,pjbcs,pjfxs)
-    #新建点不参与运算
-    rr=0
+    # 插入数据库
+    insert_into_database(dbpath, pastname, newname, excelname, listname1, listpastx1, listpasty1, listcgcs1, listnewx1,
+                         listnewy1, pjbc, fxzwc, zrbzwc, points, zbs, zfxs, sf, pjbcs, pjfxs)
+    # 新建点不参与运算
+    rr = 0
     while rr < len(listname1):
         rr1 = listname1[rr]
         rr2 = listpastx1[rr]
@@ -385,16 +393,15 @@ def openpyxl_read(excelpath,dbpath):
             listnewy.append(rr6)
             rr = rr + 1
 
+
 # 主函数 读取excel文件
-def main_function(file_path,dbpath):
+def main_function(file_path, dbpath):
     # 调用读取Excel文件的函数
     file_name = os.path.basename(file_path)
-    #两种加载方式，对于不同的文件
+    # 两种加载方式，对于不同的文件
     if ".xlsx" in file_path:
-        #采用openpyxl
-        openpyxl_read(file_path,dbpath)
+        # 采用openpyxl
+        openpyxl_read(file_path, dbpath)
     else:
-        #采用xlrd
-        xlrd_read(file_path,dbpath)
-    
-    
+        # 采用xlrd
+        xlrd_read(file_path, dbpath)

Back/GS/GScompute.py

@@ -1,17 +1,18 @@
 import sqlite3
 import os
-import tkinter as tk
-from tkinter import messagebox
 import math
 import numpy as np
+from PySide6.QtWidgets import QMessageBox
 
-#region 各种方法
+
+# region 各种方法
 
 def to_utf8(text):
     str1 = text.encode('utf-8')
     return str1
 
-def sfjs(gsx,listx,gsy,listy):
+
+def sfjs(gsx, listx, gsy, listy):
     s1 = gsx[len(gsx) - 1] - gsx[0]
     s2 = s1 * s1
     s3 = gsy[len(gsy) - 1] - gsy[0]
@@ -24,10 +25,11 @@ def sfjs(gsx,listx,gsy,listy):
     t4 = t3 * t3
     t5 = t2 + t4
     t6 = math.sqrt(t5)
-    num1 = round(s6/t6,8)
+    num1 = round(s6 / t6, 8)
     return num1
 
-def mxjd(gs,nw):
+
+def mxjd(gs, nw):
     ii = 0
     sum1 = 0
     while ii < len(gs):
@@ -40,7 +42,8 @@ def mxjd(gs,nw):
     num1 = s4 * 1000
     return num1
 
-def xzjs(gsx,listx,gsy,listy):
+
+def xzjs(gsx, listx, gsy, listy):
     s1 = gsx[len(gsx) - 1] - gsx[0]
     s2 = gsy[len(gsy) - 1] - gsy[0]
     s3 = s2 / s1
@@ -53,7 +56,8 @@ def xzjs(gsx,listx,gsy,listy):
     num1 = n1 * 180 / math.pi * 3600
     return num1
 
-def gsjs(x,y,nlist):
+
+def gsjs(x, y, nlist):
     listgsx = []
     xstr1 = nlist[0] * x
     xstr2 = nlist[1] * y
@@ -65,6 +69,7 @@ def gsjs(x,y,nlist):
     listgsx.append(yy)
     return listgsx
 
+
 def jzys1(listy, zxzby, listx, zxzbx, sf):
     rlist = []
     listlen = len(listy)
@@ -80,6 +85,7 @@ def jzys1(listy, zxzby, listx, zxzbx, sf):
         ll = ll + 1
     return rlist
 
+
 def jzys2(listy, zxzby, listx, zxzbx, sf):
     rlist = []
     listlen = len(listy)
@@ -93,6 +99,7 @@ def jzys2(listy, zxzby, listx, zxzbx, sf):
         ll = ll + 1
     return rlist
 
+
 def jzys3(listy, aa, bb):
     rlist = []
     listlen = len(listy)
@@ -106,6 +113,7 @@ def jzys3(listy, aa, bb):
         ll = ll + 1
     return rlist
 
+
 def jzys4(listpasty, zxzbpasty, listpastx, zxzbpastx, listnewy, zxzbnewy, listnewx, zxzbnewx, sf):
     rlist = []
     listlen = len(listnewx)
@@ -113,11 +121,12 @@ def jzys4(listpasty, zxzbpasty, listpastx, zxzbpastx, listnewy, zxzbnewy, listne
     while ll < listlen:
         num1 = (listpastx[ll] - listnewx[ll] - zxzbpastx + zxzbnewx) / sf
         num2 = (listpasty[ll] - listnewy[ll] - zxzbpasty + zxzbnewy) / sf
-        rlist.append(round(num1,6))
-        rlist.append(round(num2,6))
+        rlist.append(round(num1, 6))
+        rlist.append(round(num2, 6))
         ll = ll + 1
     return rlist
 
+
 def jzys5(listp, zxzbp, sf):
     rlist = []
     listlen = len(listp)
@@ -128,6 +137,7 @@ def jzys5(listp, zxzbp, sf):
         ll = ll + 1
     return rlist
 
+
 def jzys6(listp, num):
     rlist = []
     listlen = len(listp)
@@ -138,6 +148,7 @@ def jzys6(listp, num):
         ll = ll + 1
     return rlist
 
+
 def cjh(listp):
     rp = 0
     listlen = len(listp)
@@ -148,6 +159,7 @@ def cjh(listp):
         ll = ll + 1
     return rp
 
+
 def cjh2(lista, listb):
     rp = 0
     listlen = len(lista)
@@ -158,6 +170,7 @@ def cjh2(lista, listb):
         ll = ll + 1
     return rp
 
+
 def gsys(listnewp, jxlist1, jylist1, lxlist, lylist, arrz, sf, zxzbnewp, zxzbpastp, ii):
     # 新x+（矩阵[jx1 jy1 lx1 ly1]*矩阵z）*缩放-新重心坐标x+旧重心坐标x
     rlist = []
@@ -165,7 +178,7 @@ def gsys(listnewp, jxlist1, jylist1, lxlist, lylist, arrz, sf, zxzbnewp, zxzbpas
     ll = 0
     while ll < listlen:
         arr0 = np.array((jxlist1[ll], jylist1[ll],
-                        lxlist[2*ll+ii], lylist[2*ll+ii]))
+                         lxlist[2 * ll + ii], lylist[2 * ll + ii]))
         arr1 = np.matmul(arr0, arrz)
         arr3 = sf * arr1
         newp = listnewp[ll] + arr3 - zxzbnewp + zxzbpastp
@@ -173,91 +186,117 @@ def gsys(listnewp, jxlist1, jylist1, lxlist, lylist, arrz, sf, zxzbnewp, zxzbpas
         ll = ll + 1
     return rlist
 
+
 def xcys(newlist, pastlist):
     listlen = len(newlist)
     ll = 0
     rlist = []
     while ll < listlen:
-        num1 =pastlist[ll] - newlist[ll]
+        num1 = pastlist[ll] - newlist[ll]
         num2 = num1 * 1000
         rlist.append(num2)
         ll = ll + 1
     return rlist
 
+
 def takeFirst(elem):
-        return elem[0]
+    return elem[0]
+
 
-#endregion
+# endregion
 
-def insert_into_database1(database,utf_tn,listname1,listname,gsx,gsy,listpastx1,listpasty1,listnewx1,listnewy1,nlist,utf_pan,utf_nn,wypd,sfxs,xzj,pycsx,pycsy,mxjdx,mxjdy,zxzbpastx,zxzbpasty,zxzbnewx,zxzbnewy,n1,n2,n3,n4,n5,n6):
-    #将结果输出到数据库
+def insert_into_database1(database, utf_tn, listname1, listname, gsx, gsy, listpastx1, listpasty1, listnewx1, listnewy1,
+                          nlist, utf_pan, utf_nn, wypd, sfxs, xzj, pycsx, pycsy, mxjdx, mxjdy, zxzbpastx, zxzbpasty,
+                          zxzbnewx, zxzbnewy, n1, n2, n3, n4, n5, n6):
+    # 将结果输出到数据库
     db1 = sqlite3.connect(database)
-    #获取游标
+    # 获取游标
     cursor1 = db1.cursor()
-    #先清除已有数据，用来更新
+    # 先清除已有数据，用来更新
     try:
         sqlstr3 = 'delete from GS_Trans_Param WHERE TableName = ?'
         sqlstr4 = 'delete from GS_Trans_Point WHERE TableName = ?'
         sqlstr5 = 'delete from GS_Result_Point WHERE TableName = ?'
-        cursor1.execute(sqlstr3,(utf_tn,))
-        cursor1.execute(sqlstr4,(utf_tn,))
-        cursor1.execute(sqlstr5,(utf_tn,))
+        cursor1.execute(sqlstr3, (utf_tn,))
+        cursor1.execute(sqlstr4, (utf_tn,))
+        cursor1.execute(sqlstr5, (utf_tn,))
     except:
         pass
-    cursor1.execute('INSERT INTO GS_Trans_Param(TableName,Last_ResultName,New_ResultName,Dis_RefValue,Pt_CalCount,Scale_Factor,Rotate_Angle,Trans_X,Trans_Y,Model_AccX,Model_AccY,Last_GcX,Last_GcY,New_GcX,New_GcY,Formula_X1,Formula_X2,Formula_X3,Formula_Y1,Formula_Y2,Formula_Y3) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',(utf_tn,utf_pan,utf_nn,wypd,len(listname),sfxs,xzj,pycsx,pycsy,mxjdx,mxjdy,zxzbpastx,zxzbpasty,zxzbnewx,zxzbnewy,n1,n2,n3,n4,n5,n6,))
-    #Trans_Point和Result_Point一起存
+    cursor1.execute(
+        'INSERT INTO GS_Trans_Param(TableName,Last_ResultName,New_ResultName,Dis_RefValue,Pt_CalCount,Scale_Factor,Rotate_Angle,Trans_X,Trans_Y,Model_AccX,Model_AccY,Last_GcX,Last_GcY,New_GcX,New_GcY,Formula_X1,Formula_X2,Formula_X3,Formula_Y1,Formula_Y2,Formula_Y3) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
+        (utf_tn, utf_pan, utf_nn, wypd, len(listname), sfxs, xzj, pycsx, pycsy, mxjdx, mxjdy, zxzbpastx, zxzbpasty,
+         zxzbnewx, zxzbnewy, n1, n2, n3, n4, n5, n6,))
+    # Trans_Point和Result_Point一起存
     for iname in listname1:
         if iname in listname:
-            #属于没问题点的
-            #直接使用gsx，gsy
+            # 属于没问题点的
+            # 直接使用gsx，gsy
             utf_pointname = to_utf8(str(iname))
             wystr = to_utf8('稳定')
             index1 = listname.index(iname)
-            numm1 = round(gsx[index1],4)
-            numm2 = round(gsy[index1],4)
-            #先找到首次的index
+            numm1 = round(gsx[index1], 4)
+            numm2 = round(gsy[index1], 4)
+            # 先找到首次的index
             index2 = listname1.index(iname)
-            r1 = (listpastx1[index2] - gsx[index1])*1000
-            r2 = (listpasty1[index2] - gsy[index1])*1000
+            r1 = (listpastx1[index2] - gsx[index1]) * 1000
+            r2 = (listpasty1[index2] - gsy[index1]) * 1000
             r3 = r1 * r1
             r4 = r2 * r2
             r5 = r3 + r4
-            r6 = round(math.sqrt(r5),1)
+            r6 = round(math.sqrt(r5), 1)
             numn1 = listpastx1[index2]
             numn2 = listnewx1[index2]
-            cursor1.execute('INSERT INTO GS_Trans_Point(TableName,Last_ResultName,New_ResultName,PointName,Last_X,Last_Y,New_X,New_Y) VALUES (?,?,?,?,?,?,?,?)',(utf_tn,utf_pan,utf_nn,utf_pointname,listpastx1[index2],listpasty1[index2],listnewx1[index2],listnewy1[index2],))
-            cursor1.execute('INSERT INTO GS_Result_Point(TableName,Last_ResultName,New_ResultName,PointName,Last_X,Last_Y,Result_X,Result_Y,Cal_X,Cal_Y,Last_ResultX,Last_ResultY,Last_ResultP,Last_CalX,Last_CalY,Last_CalP,Dis_Ass) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',(utf_tn,utf_pan,utf_nn,utf_pointname,listpastx1[index2],listpasty1[index2],listpastx1[index2],listpasty1[index2],numm1,numm2,0,0,0,r1,r2,r6,wystr,))
+            cursor1.execute(
+                'INSERT INTO GS_Trans_Point(TableName,Last_ResultName,New_ResultName,PointName,Last_X,Last_Y,New_X,New_Y) VALUES (?,?,?,?,?,?,?,?)',
+                (utf_tn, utf_pan, utf_nn, utf_pointname, listpastx1[index2], listpasty1[index2], listnewx1[index2],
+                 listnewy1[index2],))
+            cursor1.execute(
+                'INSERT INTO GS_Result_Point(TableName,Last_ResultName,New_ResultName,PointName,Last_X,Last_Y,Result_X,Result_Y,Cal_X,Cal_Y,Last_ResultX,Last_ResultY,Last_ResultP,Last_CalX,Last_CalY,Last_CalP,Dis_Ass) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
+                (utf_tn, utf_pan, utf_nn, utf_pointname, listpastx1[index2], listpasty1[index2], listpastx1[index2],
+                 listpasty1[index2], numm1, numm2, 0, 0, 0, r1, r2, r6, wystr,))
         else:
             index2 = listname1.index(iname)
             utf_pointname = to_utf8(str(iname))
-            #首先判断有没有第一个点
+            # 首先判断有没有第一个点
             if listnewx1[index2] != 0:
-                #有问题的点，使用公式跑
-                listxy = gsjs(listnewx1[index2],listnewy1[index2],nlist)   
-                #判断有没有第一次的数据，没有就不写
+                # 有问题的点，使用公式跑
+                listxy = gsjs(listnewx1[index2], listnewy1[index2], nlist)
+                # 判断有没有第一次的数据，没有就不写
                 if listpastx1[index2] != 0:
-                    r1 = (listpastx1[index2] - listxy[0])*1000
-                    r2 = (listpasty1[index2] - listxy[1])*1000
+                    r1 = (listpastx1[index2] - listxy[0]) * 1000
+                    r2 = (listpasty1[index2] - listxy[1]) * 1000
                     r3 = r1 * r1
                     r4 = r2 * r2
                     r5 = r3 + r4
-                    r6 = round(math.sqrt(r5),1)
+                    r6 = round(math.sqrt(r5), 1)
                     if r6 > 500:
                         wystr = to_utf8('复建')
-                        cursor1.execute('INSERT INTO GS_Result_Point(TableName,Last_ResultName,New_ResultName,PointName,Last_X,Last_Y,Result_X,Result_Y,Cal_X,Cal_Y,Last_ResultX,Last_ResultY,Last_ResultP,Last_CalX,Last_CalY,Last_CalP,Dis_Ass) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',(utf_tn,utf_pan,utf_nn,utf_pointname,listpastx1[index2],listpasty1[index2],listxy[0],listxy[1],listxy[0],listxy[1],r1,r2,r6,r1,r2,r6,wystr,))
+                        cursor1.execute(
+                            'INSERT INTO GS_Result_Point(TableName,Last_ResultName,New_ResultName,PointName,Last_X,Last_Y,Result_X,Result_Y,Cal_X,Cal_Y,Last_ResultX,Last_ResultY,Last_ResultP,Last_CalX,Last_CalY,Last_CalP,Dis_Ass) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
+                            (utf_tn, utf_pan, utf_nn, utf_pointname, listpastx1[index2], listpasty1[index2], listxy[0],
+                             listxy[1], listxy[0], listxy[1], r1, r2, r6, r1, r2, r6, wystr,))
                     else:
                         wystr = to_utf8('位移')
-                        cursor1.execute('INSERT INTO GS_Result_Point(TableName,Last_ResultName,New_ResultName,PointName,Last_X,Last_Y,Result_X,Result_Y,Cal_X,Cal_Y,Last_ResultX,Last_ResultY,Last_ResultP,Last_CalX,Last_CalY,Last_CalP,Dis_Ass) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',(utf_tn,utf_pan,utf_nn,utf_pointname,listpastx1[index2],listpasty1[index2],listxy[0],listxy[1],listxy[0],listxy[1],r1,r2,r6,r1,r2,r6,wystr,))
+                        cursor1.execute(
+                            'INSERT INTO GS_Result_Point(TableName,Last_ResultName,New_ResultName,PointName,Last_X,Last_Y,Result_X,Result_Y,Cal_X,Cal_Y,Last_ResultX,Last_ResultY,Last_ResultP,Last_CalX,Last_CalY,Last_CalP,Dis_Ass) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
+                            (utf_tn, utf_pan, utf_nn, utf_pointname, listpastx1[index2], listpasty1[index2], listxy[0],
+                             listxy[1], listxy[0], listxy[1], r1, r2, r6, r1, r2, r6, wystr,))
                 else:
                     wystr = to_utf8('新建')
-                    cursor1.execute('INSERT INTO GS_Result_Point(TableName,Last_ResultName,New_ResultName,PointName,Last_X,Last_Y,Result_X,Result_Y,Cal_X,Cal_Y,Last_ResultX,Last_ResultY,Last_ResultP,Last_CalX,Last_CalY,Last_CalP,Dis_Ass) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',(utf_tn,utf_pan,utf_nn,utf_pointname,listpastx1[index2],listpasty1[index2],listnewx1[index2],listnewy1[index2],listpastx1[index2],listpasty1[index2],0,0,0,0,0,0,wystr,))
-    #数据库执行
+                    cursor1.execute(
+                        'INSERT INTO GS_Result_Point(TableName,Last_ResultName,New_ResultName,PointName,Last_X,Last_Y,Result_X,Result_Y,Cal_X,Cal_Y,Last_ResultX,Last_ResultY,Last_ResultP,Last_CalX,Last_CalY,Last_CalP,Dis_Ass) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)',
+                        (utf_tn, utf_pan, utf_nn, utf_pointname, listpastx1[index2], listpasty1[index2],
+                         listnewx1[index2], listnewy1[index2], listpastx1[index2], listpasty1[index2], 0, 0, 0, 0, 0, 0,
+                         wystr,))
+    # 数据库执行
     db1.commit()
-    #做完一切后，先关闭游标，再关闭数据库
+    # 做完一切后，先关闭游标，再关闭数据库
     cursor1.close()
     db1.close()
 
-def tablein(outpath,str1):
+
+def tablein(outpath, str1):
+    print(f"Connecting to database at path: {outpath}")
     listcgcs1 = []
     listname1 = []
     listpastx1 = []
@@ -271,12 +310,12 @@ def tablein(outpath,str1):
     listnewx1 = []
     listnewy1 = []
     points = 0
-    #查询，提取需要的数据
+    # 查询，提取需要的数据
     db2 = sqlite3.connect(outpath)
     cursor2 = db2.cursor()
     utfstr1 = to_utf8(str1)
     sqlstr1 = 'SELECT * FROM GS_Input_Point WHERE TableName = ?'
-    cursor2.execute(sqlstr1,(utfstr1,))
+    cursor2.execute(sqlstr1, (utfstr1,))
     all_da = cursor2.fetchall()
     for da in all_da:
         listpastx.append(da[3])
@@ -293,8 +332,10 @@ def tablein(outpath,str1):
         listcgcs1.append(da[8])
         points = points + 1
     sqlstr2 = 'SELECT * FROM GS_Input_Param WHERE TableName = ?'
-    cursor2.execute(sqlstr2,(utfstr1,))
+    cursor2.execute(sqlstr2, (utfstr1,))
     all_par = cursor2.fetchall()
+    if not all_par:
+        raise ValueError(f"No data found in GS_Input_Param for TableName: {str1}")
     pastname = all_par[0][1].decode('utf-8')
     newname = all_par[0][2].decode('utf-8')
     # pjbc是平均边长
@@ -319,18 +360,20 @@ def tablein(outpath,str1):
     wypd3 = math.sqrt(wypd1 + wypd2)
     wypd = round(wypd3 * 3, 4)
     wypd0 = wypd
-    #更新下数据库（参数部分）
+    # 更新下数据库（参数部分）
     sqlstr3 = 'update GS_Input_Param set Pt_Count=?,Avg_MSL=?,Avg_Dir=? WHERE TableName = ?'
-    cursor2.execute(sqlstr3,(points,pjbcs,pjfxs,utfstr1,))
-    #数据库执行
+    cursor2.execute(sqlstr3, (points, pjbcs, pjfxs, utfstr1,))
+    # 数据库执行
     db2.commit()
-    #做完一切后，先关闭游标，再关闭数据库
+    # 做完一切后，先关闭游标，再关闭数据库
     cursor2.close()
     db2.close()
     js = 0
-    return listcgcs1, listname1, listpastx1, listpasty1, wypd0, listname, listnewx, listnewy, listpastx,listpasty, points, listcgcs,sf, newname, pastname, js,listnewx1,listnewy1
+    return listcgcs1, listname1, listpastx1, listpasty1, wypd0, listname, listnewx, listnewy, listpastx, listpasty, points, listcgcs, sf, newname, pastname, js, listnewx1, listnewy1
 
-def bhjs(dbpath,listcgcs1, listname1, listpastx1, listpasty1, wypd, listname, listnewx, listnewy, listpastx, listpasty, points, listcgcs,  sf, newname, pastname, js,listnewx1,listnewy1,excelname):
+
+def bhjs(dbpath, listcgcs1, listname1, listpastx1, listpasty1, wypd, listname, listnewx, listnewy, listpastx, listpasty,
+         points, listcgcs, sf, newname, pastname, js, listnewx1, listnewy1, excelname):
     np.set_printoptions(suppress=False)
     # pt用于给点数point计数
     # point会随着回递函数而减少
@@ -363,8 +406,8 @@ def bhjs(dbpath,listcgcs1, listname1, listpastx1, listpasty1, wypd, listname, li
     # 先计算平移参数
     # pycsx = abs(zxzbnewx - zxzbpastx) * 1000
     # pycsy = abs(zxzbnewy - zxzbpasty) * 1000
-    pycsx = round((zxzbpastx - zxzbnewx),4)
-    pycsy = round((zxzbpasty - zxzbnewy),4)
+    pycsx = round((zxzbpastx - zxzbnewx), 4)
+    pycsy = round((zxzbpasty - zxzbnewy), 4)
     # 分别得k，sita的值
     klist = jzys1(listnewy, zxzbnewy, listnewx, zxzbnewx, sf)
     slist = jzys2(listnewy, zxzbnewy, listnewx, zxzbnewx, sf)
@@ -379,12 +422,12 @@ def bhjs(dbpath,listcgcs1, listname1, listpastx1, listpasty1, wypd, listname, li
     dy2 = cjh(dylist)
     # 这里再创建矩阵1
     arr1 = np.array(((k2, 0, 0, 0), (0, s2, 0, 0),
-                    (0, 0, dx2, 0), (0, 0, 0, dy2)))
+                     (0, 0, dx2, 0), (0, 0, 0, dy2)))
     # 矩阵1的逆矩阵矩阵2
     arr2 = np.linalg.inv(arr1)
     # 求矩阵l
     llist = jzys4(listpasty, zxzbpasty, listpastx, zxzbpastx,
-                    listnewy, zxzbnewy, listnewx, zxzbnewx, sf)
+                  listnewy, zxzbnewy, listnewx, zxzbnewx, sf)
     # 得到数列e1，e2，e3，e4
     e1 = cjh2(klist, llist)
     e2 = cjh2(slist, llist)
@@ -403,15 +446,15 @@ def bhjs(dbpath,listcgcs1, listname1, listpastx1, listpasty1, wypd, listname, li
     lylist = jzys3(jylist1, 0, 1)
     # 求改算坐标
     gsx = gsys(listnewx, jxlist1, jylist1, lxlist,
-                lylist, arrz, sf, zxzbnewx, zxzbpastx, 0)
+               lylist, arrz, sf, zxzbnewx, zxzbpastx, 0)
     gsy = gsys(listnewy, jxlist2, jylist2, lxlist,
-                lylist, arrz, sf, zxzbnewy, zxzbpasty, 1)
-    #缩放系数也是计算出来的sfxs
-    sfxs = sfjs(gsx,listnewx,gsy,listnewy)
-    #旋转角，模型精度
-    xzj = xzjs(gsx,listnewx,gsy,listnewy)
-    mxjdx = mxjd(gsx,listpastx)
-    mxjdy = mxjd(gsy,listpasty)
+               lylist, arrz, sf, zxzbnewy, zxzbpasty, 1)
+    # 缩放系数也是计算出来的sfxs
+    sfxs = sfjs(gsx, listnewx, gsy, listnewy)
+    # 旋转角，模型精度
+    xzj = xzjs(gsx, listnewx, gsy, listnewy)
+    mxjdx = mxjd(gsx, listpastx)
+    mxjdy = mxjd(gsy, listpasty)
     # 还是要先求较差
     xcx = xcys(gsx, listpastx)
     xcy = xcys(gsy, listpasty)
@@ -458,9 +501,9 @@ def bhjs(dbpath,listcgcs1, listname1, listpastx1, listpasty1, wypd, listname, li
         n3 = zxzbpastx - zxzbnewx - s1 - s2 + float(arrz[2])
         n4 = (-1) * float(arrz[1])
         n5 = n1
-        s3 = (-1)*float(arrz[0])*zxzbnewy
-        s4 = float(arrz[1])*zxzbnewx
-        n6 = s3 + s4 + float(arrz[3])+zxzbpasty-zxzbnewy
+        s3 = (-1) * float(arrz[0]) * zxzbnewy
+        s4 = float(arrz[1]) * zxzbnewx
+        n6 = s3 + s4 + float(arrz[3]) + zxzbpasty - zxzbnewy
         sxylist = []
         sxylist.append(n1)
         sxylist.append(n2)
@@ -484,13 +527,15 @@ def bhjs(dbpath,listcgcs1, listname1, listpastx1, listpasty1, wypd, listname, li
         lengs1 = len(gszbx)
         nlist = relist1[6]
         # return relist
-        #中文再来一次
+        # 中文再来一次
         utf_pan = to_utf8(pastname)
         utf_nn = to_utf8(newname)
         utf_tn = to_utf8(excelname)
-        insert_into_database1(dbpath,utf_tn,listname1,listname,gsx,gsy,listpastx1,listpasty1,listnewx1,listnewy1,nlist,utf_pan,utf_nn,wypd,sfxs,xzj,pycsx,pycsy,mxjdx,mxjdy,zxzbpastx,zxzbpasty,zxzbnewx,zxzbnewy,n1,n2,n3,n4,n5,n6)
+        insert_into_database1(dbpath, utf_tn, listname1, listname, gsx, gsy, listpastx1, listpasty1, listnewx1,
+                              listnewy1, nlist, utf_pan, utf_nn, wypd, sfxs, xzj, pycsx, pycsy, mxjdx, mxjdy, zxzbpastx,
+                              zxzbpasty, zxzbnewx, zxzbnewy, n1, n2, n3, n4, n5, n6)
 
-    else:           
+    else:
         # 先把所有的合在一起，方便删除
         lenlist1 = len(xcx)
         ii = 0
@@ -534,14 +579,20 @@ def bhjs(dbpath,listcgcs1, listname1, listpastx1, listpasty1, wypd, listname, li
                 mm2 = mm2 + 1
         print(" Finish!")
         js1 = 1
-        bhjs(dbpath,listcgcs1, listname1, listpastx1, listpasty1, wypd, listname, listnewx, listnewy, listpastx,
-                listpasty, points, listcgcs, sf, newname, pastname, js1,listnewx1,listnewy1,excelname)
+        bhjs(dbpath, listcgcs1, listname1, listpastx1, listpasty1, wypd, listname, listnewx, listnewy, listpastx,
+             listpasty, points, listcgcs, sf, newname, pastname, js1, listnewx1, listnewy1, excelname)
 
 
 # 主函数 计算
-def main_function(dbpath,file_name):
-    #从数据库中调用
-    listcgcs1, listname1, listpastx1, listpasty1, wypd0, listname, listnewx, listnewy, listpastx,listpasty, points, listcgcs,sf, newname, pastname, js,listnewx1,listnewy1 = tablein(dbpath,file_name)
-    #计算
-    bhjs(dbpath,listcgcs1, listname1, listpastx1, listpasty1, wypd0, listname, listnewx, listnewy, listpastx,listpasty, points, listcgcs,sf, newname, pastname, js,listnewx1,listnewy1,file_name)
-    messagebox.showinfo("提示",f"文件 '{file_name}' 计算成功！")
+def main_function(file_name, dbpath):
+    try:
+        print(f"File name: {file_name}")
+        # 从数据库中调用
+        listcgcs1, listname1, listpastx1, listpasty1, wypd0, listname, listnewx, listnewy, listpastx, listpasty, points, listcgcs, sf, newname, pastname, js, listnewx1, listnewy1 = tablein(
+            dbpath, file_name)
+        # 计算
+        bhjs(dbpath, listcgcs1, listname1, listpastx1, listpasty1, wypd0, listname, listnewx, listnewy, listpastx,
+             listpasty, points, listcgcs, sf, newname, pastname, js, listnewx1, listnewy1, file_name)
+        QMessageBox.information(None, "提示", f"文件 '{file_name}' 计算成功！")
+    except Exception as e:
+        QMessageBox.critical(None, "错误", f"文件 '{file_name}' 计算失败！错误信息: {str(e)}")

Back/WD/WDshow.py

@@ -4,14 +4,60 @@ import sqlite3
 from PySide6.QtGui import QStandardItemModel
 
 def main_function(ui, db_path, utf_en):
-    # 只显示一个tab
-    ui.tabWidget.setTabVisible(0, True)
-    ui.tabWidget.setTabVisible(1, False)
-    ui.tabWidget.setTabVisible(2, False)
-    # 重新设置文字名称
-    ui.tabWidget.setTabText(0, '平面控制网稳定性计算成果表')
+    #只显示头两个tab
+    ui.tabWidget.setTabVisible(0,True)
+    ui.tabWidget.setTabVisible(1,True)
+    ui.tabWidget.setTabVisible(2,False)
+    #重新设置文字名称
+    ui.tabWidget.setTabText(0,'稳定性分析成果表')
+    ui.tabWidget.setTabText(1,'自由网成果归算模型')
+    #链接数据库并显示
     # 连接到数据库
+    #将结果输出到数据库
     db1 = sqlite3.connect(db_path)
-    db1.text_factory = lambda x: str(x, 'utf-8')
+    #获取游标
     cursor1 = db1.cursor()
+    #查询表内符合的所有数据
+    sqlstr1 = 'select PointName,First_X,First_Y,Last_X,Last_Y,Last_Wight,Result_X,Result_Y,New_Wight,New_FirstX,New_FirstY,New_FirstP,NFDis_Ass,New_LastX,New_LastY,New_LastP,NLDis_Ass from WD_Result_Point WHERE TableName = ?'
+    cursor1.execute(sqlstr1,(utf_en,))
+    #获取结果集
+    result = cursor1.fetchall()
+    #对结果集进行处理，把汉字转换过来,添加表头部分
+    nlist,plist = Arrange_Data(result)
+    # 创建一个数据模型
+    model = QStandardItemModel()
+    #把数据放进去
+    model1 = Data_in_Cell(plist)
+    #设置表头
+    model1.setHorizontalHeaderLabels(['点名', '首期X','首期Y','上期X', '上期Y','权','本期X','本期Y','权','本期-首期X','本期-首期Y','本期-首期P','位移判定', '本期-上期X','本期-上期Y','本期-上期P','位移判定'])
+    model1.setVerticalHeaderLabels(nlist)
+    #QTableView并将数据模型与之关联
+    ui.resultTableView.setModel(model1)
+    ui.resultTableView.show()
 
+    #富文本的html
+    sqlstr2 = 'select Last_ResultName,New_ResultName,Formula_X1,Formula_X2,Formula_X3,Formula_Y1,Formula_Y2,Formula_Y3 from WD_Result_Param WHERE TableName = ?'
+    cursor1.execute(sqlstr2,(utf_en,))
+    #获取结果集
+    result1 = cursor1.fetchall()
+    str1 = result1[0][0].decode('utf-8')
+    str2 = result1[0][1].decode('utf-8')
+    n1 = result1[0][2]
+    n2 = result1[0][3]
+    n3 = result1[0][4]
+    n4 = result1[0][5]
+    n5 = result1[0][6]
+    n6 = result1[0][7]
+    str0 = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+hr { height: 1px; border-width: 0; }
+li.unchecked::marker { content: "\2610"; }
+li.checked::marker { content: "\2612"; }
+</style></head><body style=" font-family:'Microsoft YaHei UI'; font-size:9pt; font-weight:400; font-style:normal;">
+<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; color:#000000;">"""+str2+"""--"""+str1+"""</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; font-weight:700;">X</span><span style=" font-size:14pt;">=(</span><span style=" font-size:14pt; color:#aa0000;">"""+str(n1)+"""</span><span style=" font-size:14pt;">)</span><span style=" font-size:14pt; font-weight:700;">x</span><span style=" font-size:14pt;">+(</span><span style=" font-size:14pt; color:#00aa00;">"""+str(n2)+"""</span><span style=" font-size:14pt;">)</span><span style=" font-size:14pt; font-weight:700;">y</span><span style=" font-size:14pt;">+(</span><span style=" font-size:14pt; color:#00007f;">"""+str(n3)+"""</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; font-weight:700;">Y</span><span style=" font-size:14pt;">=(</span><span style=" font-size:14pt; color:#aa0000;">"""+str(n4)+"""</span><span style=" font-size:14pt;">)</span><span style=" font-size:14pt; font-weight:700;">x</span><span style=" font-size:14pt;">+(</span><span style=" font-size:14pt; color:#00aa00;">"""+str(n5)+"""</span><span style=" font-size:14pt;">)</span><span style=" font-size:14pt; font-weight:700;">y</span><span style=" font-size:14pt;">+(</span><span style=" font-size:14pt; color:#00007f;">"""+str(n6)+"""</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; 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.printTableView.setHtml(str0)

Front/main.py

@@ -234,7 +234,7 @@ class MainWindow(QMainWindow):
                 # 1秒后自动跳转
                 QTimer.singleShot(1000, lambda: self.simulateButtonClick("btn_new"))
             else:
-                QMessageBox.warning(self, '警告', '请先上传文件到本地数据库中')
+                QMessageBox.warning(self, '警告', '请先选择项目并上传文件')
 
         # 输出点击回馈
         print(f'Button "{btnName}" pressed!')

Front/modules/ui_functions.py

@@ -329,15 +329,14 @@ class UIFunctions(MainWindow):
         sql_folder = os.path.abspath(sql_folder)
         db_path = os.path.join(sql_folder, f"{self.ui.comboBox.currentText()}.db")
         # 转换为utf-8
-        excelname = os.path.basename(file_path)
-        utf_en = excelname.encode('utf-8')
+        excelname = os.path.basename(file_path)  # 文件名
+        utf_en = excelname.encode('utf-8')  # 转换文件名为utf-8编码形式
         if current_text == "水准测段高差稳定计算":
             GCcompute.main_function(file_path, db_path)
             GCshow.main_function(self.ui, db_path, utf_en)
         elif current_text == "控制网复测平面基准计算":
-            # GScompute.main_function(file_path, db_path)
+            GScompute.main_function(excelname, db_path)
             GSshow.main_function(self.ui, db_path, utf_en)
-            # GSshow.main_function(self.ui, file_path, db_path)
         elif current_text == "平面控制网稳定性计算":
             WDcompute.main_function(file_path, db_path)
             WDshow.main_function(self.ui, db_path, utf_en)