diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs index 2540011..5f43b6e 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs @@ -3007,10 +3007,12 @@ namespace JoyD.Windows.CS try { // 弹出打开文件对话框 - OpenFileDialog openFileDialog = new OpenFileDialog(); - openFileDialog.Filter = "CSV文件 (*.csv)|*.csv|所有文件 (*.*)|*.*"; - openFileDialog.Title = "选择测温区信息文件"; - openFileDialog.DefaultExt = "csv"; + OpenFileDialog openFileDialog = new OpenFileDialog + { + Filter = "CSV文件 (*.csv)|*.csv|所有文件 (*.*)|*.*", + Title = "选择测温区信息文件", + DefaultExt = "csv" + }; // 显示打开文件对话框,如果用户点击了确定按钮 if (openFileDialog.ShowDialog() == DialogResult.OK) @@ -3038,17 +3040,13 @@ namespace JoyD.Windows.CS // 分割CSV行数据 string[] parts = line.Split(','); - // 解析数据(支持中英文标题的CSV文件) - int x, y, width, height; - Color color; - if (parts.Length >= 6) { // 尝试解析数据(索引可能是从文件中读取的,也可能是我们自己分配的) - int.TryParse(parts[1], out x); - int.TryParse(parts[2], out y); - int.TryParse(parts[3], out width); - int.TryParse(parts[4], out height); + int.TryParse(parts[1], out int x); + int.TryParse(parts[2], out int y); + int.TryParse(parts[3], out int width); + int.TryParse(parts[4], out int height); // 解析颜色 try @@ -3116,11 +3114,13 @@ namespace JoyD.Windows.CS } // 弹出保存文件对话框 - SaveFileDialog saveFileDialog = new SaveFileDialog(); - saveFileDialog.Filter = "CSV文件 (*.csv)|*.csv|所有文件 (*.*)|*.*"; - saveFileDialog.Title = "保存测温区信息"; - saveFileDialog.DefaultExt = "csv"; - saveFileDialog.FileName = "测温区信息.csv"; + SaveFileDialog saveFileDialog = new SaveFileDialog + { + Filter = "CSV文件 (*.csv)|*.csv|所有文件 (*.*)|*.*", + Title = "保存测温区信息", + DefaultExt = "csv", + FileName = "测温区信息.csv" + }; // 显示保存文件对话框,如果用户点击了确定按钮 if (saveFileDialog.ShowDialog() == DialogResult.OK)