增加保温层和整理管线的功能,修复自动保存功能等修复多个bug

This commit is contained in:
GG Z
2024-10-27 00:19:48 +08:00
parent b6647218be
commit 77655c9ef5
67 changed files with 3159 additions and 731 deletions

View File

@@ -3,7 +3,7 @@ using System.Xml.Serialization;
namespace Sai.Toolkit.Core.LandXMLData;
[XmlType("Element")]
[XmlType("ElementToMove")]
[Serializable]
public class ElementModel : ShapeModel
{

View File

@@ -15,7 +15,7 @@ namespace Sai.Toolkit.Core.LandXMLData
[XmlAttribute("name")]
public string Name;
[XmlElement("Element")]
[XmlElement("ElementToMove")]
public List<SolidInstances> Solids;
}
}

View File

@@ -12,7 +12,7 @@ namespace Sai.Toolkit.Core.LandXMLData
Elements = new List<ElementModel>();
}
[XmlElement("Element")]
[XmlElement("ElementToMove")]
public List<ElementModel> Elements;
[XmlAttribute("name")]

View File

@@ -6,7 +6,7 @@ namespace Sai.RvKits.RvIndependent
{
public ExcelData(ExcelWorksheet sheet)
{
DataRows = new List<ExcelDataRow>();
DataRows = [];
var lastColumn = sheet.Dimension.End.Column;
var lastRow = sheet.Dimension.End.Row;
//不计算所有末行首列为空的行
@@ -23,13 +23,13 @@ namespace Sai.RvKits.RvIndependent
StartId = sheet.Cells[i, 1].Value?.ToString(), //起点节点号
Number = sheet.Cells[i, 2].Value?.ToString(), //管线点号
EndId = sheet.Cells[i, 3].Value?.ToString(), //连接点号
LayingMode = sheet.Cells[i, 4].Value?.ToString(), //埋设s方式
LayingMode = sheet.Cells[i, 4].Value?.ToString(), //埋设方式
Material = sheet.Cells[i, 5].Value?.ToString(), //管材
Size = sheet.Cells[i, 6].Value?.ToString(), //截面尺寸
Feature = sheet.Cells[i, 7].Value?.ToString(), //特征
AccessoryType = sheet.Cells[i, 8].Value?.ToString(), //节点类型
X = Convert.ToDouble(sheet.Cells[i, 9].Value),
Y = Convert.ToDouble(sheet.Cells[i, 10].Value),
X = Convert.ToDouble(sheet.Cells[i, 9].Value),//坐标Y
Y = Convert.ToDouble(sheet.Cells[i, 10].Value),//坐标X
GroundElev = Convert.ToDouble(sheet.Cells[i, 11].Value), //地面高程
Top = Convert.ToDouble(sheet.Cells[i, 12].Value), //管顶
InnerBottom = Convert.ToDouble(sheet.Cells[i, 13].Value), //管内底