ShrlAlgo/RookieStation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消主材表

Browse Source
This commit is contained in:
GG Z
2021-12-08 18:12:09 +08:00
parent aa7f26fea8
commit 70ab56d9d9
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RookieStation/Drawing/ExecuteCmd/CreateMainMaterialsTable.cs
View File

@@ -31,7 +31,7 @@ namespace RookieStation.Drawing.ExecuteCmd
var sql = SQLiteUtil.GetInstance();
sql.CreateDb(UserConstant.DbFolder + "Inventory.db");
List<string[]> tableRow = sql.QueryTable("DecorativeMaterials");
List<string[]> tableRow = sql.QueryTable("DecorationMaterials");
sql.CloseConncetion();
//FilteredElementCollector collectorAll = new FilteredElementCollector(doc);
//collectorAll.WherePasses(new LogicalOrFilter(new ElementIsElementTypeFilter(false), new ElementIsElementTypeFilter(true)));
@@ -207,6 +207,7 @@ namespace RookieStation.Drawing.ExecuteCmd
catch (Exception ex)
{
Log.WriteLog(ex.Message);
throw;
}
}
else

2
RookieStation/RsApp.cs
View File

@@ -139,7 +139,7 @@ namespace RookieStation.RibbonMenu
//出图面板
RibbonPanel drawingPanel = application.CreateRibbonPanel(TabName, DrawingPanelName);
NewPushButtonData<CreateMainMaterialsTable>(drawingPanel, "主材表", Properties.Resources.MainMaterials, DrawingSheetCmdEnabled);
//NewPushButtonData<CreateMainMaterialsTable>(drawingPanel, "主材表", Properties.Resources.MainMaterials, DrawingSheetCmdEnabled);
NewPushButtonData<UpdateSheetContents>(drawingPanel, "更新图纸目录", Properties.Resources.UpdateSheetTable, null);
SplitButtonData legendSplitButtonData = new SplitButtonData("创建图例", "创建图例");

BIN
RookieStation/RsLibrary/Inventory.db
View File

Binary file not shown.

9
RookieStation/Statistics/ExecuteCmd/ExportBudgetInventory.cs
View File

@@ -455,7 +455,7 @@ namespace RookieStation.Statistics.ExecuteCmd
length += l;
item.Remarks += familyName + "\r\n";
}
if (familyName.Contains("立体发光字"))
if (familyName.Contains("精工发光字"))
{
double l = Convert.ToDouble((instance.Symbol.Name.Substring(0, instance.Symbol.Name.IndexOf('*')))) / 1000;
length += l;
@@ -468,6 +468,13 @@ namespace RookieStation.Statistics.ExecuteCmd
{
var a = instance.Symbol.get_Parameter(BuiltInParameter.FAMILY_HEIGHT_PARAM).AsDouble() * instance.Symbol.get_Parameter(BuiltInParameter.FURNITURE_WIDTH).AsDouble();
area += RsRevitUtils.ConvertSquareFeetToSquareMetre(a);
item.Remarks += familyName + "\r\n";
}
if (familyName.Contains("校园文化墙"))
{
var a = instance.Symbol.GetParameters("宽度").FirstOrDefault().AsDouble() * instance.Symbol.GetParameters("高度").FirstOrDefault().AsDouble();
area += RsRevitUtils.ConvertSquareFeetToSquareMetre(a);
item.Remarks += familyName + "\r\n";
}