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

Back/GC/GC.py

@@ -1,10 +1,30 @@
 import openpyxl
 import sqlite3
 import os
+import pandas as pd
 from openpyxl import Workbook
 from PySide6.QtWidgets import QApplication, QMessageBox
 
 
+# 添加文件转换函数
+def convert_xls_to_xlsx(file_path):
+    # 使用 pandas 读取 .xls 文件
+    df = pd.read_excel(file_path, engine='xlrd')
+    # 创建一个新的 .xlsx 文件路径
+    xlsx_file_path = file_path.replace('.xls', '.xlsx')
+    # 将数据保存为 .xlsx 文件
+    df.to_excel(xlsx_file_path, index=False)
+    return xlsx_file_path
+
+
+# 弹窗提示用户 .xls 文件将转换为 .xlsx 文件
+def confirm_xls_to_xlsx_conversion(file_name):
+    response = QMessageBox.question(None, "确认转换",
+                                    f".xls文件将默认转换为.xlsx文件进行计算，系统会重新生成一个.xlsx文件副本用以计算，不会删除您本来的.xls文件，点击“OK”开始上传文件，点击“Cancel”取消上传文件",
+                                    QMessageBox.Ok | QMessageBox.Cancel)
+    return response == QMessageBox.Ok
+
+
 # 读取指定单元格的数据
 def read_cells_from_excel(cells, sheet):
     """
@@ -106,8 +126,9 @@ def insert_into_database(file_name, cell_values, ms_station, last_station_count,
                 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                 """,
                 (
-                file_name_utf8, cell_values['D1'], cell_values['C1'], cell_values['I1'], ms_station, last_station_count,
-                new_station_count, last_sum_hdiff, new_sum_hdiff, last_sum_rlen, new_sum_rlen)
+                    file_name_utf8, cell_values['D1'], cell_values['C1'], cell_values['I1'], ms_station,
+                    last_station_count,
+                    new_station_count, last_sum_hdiff, new_sum_hdiff, last_sum_rlen, new_sum_rlen)
             )
             QMessageBox.information(None, "提示",
                                     f"文件 '{file_name}' 已成功添加到本地数据库中，点击'OK'以关闭此对话框。对话框关闭后，请点击“计算”以计算数据")
@@ -243,6 +264,15 @@ def get_data_from_excel1(list1):
 
 # 主函数 读取excel文件
 def main_function(file_path, db_path):
+    # 检查文件扩展名
+    if file_path.endswith('.xls'):
+        # 弹窗提示用户 .xls 文件将转换为 .xlsx 文件
+        if not confirm_xls_to_xlsx_conversion(os.path.basename(file_path)):
+            print("用户取消了转换操作")
+            return
+
+        # 转换 .xls 文件为 .xlsx 文件
+        file_path = convert_xls_to_xlsx(file_path)
     # 调用读取Excel文件的函数
     file_name = os.path.basename(file_path)
     file_name_utf8 = file_name.encode('utf-8')

Back/GC/GCExport.py

@@ -272,8 +272,26 @@ def export_initial_data(ui, utf_en, db_path, export_folder):
         else:
             QMessageBox.critical(ui, '错误', f'导出初始数据过程中发生错误: {str(e)}')
 
+def process_utf_en(utf_en):
+    # 确保 utf_en 是字节字符串
+    if not isinstance(utf_en, bytes):
+        utf_en = utf_en.encode('utf-8')
+
+    # 将字节字符串解码为普通字符串
+    file_name = utf_en.decode('utf-8')
+
+    # 检查文件后缀名并进行相应处理
+    if file_name.endswith('.xls'):
+        # 去掉 .xls 后缀并添加 .xlsx 后缀
+        file_name = file_name[:-4] + '.xlsx'
+
+    # 将处理后的字符串重新编码为字节字符串
+    utf_en = file_name.encode('utf-8')
+
+    return utf_en
 
 def main_function_initial(ui, utf_en, db_path):
+
     # 获取应用的安装目录
     app_install_dir = os.path.dirname(os.path.abspath(__file__))  # 假设脚本文件位于应用的安装目录下
     export_folder = os.path.join(app_install_dir, 'Export')
@@ -287,6 +305,8 @@ def main_function_initial(ui, utf_en, db_path):
 
 
 def main_function_result(ui, utf_en, db_path):
+    # 处理 utf_en
+    utf_en = process_utf_en(utf_en)
     # 获取应用的安装目录
     app_install_dir = os.path.dirname(os.path.abspath(__file__))  # 假设脚本文件位于应用的安装目录下
     export_folder = os.path.join(app_install_dir, 'Export')

Back/GC/GCcompute.py

@@ -278,6 +278,12 @@ def main_function(file_path, db_path):
         file_name = os.path.basename(file_path)
         file_name_utf8 = file_name.encode('utf-8')
 
+        # 检查文件后缀名
+        if file_name.endswith('.xls'):
+            # 去掉 .xls 后缀并添加 .xlsx 后缀
+            file_name = file_name[:-4] + '.xlsx'
+            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")
@@ -359,3 +365,4 @@ def main_function(file_path, db_path):
 
     except Exception as e:
         QMessageBox.critical(None, "错误", f"文件 '{file_name}' 计算失败！错误信息: {str(e)}")
+        print(f"文件 '{file_name}' 计算失败！错误信息: {str(e)}")

Back/GC/GCshow.py

@@ -5,11 +5,29 @@ from PySide6.QtGui import QStandardItemModel, QStandardItem
 from PySide6.QtCore import QItemSelectionModel
 
 
-def main_function(ui, db_path, utf_en):
+def process_utf_en(utf_en):
     # 确保 utf_en 是字节字符串
     if not isinstance(utf_en, bytes):
         utf_en = utf_en.encode('utf-8')
 
+    # 将字节字符串解码为普通字符串
+    file_name = utf_en.decode('utf-8')
+
+    # 检查文件后缀名并进行相应处理
+    if file_name.endswith('.xls'):
+        # 去掉 .xls 后缀并添加 .xlsx 后缀
+        file_name = file_name[:-4] + '.xlsx'
+
+    # 将处理后的字符串重新编码为字节字符串
+    utf_en = file_name.encode('utf-8')
+
+    return utf_en
+
+
+def main_function(ui, db_path, utf_en):
+    # 处理 utf_en
+    utf_en = process_utf_en(utf_en)
+
     # 设置 QTabWidget 的可见性和标签文本
     tabs_to_show = [(0, '水准测段高差计算成果表')]
     for index in range(ui.tabWidget.count()):
@@ -23,46 +41,67 @@ def main_function(ui, db_path, utf_en):
     db1.text_factory = lambda x: str(x, 'utf-8')
     cursor1 = db1.cursor()
 
-    # 查询 GC_Output_Point 表中的 TableName 字段
-    query_table_names = "SELECT DISTINCT TableName FROM GC_Output_Point"
-    cursor1.execute(query_table_names)
-
+    # 查询 GC_Output_Point 表中的数据
     query = """
     SELECT New_ID, New_ResultName, New_SPName, New_EPName, New_HDiff, New_RLen, Correct_Factor, Period_Diff, Dis_Ass
     FROM GC_Output_Point
     WHERE TableName = ?
     """
     cursor1.execute(query, (utf_en,))
-    result = cursor1.fetchall()
+    output_result = cursor1.fetchall()
+
+    # 查询 GC_Input_Param 表中的 Correct_Factor 字段
+    param_query_correct_factor = """
+    SELECT Correct_Factor
+    FROM GC_Input_Param
+    WHERE TableName = ?
+    """
+    cursor1.execute(param_query_correct_factor, (utf_en,))
+    correct_factor_result = cursor1.fetchall()
+
     cursor1.close()
     db1.close()
 
     # 创建 QStandardItemModel 实例
     model = QStandardItemModel()
-    model.setColumnCount(len(result[0]))
+    model.setColumnCount(len(output_result[0]) + 1)  # 增加一列
 
     # 设置表头
-    headers = ['序号', '结果期数', '起点', '终点', '高差', '路线长', '修正数', '期间差异', '变形判定']
+    headers = ['序号', '结果期数', '起点', '终点', '高差', '路线长', '修正数', '期间差异', '变形判定', '修正系数']
     model.setHorizontalHeaderLabels(headers)
 
-    for row_data in result:
+    # 使用 itertools.zip_longest 处理长度不一致的情况
+    for row_data, correct_factor_data in itertools.zip_longest(output_result, correct_factor_result,
+                                                               fillvalue=(None, None)):
         items = []
         for i, item in enumerate(row_data):
-            if i == 4 or i == 5:  # 索引4（高差）
-                item = f"{item:.6f}"  # 格式化为6位小数
-            elif i == 6:  # 索引 6（修正数）
-                item = f"{item:.2f}"
-            elif i == 7:  # 假设 Period_Diff 在索引 7
-                if item is not None and isinstance(item, (int, float)):
-                    item = f"{item:.2f}"  # 格式化为2位小数
-                else:
-                    item = ""  # 如果是 None 或非数字类型，显示空字符串
-            elif i == 8:  # 假设 Dis_Ass 在索引 8
-                if item is not None and isinstance(item, str):
-                    item = item  # 显示字符串内容
-                else:
-                    item = ""  # 如果是 None，显示空字符串
+            if item is None:
+                item = ""  # 如果是 None，显示空字符串
+            else:
+                if i == 4 or i == 5:  # 索引4（高差）和索引5（路线长）
+                    item = f"{item:.6f}"  # 格式化为6位小数
+                elif i == 6:  # 索引 6（修正数）
+                    item = f"{item:.2f}"
+                elif i == 7:  # 假设 Period_Diff 在索引 7
+                    if item is not None and isinstance(item, (int, float)):
+                        item = f"{item:.2f}"  # 格式化为2位小数
+                    else:
+                        item = ""  # 如果是 None 或非数字类型，显示空字符串
+                elif i == 8:  # 假设 Dis_Ass 在索引 8
+                    if item is not None and isinstance(item, str):
+                        item = item  # 显示字符串内容
+                    else:
+                        item = ""  # 如果是 None，显示空字符串
             items.append(QStandardItem(str(item)))
+
+        # 添加修正系数列数据
+        if correct_factor_data is not None and correct_factor_data[0] is not None:
+            correct_factor = f"{correct_factor_data[0]:.10f}"  # 格式化为10位小数
+        else:
+            correct_factor = ""
+
+        items.append(QStandardItem(str(correct_factor)))
+
         model.appendRow(items)
 
     # 设置并展示表格
@@ -101,7 +140,7 @@ def search_show_function(ui, db_path, utf_en):
 
     # 查询 GC_Input_Param 表中的数据
     param_query = """
-    SELECT ObservationLevel, Ms_Station, Last_StationCount, Last_SumHDiff, Last_SumRLen, New_StationCount, New_SumHDiff, New_SumRLen
+    SELECT ObservationLevel, Ms_Station, Last_StationCount, Last_SumHDiff, Last_SumRLen, New_StationCount, New_SumHDiff, New_SumRLen, Correct_Factor
     FROM GC_Input_Param
     WHERE TableName = ?
     """
@@ -122,7 +161,8 @@ def search_show_function(ui, db_path, utf_en):
     input_model.setHorizontalHeaderLabels(input_headers)
 
     # 使用 itertools.zip_longest 处理长度不一致的情况
-    for row_data, param_data in itertools.zip_longest(input_result, param_result, fillvalue=(None, None, None, None, None, None, None, None)):
+    for row_data, param_data in itertools.zip_longest(input_result, param_result,
+                                                      fillvalue=(None, None, None, None, None, None, None, None, None)):
         items = []
         for i, item in enumerate(row_data):
             if item is None:
@@ -134,9 +174,9 @@ def search_show_function(ui, db_path, utf_en):
 
         # 添加新的列数据
         if param_data is not None:
-            observation_level, ms_station, last_station_count, last_sum_hdiff, last_sum_rlen, new_station_count, new_sum_hdiff, new_sum_rlen = param_data
+            observation_level, ms_station, last_station_count, last_sum_hdiff, last_sum_rlen, new_station_count, new_sum_hdiff, new_sum_rlen, correct_factor = param_data
         else:
-            observation_level, ms_station, last_station_count, last_sum_hdiff, last_sum_rlen, new_station_count, new_sum_hdiff, new_sum_rlen = "", "", "", "", "", "", "", ""
+            observation_level, ms_station, last_station_count, last_sum_hdiff, last_sum_rlen, new_station_count, new_sum_hdiff, new_sum_rlen, correct_factor = "", "", "", "", "", "", "", "", ""
 
         # 确保 observation_level 和 ms_station 是字符串
         if observation_level is None:
@@ -165,6 +205,8 @@ def search_show_function(ui, db_path, utf_en):
             new_sum_rlen = ""
         else:
             new_sum_rlen = f"{new_sum_rlen:.6f}"
+        if correct_factor is None:
+            correct_factor = ""
 
         items.append(QStandardItem(str(observation_level)))
         items.append(QStandardItem(f"{ms_station:.2f}" if isinstance(ms_station, (int, float)) else ""))
@@ -193,32 +235,57 @@ def search_show_function(ui, db_path, utf_en):
     cursor1.execute(output_query, (utf_en,))
     output_result = cursor1.fetchall()
 
+    # 查询 GC_Input_Param 表中的 Correct_Factor 字段
+    param_query_correct_factor = """
+    SELECT Correct_Factor
+    FROM GC_Input_Param
+    WHERE TableName = ?
+    """
+    cursor1.execute(param_query_correct_factor, (utf_en,))
+    correct_factor_result = cursor1.fetchall()
+
     # 创建 QStandardItemModel 实例
     output_model = QStandardItemModel()
-    output_model.setColumnCount(len(output_result[0]))
+    output_model.setColumnCount(len(output_result[0]) + 1)  # 增加一列
 
     # 设置表头
-    output_headers = ['序号', '结果期数', '起点', '终点', '高差', '路线长', '修正数', '期间差异', '变形判定']
+    output_headers = [
+        '序号', '结果期数', '起点', '终点', '高差', '路线长', '修正数', '期间差异', '变形判定', '修正系数'
+    ]
     output_model.setHorizontalHeaderLabels(output_headers)
 
-    for row_data in output_result:
+    # 使用 itertools.zip_longest 处理长度不一致的情况
+    for row_data, correct_factor_data in itertools.zip_longest(output_result, correct_factor_result,
+                                                               fillvalue=(None, None)):
         items = []
         for i, item in enumerate(row_data):
-            if i == 4 or i == 5:  # 索引4（高差）和索引5（路线长）
-                item = f"{item:.6f}"  # 格式化为6位小数
-            elif i == 6:  # 索引 6（修正数）
-                item = f"{item:.2f}"
-            elif i == 7:  # 假设 Period_Diff 在索引 7
-                if item is not None and isinstance(item, (int, float)):
-                    item = f"{item:.2f}"  # 格式化为2位小数
-                else:
-                    item = ""  # 如果是 None 或非数字类型，显示空字符串
-            elif i == 8:  # 假设 Dis_Ass 在索引 8
-                if item is not None and isinstance(item, str):
-                    item = item  # 显示字符串内容
-                else:
-                    item = ""  # 如果是 None，显示空字符串
+            if item is None:
+                item = ""  # 如果是 None，显示空字符串
+            else:
+                if i == 4 or i == 5:  # 索引4（高差）和索引5（路线长）
+                    item = f"{item:.6f}"  # 格式化为6位小数
+                elif i == 6:  # 索引 6（修正数）
+                    item = f"{item:.2f}"
+                elif i == 7:  # 假设 Period_Diff 在索引 7
+                    if item is not None and isinstance(item, (int, float)):
+                        item = f"{item:.2f}"  # 格式化为2位小数
+                    else:
+                        item = ""  # 如果是 None 或非数字类型，显示空字符串
+                elif i == 8:  # 假设 Dis_Ass 在索引 8
+                    if item is not None and isinstance(item, str):
+                        item = item  # 显示字符串内容
+                    else:
+                        item = ""  # 如果是 None，显示空字符串
             items.append(QStandardItem(str(item)))
+
+        # 添加修正系数列数据
+        if correct_factor_data is not None and correct_factor_data[0] is not None:
+            correct_factor = f"{correct_factor_data[0]:.10f}"  # 格式化为6位小数
+        else:
+            correct_factor = ""
+
+        items.append(QStandardItem(str(correct_factor)))
+
         output_model.appendRow(items)
 
     # 设置并展示输出数据表格
@@ -237,4 +304,3 @@ def search_show_function(ui, db_path, utf_en):
 
     # 隐藏 QLabel
     ui.default_remind1.hide()
-