uBIM/uBIMEarthTools
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: uBIM:master
Branches Tags
uBIM:master
uBIM:monitor
..
compare: uBIM:monitor
Branches Tags
uBIM:master
uBIM:monitor

No commits in common. "master" and "monitor" have entirely different histories.
master ... monitor

4 changed files with 67 additions and 132 deletions
Show Stats Expand all files Collapse all files

85
uBIMEarthTools/Commands/DWGDataExport.cs
View File

@ -86,10 +86,9 @@ namespace uBIMEarthTools.Commands
if (transGroup.Start() == TransactionStatus.Started) if (transGroup.Start() == TransactionStatus.Started)
{ {
Transaction transaction = new Transaction(doc, "uBIM"); Transaction transaction = new Transaction(doc, "uBIM");
transaction.Start();
int k = 0; int k = 0;
while (k<1000) while (true)
{ {
#region 临时变量 #region 临时变量
XYZ origin_k = pointFirstTable_L + new XYZ(k * (pointSecTable.X - pointFirstTable_L.X), 0, 0);//当前图框左上角坐标 XYZ origin_k = pointFirstTable_L + new XYZ(k * (pointSecTable.X - pointFirstTable_L.X), 0, 0);//当前图框左上角坐标
@ -101,7 +100,7 @@ namespace uBIMEarthTools.Commands
#region 获取当前图框里的textnote #region 获取当前图框里的textnote
foreach (TextNote tntmp in textnoteList) foreach (TextNote tntmp in textnoteList)
{ {
if (tntmp.Coord.X > origin_k.X && tntmp.Coord.X < origin_k.X + (pointFirstTable_R.X - pointFirstTable_L.X) && if (tntmp.Coord.X > origin_k.X && tntmp.Coord.X < origin_k.X + (pointFirstTable_R.X - pointFirstTable_L.X) &&
tntmp.Coord.Y > origin_k.Y - (pointFirstTable_L.Y - pointFirstTable_R.Y) && tntmp.Coord.Y < origin_k.Y) tntmp.Coord.Y > origin_k.Y - (pointFirstTable_L.Y - pointFirstTable_R.Y) && tntmp.Coord.Y < origin_k.Y)
{ {
@ -121,24 +120,15 @@ namespace uBIMEarthTools.Commands
textnoteKList.Add(tntmp); textnoteKList.Add(tntmp);
} }
} }
foreach (TextNote tntmp in textnoteKList)
{
tntmp.Text = tntmp.Text.Replace("X=", "").Replace("Y=", "").Replace("m", "").Trim();
}
if (textnoteKList.Count == 0) //获取不到时,跳出 if (textnoteKList.Count == 0) //获取不到时,跳出
{
break; break;
}
#endregion #endregion
#region 获取当前图框编号,标高,X,Y #region 获取当前图框编号,标高,X,Y
TextNote zkbhTn = Common.Textnote_At_Point(new XYZ(origin_k.X + pointNum.X - pointFirstTable_L.X, pointNum.Y, pointNum.Z), textnoteKList, 100); //钻孔编号 TextNote zkbhTn = Common.Textnote_At_Point(new XYZ(origin_k.X + pointNum.X - pointFirstTable_L.X, pointNum.Y, pointNum.Z), textnoteKList, 4); //钻孔编号
TextNote kkbgTn = Common.Textnote_At_Point(new XYZ(origin_k.X + pointLevel.X - pointFirstTable_L.X, pointLevel.Y, pointLevel.Z), textnoteKList, 100); //孔口标高 TextNote kkbgTn = Common.Textnote_At_Point(new XYZ(origin_k.X + pointLevel.X - pointFirstTable_L.X, pointLevel.Y, pointLevel.Z), textnoteKList, 4); //孔口标高
TextNote xTn = Common.Textnote_At_Point(new XYZ(origin_k.X + pointX.X - pointFirstTable_L.X, pointX.Y, pointX.Z), textnoteKList, 100); //孔口X TextNote xTn = Common.Textnote_At_Point(new XYZ(origin_k.X + pointX.X - pointFirstTable_L.X, pointX.Y, pointX.Z), textnoteKList, 4); //孔口X
TextNote yTn = Common.Textnote_At_Point(new XYZ(origin_k.X + pointY.X - pointFirstTable_L.X, pointY.Y, pointY.Z), textnoteKList, 100); //孔口Y TextNote yTn = Common.Textnote_At_Point(new XYZ(origin_k.X + pointY.X - pointFirstTable_L.X, pointY.Y, pointY.Z), textnoteKList, 4); //孔口Y
//钻孔编号跟孔口标高不对应时,跳至下个图框 //钻孔编号跟孔口标高不对应时,跳至下个图框
if (zkbhTn == null || kkbgTn == null) if (zkbhTn == null || kkbgTn == null)
@ -152,8 +142,6 @@ namespace uBIMEarthTools.Commands
#region 归并地层编号中类似3-1的文字(当前条件:X公差:4mm;Y公差:2mm;字高公差:null) #region 归并地层编号中类似3-1的文字(当前条件:X公差:4mm;Y公差:2mm;字高公差:null)
foreach (TextNote tntmp1 in textnoteKList) foreach (TextNote tntmp1 in textnoteKList)
{ {
tntmp1.Text = Common.NameByRule(tntmp1.Text);
if (tntmp1.Coord.X > origin_k.X + pointLayer_R.X - pointFirstTable_L.X)//排除超出范围的 if (tntmp1.Coord.X > origin_k.X + pointLayer_R.X - pointFirstTable_L.X)//排除超出范围的
continue; continue;
if (delTextnoteList.Contains(tntmp1))//排除已剔除的 if (delTextnoteList.Contains(tntmp1))//排除已剔除的
@ -162,8 +150,6 @@ namespace uBIMEarthTools.Commands
continue; continue;
foreach (TextNote tntmp2 in textnoteKList) foreach (TextNote tntmp2 in textnoteKList)
{ {
tntmp2.Text = Common.NameByRule(tntmp2.Text);
if (delTextnoteList.Contains(tntmp2))//排除已剔除的 if (delTextnoteList.Contains(tntmp2))//排除已剔除的
continue; continue;
if (tntmp2.Coord.X > origin_k.X + pointLayer_R.X - pointFirstTable_L.X)//排除超出范围的 if (tntmp2.Coord.X > origin_k.X + pointLayer_R.X - pointFirstTable_L.X)//排除超出范围的
@ -177,20 +163,18 @@ namespace uBIMEarthTools.Commands
if (Math.Abs(tntmp1.Coord.X - tntmp2.Coord.X) < 4 / 304.8 && if (Math.Abs(tntmp1.Coord.X - tntmp2.Coord.X) < 4 / 304.8 &&
Math.Abs(tntmp1.Coord.Y - tntmp2.Coord.Y) < 2 / 304.8)// &&Math.Abs(tntmp1.Height - tntmp2.Height) > 0.00001 / 304.8) Math.Abs(tntmp1.Coord.Y - tntmp2.Coord.Y) < 2 / 304.8)// &&Math.Abs(tntmp1.Height - tntmp2.Height) > 0.00001 / 304.8)
{ {
//transaction.Start(); transaction.Start();
if (tntmp1.Coord.X < tntmp2.Coord.X) if (tntmp1.Coord.X < tntmp2.Coord.X)
{ {
string s = tntmp1.Text.Trim() + "-" + tntmp2.Text.Trim(); tntmp1.Text = tntmp1.Text + "-" + tntmp2.Text;
tntmp1.Text = Common.NameByRule(s);
delTextnoteList.Add(tntmp2); delTextnoteList.Add(tntmp2);
} }
else else
{ {
string s = tntmp2.Text.Trim() + "-" + tntmp1.Text.Trim(); tntmp2.Text = tntmp2.Text + "-" + tntmp1.Text;
tntmp2.Text = Common.NameByRule(s);
delTextnoteList.Add(tntmp1); delTextnoteList.Add(tntmp1);
} }
//transaction.Commit(); transaction.Commit();
} }
} }
} }
@ -215,7 +199,7 @@ namespace uBIMEarthTools.Commands
dcgcList = dcgcList.OrderByDescending(x => x.Coord.Y).ToList(); dcgcList = dcgcList.OrderByDescending(x => x.Coord.Y).ToList();
#endregion #endregion
#region 寻找已有钻孔列表中有没有相同编号，没有时新建钻孔 #region 寻找已有钻孔列表中有没有相同编号,没有时新建钻孔
Borehole bh; Borehole bh;
if (boreholes.Count != 0 && boreholes.Select(x => x.Name).ToList().Contains(zkbhTn.Text)) if (boreholes.Count != 0 && boreholes.Select(x => x.Name).ToList().Contains(zkbhTn.Text))
{ {
@ -224,22 +208,6 @@ namespace uBIMEarthTools.Commands
else else
{ {
bh = new Borehole { Name = zkbhTn.Text }; bh = new Borehole { Name = zkbhTn.Text };
double xxx = 0;
double yyy = 0;
double zzz = 0;
try
{
xxx = Convert.ToDouble(xTn.Text);
yyy = Convert.ToDouble(yTn.Text);
zzz = Convert.ToDouble(kkbgTn.Text);
}
catch
{
k++;
MessageBox.Show(k+ "\n" +xTn.Text + "\n" + yTn.Text + "\n" + kkbgTn.Text, "向日葵", MessageBoxButtons.OK);
continue;
}
bh.ValueList.Add(new GeologyLayer(dcbhList.First().Text, new XYZ(Convert.ToDouble(xTn.Text), Convert.ToDouble(yTn.Text), Convert.ToDouble(kkbgTn.Text)))); bh.ValueList.Add(new GeologyLayer(dcbhList.First().Text, new XYZ(Convert.ToDouble(xTn.Text), Convert.ToDouble(yTn.Text), Convert.ToDouble(kkbgTn.Text))));
boreholes.Add(bh); boreholes.Add(bh);
} }
@ -248,31 +216,18 @@ namespace uBIMEarthTools.Commands
#region 导出对应的钻孔地层数据 #region 导出对应的钻孔地层数据
for (int i = 0; i < (dcbhList.Count < dcgcList.Count ? dcbhList.Count : dcgcList.Count); i++) for (int i = 0; i < (dcbhList.Count < dcgcList.Count ? dcbhList.Count : dcgcList.Count); i++)
{ {
string dcmc_i = "default"; string dcbh_i = dcbhList[i].Text.Replace("\r", "").Replace("\n", "");
string dcbh_i = "default"; string dcmc_i = dcgcList[i].Text.Replace("\r", "").Replace("\n", "");
//MessageBox.Show(xTn.Text + "\n" + yTn.Text + "\n" + dcbh_i + "\n" + dcmc_i, "向日葵", MessageBoxButtons.OK); double x = Convert.ToDouble(xTn.Text);
double y = Convert.ToDouble(yTn.Text);
try double z = Convert.ToDouble(dcmc_i);
{ GeologyLayer geologyLayer = new GeologyLayer(dcbh_i, new XYZ(x, y, z));
dcbh_i = dcbhList[i].Text.Trim(); bh.ValueList.Add(geologyLayer);
dcmc_i = dcgcList[i].Text.Trim();
double x = Convert.ToDouble(xTn.Text);
double y = Convert.ToDouble(yTn.Text);
double z = Convert.ToDouble(dcmc_i);
GeologyLayer geologyLayer = new GeologyLayer(dcbh_i, new XYZ(x, y, z));
bh.ValueList.Add(geologyLayer);
}
catch (Exception ex)
{
//MessageBox.Show(ex.Message, "向日葵", MessageBoxButtons.OK);
}
} }
#endregion #endregion
k++; k++;
} }
transaction.Commit();
} }
status = transGroup.RollBack(); status = transGroup.RollBack();
#endregion #endregion
@ -286,7 +241,7 @@ namespace uBIMEarthTools.Commands
ExcelPackage.LicenseContext = LicenseContext.NonCommercial; ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
FileInfo fileInfo = new FileInfo(localFilePath); FileInfo fileInfo = new FileInfo(localFilePath);
using (ExcelPackage excelPackage = new ExcelPackage()) using (ExcelPackage excelPackage = new ExcelPackage(fileInfo))
{ {
//using (FileStream fs = new FileStream(localFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite)) //using (FileStream fs = new FileStream(localFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite))
//{ //{
@ -326,7 +281,7 @@ namespace uBIMEarthTools.Commands
} }
} }
excelPackage.SaveAs(fileInfo); excelPackage.Save();
//} //}
//File.WriteAllBytes(localFilePath, excelPackage.GetAsByteArray()); //File.WriteAllBytes(localFilePath, excelPackage.GetAsByteArray());
} }

80
uBIMEarthTools/Commands/Monitor/MonitorViewModel.cs
View File

@ -108,51 +108,51 @@ namespace uBIMEarthTools.Commands.Monitor
var boreholeKriging = new IDW<Point3D>(boreholeList.SelectMany(b => b.ValueList.Select(p => new Point3D() { X = p.Point.X, Y = p.Point.Y, Z = p.Point.Z, Value = typeValue[p.Type] })).ToList(), 2); var boreholeKriging = new IDW<Point3D>(boreholeList.SelectMany(b => b.ValueList.Select(p => new Point3D() { X = p.Point.X, Y = p.Point.Y, Z = p.Point.Z, Value = typeValue[p.Type] })).ToList(), 2);
List<Borehole> boreholes1 = new List<Borehole>(); List<Borehole> boreholes1 = new List<Borehole>();
tris.AsParallel().ForAll(item => //tris.AsParallel().ForAll(item =>
{ //{
Func<XYZ, Borehole> func = (p => // Func<XYZ, Borehole> func = (p =>
{ // {
var topZ = topKriging.Interpolate(new Point2D() { X = p.X, Y = p.Y }); // var topZ = topKriging.Interpolate(new Point2D() { X = p.X, Y = p.Y });
var bottomZ = bottomKriging.Interpolate(new Point2D() { X = p.X, Y = p.Y }); // var bottomZ = bottomKriging.Interpolate(new Point2D() { X = p.X, Y = p.Y });
var plus = (topZ - bottomZ) / 10; // var plus = (topZ - bottomZ) / 10;
var geologyLayers = new List<GeologyLayer>(); // var geologyLayers = new List<GeologyLayer>();
for (int i = 0; i < 10; i++) // for (int i = 0; i < 10; i++)
{ // {
var p3d = new Point3D() { X = p.X, Y = p.Y, Z = topZ - i * plus }; // var p3d = new Point3D() { X = p.X, Y = p.Y, Z = topZ - i * plus };
var value = boreholeKriging.Interpolate2(p3d); // var value = boreholeKriging.Interpolate2(p3d);
geologyLayers.Add(new GeologyLayer(valueType[(int)Math.Round(value)], new Autodesk.Revit.DB.XYZ(p3d.X, p3d.Y, p3d.Z))); // geologyLayers.Add(new GeologyLayer(valueType[(int)Math.Round(value)], new Autodesk.Revit.DB.XYZ(p3d.X, p3d.Y, p3d.Z)));
} // }
return new Borehole("", geologyLayers); // return new Borehole("", geologyLayers);
}); // });
var v1 = boreholeList.ElementAt(item[1]).ValueList[0].Point - boreholeList.ElementAt(item[0]).ValueList[0].Point; // var v1 = boreholeList.ElementAt(item[1]).ValueList[0].Point - boreholeList.ElementAt(item[0]).ValueList[0].Point;
var v2 = boreholeList.ElementAt(item[2]).ValueList[0].Point - boreholeList.ElementAt(item[0]).ValueList[0].Point; // var v2 = boreholeList.ElementAt(item[2]).ValueList[0].Point - boreholeList.ElementAt(item[0]).ValueList[0].Point;
var originP = boreholeList.ElementAt(item[0]).ValueList[0].Point; // var originP = boreholeList.ElementAt(item[0]).ValueList[0].Point;
var triangle = new List<XYZ>() { boreholeList.ElementAt(item[0]).ValueList[0].Point, // var triangle = new List<XYZ>() { boreholeList.ElementAt(item[0]).ValueList[0].Point,
boreholeList.ElementAt(item[1]).ValueList[0].Point, // boreholeList.ElementAt(item[1]).ValueList[0].Point,
boreholeList.ElementAt(item[2]).ValueList[0].Point }; // boreholeList.ElementAt(item[2]).ValueList[0].Point };
var seg = 20; // var seg = 10;
v1 = v1 / seg; // v1 = v1 / seg;
v2 = v2 / seg; // v2 = v2 / seg;
for (int i = 0; i < seg; i++) // for (int i = 0; i < seg; i++)
{ // {
for (int j = 0; j < seg; j++) // for (int j = 0; j < seg; j++)
{ // {
if (i == j && i == 0) { continue; } // if (i == j && i == 0) { continue; }
var xyz = originP + v1 * i + v2 * j; // var xyz = originP + v1 * i + v2 * j;
if (IsInPolygon(xyz, triangle)) // if (IsInPolygon(xyz, triangle))
{ // {
boreholes1.Add(func(xyz)); // boreholes1.Add(func(xyz));
} // }
} // }
} // }
}); //});
//foreach (int[] item in tris) //foreach (int[] item in tris)
//{ //{
//} //}
#endregion #endregion
boreholeList.AddRange(boreholes1); boreholeList.AddRange(boreholes1);
#region 计算地质块 #region 计算地质块
List<int[]> triIndexList = Common.Delaunay(boreholeList, 10000000 / 304.8); List<int[]> triIndexList = Common.Delaunay(boreholeList, 10000000 / 304.8);

3
uBIMEarthTools/Ribbon.cs
View File

@ -53,9 +53,6 @@ namespace uBIMEarthTools
ReLoadLink_ButtonData.LargeImage = Icon(uBIMEarthTools.Properties.Resources.pyramid); ReLoadLink_ButtonData.LargeImage = Icon(uBIMEarthTools.Properties.Resources.pyramid);
sPanel.AddItem(ReLoadLink_ButtonData); sPanel.AddItem(ReLoadLink_ButtonData);
ReLoadLink_ButtonData = new PushButtonData("Test", "Test", AddInPath, "uBIMEarthTools.Commands.Monitor.MonitorCommand");
sPanel.AddItem(ReLoadLink_ButtonData);
} }
private BitmapSource Icon(System.Drawing.Bitmap bitmap) private BitmapSource Icon(System.Drawing.Bitmap bitmap)

31
uBIMEarthTools/Utils/Common.cs
View File

@ -251,23 +251,13 @@ namespace uBIMEarthTools.Utils
{ {
TextNote tn = null; TextNote tn = null;
XYZ newXyz = new XYZ(p.X, p.Y, textnoteList[0].Coord.Z); XYZ newXyz = new XYZ(p.X, p.Y, textnoteList[0].Coord.Z);
List<string> lines = new List<string>(); foreach (TextNote tntmp in textnoteList)
{
textnoteList = textnoteList.FindAll(m => m.Text != "X =" && m.Text != "Y =").ToList(); if (Math.Round(tntmp.Coord.DistanceTo(newXyz), 5) < (tolerance / 304.8))
TextNote tntmp = textnoteList.OrderBy(m => m.Coord.DistanceTo(newXyz)).First(); {
if (Math.Round(tntmp.Coord.DistanceTo(newXyz), 5) < (tolerance / 304.8)) tn = tntmp;
tn = tntmp; }
}
//foreach (TextNote tntmp in textnoteList)
//{
// string text = tntmp.Text;
// if (text == "X=" || text == "Y=")
// continue;
// if (Math.Round(tntmp.Coord.DistanceTo(newXyz), 5) < (tolerance / 304.8))
// {
// tn = tntmp;
// }
//}
return tn; return tn;
} }
public static void Swap<T>(ref T x, ref T y) public static void Swap<T>(ref T x, ref T y)
@ -276,12 +266,5 @@ namespace uBIMEarthTools.Utils
x = y; x = y;
y = temp; y = temp;
} }
public static string NameByRule(string s)
{
//①②③④⑤⑥⑦⑧⑨
string ss = s.Replace("--", "-").Replace("①","1").Replace("②", "2").Replace("③", "3").Replace("④", "4").Replace("⑤", "5").Replace("⑥", "6").Replace("⑦", "7").Replace("⑧", "8").Replace("⑨", "9");
return ss;
}
} }
} }