Skip to content

Commit

Permalink
Merge pull request #9 from ThorntonTomasetti/Release-0.5.0.0
Browse files Browse the repository at this point in the history 
Release 0.5.0.0
  • Loading branch information
@ktam-tt
ktam-tt authored May 8, 2020
2 parents 2a42039 + 8a3e18e commit b4bbdaa
Show file tree
Hide file tree
Showing 11 changed files with 73 additions and 60 deletions.
9 changes: 6 additions & 3 deletions Beacon/Beacon.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,23 +299,26 @@
<PostBuildEvent>if $(ConfigurationName) == Debug2018 (
rd /s /q "C:\ProgramData\Autodesk\Revit\Addins\2018\Beacon"
del /q "C:\ProgramData\Autodesk\Revit\Addins\2018\Beacon.addin"
del /q "C:\ProgramData\Autodesk\Revit\Addins\2018\EC.Beacon.addin"
md "C:\ProgramData\Autodesk\Revit\Addins\2018\Beacon"
copy "$(TargetDir)*.*" "C:\ProgramData\Autodesk\Revit\Addins\2018\Beacon"
copy "$(ProjectDir)Beacon.addin" "C:\ProgramData\Autodesk\Revit\Addins\2018"
copy "$(ProjectDir)EC.Beacon.addin" "C:\ProgramData\Autodesk\Revit\Addins\2018"
)
if $(ConfigurationName) == Debug2019 (
rd /s /q "C:\ProgramData\Autodesk\Revit\Addins\2019\Beacon"
del /q "C:\ProgramData\Autodesk\Revit\Addins\2019\Beacon.addin"
del /q "C:\ProgramData\Autodesk\Revit\Addins\2019\EC.Beacon.addin"
md "C:\ProgramData\Autodesk\Revit\Addins\2019\Beacon"
copy "$(TargetDir)*.*" "C:\ProgramData\Autodesk\Revit\Addins\2019\Beacon"
copy "$(ProjectDir)Beacon.addin" "C:\ProgramData\Autodesk\Revit\Addins\2019"
copy "$(ProjectDir)EC.Beacon.addin" "C:\ProgramData\Autodesk\Revit\Addins\2019"
)
if $(ConfigurationName) == Debug2020 (
rd /s /q "C:\ProgramData\Autodesk\Revit\Addins\2020\Beacon"
del /q "C:\ProgramData\Autodesk\Revit\Addins\2020\Beacon.addin"
del /q "C:\ProgramData\Autodesk\Revit\Addins\2020\EC.Beacon.addin"
md "C:\ProgramData\Autodesk\Revit\Addins\2020\Beacon"
copy "$(TargetDir)*.*" "C:\ProgramData\Autodesk\Revit\Addins\2020\Beacon"
copy "$(ProjectDir)Beacon.addin" "C:\ProgramData\Autodesk\Revit\Addins\2020"
copy "$(ProjectDir)EC.Beacon.addin" "C:\ProgramData\Autodesk\Revit\Addins\2020"
)

if $(ConfigurationName) == Release2018 (
Expand Down
1 change: 0 additions & 1 deletion Beacon/Data/RevitReader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ private void ReadFloors()
RevitElement floorDeck = new RevitElement(
revitElement.Category, revitElement.Id, deckName, revitElement.AssociatedLevel, revitElement.AssociatedElevation, volumeOfDeck,
elementLayerMaterial.Name, GetMaterialType(elementLayerMaterial), layerDensity);
floorDeck.Area = revitElement.Area;
a_revitElementData.Add(floorDeck);

// Don't add revitElement if added here, avoid double counting and counting deck with full depth volume.
Expand Down
11 changes: 11 additions & 0 deletions Beacon/EC.Beacon.addin
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<RevitAddIns>
<AddIn Type="Application">
<Assembly>Beacon\Beacon.dll</Assembly>
<ClientId>E3E69830-E208-4F44-B044-1DD8109EB30D</ClientId>
<FullClassName>Beacon.App</FullClassName>
<Name>Beacon Embodied Carbon</Name>
<VendorId>BECN</VendorId>
<VendorDescription>Beacon</VendorDescription>
</AddIn>
</RevitAddIns>
96 changes: 48 additions & 48 deletions Beacon/Plots/PlotData.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,54 +450,54 @@ public void PopulateConcreteGwpList()
{
ConcreteGwpList = new List<GwpNameValue>()
{
new GwpNameValue("2500-00-FA/SL", 231.1),
new GwpNameValue("2500-20-FA", 199.7),
new GwpNameValue("2500-30-FA", 182.7),
new GwpNameValue("2500-40-FA", 164.9),
new GwpNameValue("2500-30-SL", 178.1),
new GwpNameValue("2500-40-SL", 160.5),
new GwpNameValue("2500-50-SL", 142.9),
new GwpNameValue("2500-50-FA/SL", 144.0),
new GwpNameValue("3000-00-FA/SL", 257.7),
new GwpNameValue("3000-20-FA", 222.1),
new GwpNameValue("3000-30-FA", 202.9),
new GwpNameValue("3000-40-FA", 182.6),
new GwpNameValue("3000-30-SL", 197.7),
new GwpNameValue("3000-40-SL", 177.7),
new GwpNameValue("3000-50-SL", 157.8),
new GwpNameValue("3000-50-FA/SL", 159.0),
new GwpNameValue("4000-00-FA/SL", 318.1),
new GwpNameValue("4000-20-FA", 273.0),
new GwpNameValue("4000-30-FA", 248.6),
new GwpNameValue("4000-40-FA", 223.0),
new GwpNameValue("4000-30-SL", 242.1),
new GwpNameValue("4000-40-SL", 216.8),
new GwpNameValue("4000-50-SL", 191.4),
new GwpNameValue("4000-50-FA/SL", 193.0),
new GwpNameValue("5000-00-FA/SL", 389.2),
new GwpNameValue("5000-20-FA", 333.0),
new GwpNameValue("5000-30-FA", 302.7),
new GwpNameValue("5000-40-FA", 270.6),
new GwpNameValue("5000-30-SL", 294.4),
new GwpNameValue("5000-40-SL", 262.8),
new GwpNameValue("5000-50-SL", 231.2),
new GwpNameValue("5000-50-FA/SL", 233.2),
new GwpNameValue("6000-00-FA/SL", 409.9),
new GwpNameValue("6000-20-FA", 350.5),
new GwpNameValue("6000-30-FA", 318.4),
new GwpNameValue("6000-40-FA", 284.5),
new GwpNameValue("6000-30-SL", 309.7),
new GwpNameValue("6000-40-SL", 276.4),
new GwpNameValue("6000-50-SL", 243.0),
new GwpNameValue("6000-50-FA/SL", 245.1),
new GwpNameValue("8000-00-FA/SL", 477.2),
new GwpNameValue("8000-20-FA", 407.2),
new GwpNameValue("8000-30-FA", 369.4),
new GwpNameValue("8000-40-FA", 329.5),
new GwpNameValue("8000-30-SL", 359.2),
new GwpNameValue("8000-40-SL", 319.8),
new GwpNameValue("8000-50-SL", 280.5),
new GwpNameValue("8000-50-FA/SL", 283.2)
new GwpNameValue("2500-00-FA/SL", 236.73),
new GwpNameValue("2500-20-FA", 204.09),
new GwpNameValue("2500-30-FA", 186.44),
new GwpNameValue("2500-40-FA", 167.81),
new GwpNameValue("2500-30-SL", 183.94),
new GwpNameValue("2500-40-SL", 166.34),
new GwpNameValue("2500-50-SL", 148.74),
new GwpNameValue("2500-50-FA/SL", 148.51),
new GwpNameValue("3000-00-FA/SL", 264.16),
new GwpNameValue("3000-20-FA", 227.16),
new GwpNameValue("3000-30-FA", 207.17),
new GwpNameValue("3000-40-FA", 186.06),
new GwpNameValue("3000-30-SL", 204.33),
new GwpNameValue("3000-40-SL", 184.39),
new GwpNameValue("3000-50-SL", 164.45),
new GwpNameValue("3000-50-FA/SL", 164.19),
new GwpNameValue("4000-00-FA/SL", 326.27),
new GwpNameValue("4000-20-FA", 279.43),
new GwpNameValue("4000-30-FA", 254.11),
new GwpNameValue("4000-40-FA", 227.39),
new GwpNameValue("4000-30-SL", 250.52),
new GwpNameValue("4000-40-SL", 225.27),
new GwpNameValue("4000-50-SL", 200.02),
new GwpNameValue("4000-50-FA/SL", 199.70),
new GwpNameValue("5000-00-FA/SL", 399.62),
new GwpNameValue("5000-20-FA", 341.20),
new GwpNameValue("5000-30-FA", 309.62),
new GwpNameValue("5000-40-FA", 276.29),
new GwpNameValue("5000-30-SL", 305.14),
new GwpNameValue("5000-40-SL", 273.65),
new GwpNameValue("5000-50-SL", 242.15),
new GwpNameValue("5000-50-FA/SL", 241.74),
new GwpNameValue("6000-00-FA/SL", 420.89),
new GwpNameValue("6000-20-FA", 359.17),
new GwpNameValue("6000-30-FA", 325.81),
new GwpNameValue("6000-40-FA", 290.60),
new GwpNameValue("6000-30-SL", 321.08),
new GwpNameValue("6000-40-SL", 287.81),
new GwpNameValue("6000-50-SL", 254.54),
new GwpNameValue("6000-50-FA/SL", 254.11),
new GwpNameValue("8000-00-FA/SL", 490.02),
new GwpNameValue("8000-20-FA", 417.34),
new GwpNameValue("8000-30-FA", 378.06),
new GwpNameValue("8000-40-FA", 336.59),
new GwpNameValue("8000-30-SL", 372.49),
new GwpNameValue("8000-40-SL", 333.31),
new GwpNameValue("8000-50-SL", 294.14),
new GwpNameValue("8000-50-FA/SL", 293.63)
};
GwpSelectedIndex = 0;
GwpSelected = ConcreteGwpList[0];
Expand Down
4 changes: 2 additions & 2 deletions Beacon/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.4.0.0")]
[assembly: AssemblyFileVersion("0.4.0.0")]
[assembly: AssemblyVersion("0.5.0.0")]
[assembly: AssemblyFileVersion("0.5.0.0")]
12 changes: 6 additions & 6 deletions BeaconInstaller/BeaconInstaller.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Beacon, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:Beacon, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_3CD25B80BEDC47E3829FE3DFE177225F"
Expand Down Expand Up @@ -850,7 +850,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Beacon, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:Beacon, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_5A15CD9C758B43AABE0D4F533769B75D"
Expand Down Expand Up @@ -912,7 +912,7 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Beacon, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:Beacon, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_8B51B39082594E35BA87D08806F52AFE"
Expand Down Expand Up @@ -1250,15 +1250,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Beacon"
"ProductCode" = "8:{403091D0-C5BD-4C8F-8BFA-8A89F2F3780D}"
"PackageCode" = "8:{FF8B6165-42DA-437D-88BF-29D5D4D19E28}"
"ProductCode" = "8:{B4EC2C0C-8926-46BB-8A47-B74080E10DBA}"
"PackageCode" = "8:{F523AD25-3422-4DF1-BD1E-77E9C16F9AF3}"
"UpgradeCode" = "8:{A3A19A37-6DE8-443F-9205-329EE02CD780}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:0.4.0"
"ProductVersion" = "8:0.5.0"
"Manufacturer" = "8:Beacon"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down
Binary file modified BeaconInstaller/Release2020/BeaconInstaller.msi
View file
Binary file not shown.
Binary file modified Deployment/Beacon.zip
View file
Binary file not shown.
Binary file modified Deployment/Revit2018/Beacon/Beacon.dll
View file
Binary file not shown.
Binary file modified Deployment/Revit2019/Beacon/Beacon.dll
View file
Binary file not shown.
Binary file modified Deployment/Revit2020/Beacon/Beacon.dll
View file
Binary file not shown.

0 comments on commit b4bbdaa

Please sign in to comment.