Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: va3c/RvtVa3c
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2018.0.0.0
Choose a base ref
...
head repository: va3c/RvtVa3c
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: gh-pages
Choose a head ref
  • 12 commits
  • 9 files changed
  • 3 contributors

Commits on Oct 2, 2019

  1. Verified

    This commit was signed with the committer’s verified signature.
    ssddanbrown Dan Brown
    Copy the full SHA
    cc17fed View commit details
  2. Copy the full SHA
    842753d View commit details
  3. added .vs to gitignore

    jeremytammik committed Oct 2, 2019
    Copy the full SHA
    fde3940 View commit details

Commits on Jul 9, 2020

  1. Update RvtVa3c.csproj

    Updated build events and debugs to point to Revit 2020
    pabloderen authored Jul 9, 2020
    Copy the full SHA
    3ddc17b View commit details

Commits on Jul 10, 2020

  1. Merge pull request #16 from pabloderen/patch-1

    RvtVa3c to build and debug on Revit 2020
    jeremytammik authored Jul 10, 2020
    Copy the full SHA
    3cf0194 View commit details
  2. Copy the full SHA
    e36d031 View commit details
  3. Copy the full SHA
    a8b2d07 View commit details
  4. updated license year

    jeremytammik committed Jul 10, 2020
    Copy the full SHA
    9f8259b View commit details
  5. Copy the full SHA
    b52dfb0 View commit details

Commits on Dec 14, 2020

  1. Copy the full SHA
    c5af66c View commit details

Commits on Jun 22, 2022

  1. Bump Newtonsoft.Json from 6.0.3 to 13.0.1 in /RvtVa3c

    Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 6.0.3 to 13.0.1.
    - [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
    - [Commits](JamesNK/Newtonsoft.Json@6.0.3...13.0.1)
    
    ---
    updated-dependencies:
    - dependency-name: Newtonsoft.Json
      dependency-type: direct:production
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Jun 22, 2022
    Copy the full SHA
    80398e8 View commit details

Commits on Jun 23, 2022

  1. Merge pull request #20 from va3c/dependabot/nuget/RvtVa3c/Newtonsoft.…

    …Json-13.0.1
    
    Bump Newtonsoft.Json from 6.0.3 to 13.0.1 in /RvtVa3c
    jeremytammik authored Jun 23, 2022
    Copy the full SHA
    b13f9ed View commit details
Showing with 134 additions and 114 deletions.
  1. +3 −0 .gitignore
  2. +87 −86 DynVa3c/DynVa3c.csproj
  3. +1 −1 LICENSE
  4. +7 −0 README.md
  5. +5 −8 RvtVa3c.sln
  6. +14 −4 RvtVa3c/Command.cs
  7. +7 −3 RvtVa3c/Properties/AssemblyInfo.cs
  8. +9 −11 RvtVa3c/RvtVa3c.csproj
  9. +1 −1 RvtVa3c/packages.config
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -172,3 +172,6 @@ UpgradeLog*.htm

# Microsoft Fakes
FakesAssemblies/

# Visual Studio .vs
.vs/
173 changes: 87 additions & 86 deletions DynVa3c/DynVa3c.csproj
Original file line number Diff line number Diff line change
@@ -1,93 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1127D4DE-31BB-4D7E-B663-759ACE7B8230}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DynVa3c</RootNamespace>
<AssemblyName>DynVa3c</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DSCoreNodes">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\DSCoreNodes.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DynamoCore">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\DynamoCore.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ProtoCore">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\ProtoCore.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ProtoGeometry">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\ProtoGeometry.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ProtoInterface">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\ProtoInterface.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RevitAPI">
<HintPath>..\..\..\..\..\..\Program Files\Autodesk\Revit 2015\RevitAPI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RevitAPIUI">
<HintPath>..\..\..\..\..\..\Program Files\Autodesk\Revit 2015\RevitAPIUI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RevitNodes">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\Revit_2015\RevitNodes.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RevitServices">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\Revit_2015\RevitServices.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RvtVa3c">
<HintPath>..\RvtVa3c\bin\Debug\RvtVa3c.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Va3c4Dynamo.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1127D4DE-31BB-4D7E-B663-759ACE7B8230}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DynVa3c</RootNamespace>
<AssemblyName>DynVa3c</AssemblyName>
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DSCoreNodes">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\DSCoreNodes.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DynamoCore">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\DynamoCore.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ProtoCore">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\ProtoCore.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ProtoGeometry">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\ProtoGeometry.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ProtoInterface">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\ProtoInterface.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RevitAPI">
<HintPath>..\..\..\..\..\..\Program Files\Autodesk\Revit 2015\RevitAPI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RevitAPIUI">
<HintPath>..\..\..\..\..\..\Program Files\Autodesk\Revit 2015\RevitAPIUI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RevitNodes">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\Revit_2015\RevitNodes.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RevitServices">
<HintPath>..\..\..\..\..\..\Program Files\Dynamo 0.7\Revit_2015\RevitServices.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RvtVa3c">
<HintPath>..\RvtVa3c\bin\Debug\RvtVa3c.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Va3c4Dynamo.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
-->
</Project>
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 va3c
Copyright (c) 2014-Current by Jeremy Tammik

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -64,3 +64,10 @@ For more details on programming Revit add-ins in general, please refer to the [R
Implemented by Matt Mason and Jeremy Tammik,
[The Building Coder](http://thebuildingcoder.typepad.com), Autodesk Inc.,
at the New York AEC Hackathon in May 2014.


## <a name="license"></a>License

This sample is licensed under the terms of the [MIT License](http://opensource.org/licenses/MIT).
Please see the [LICENSE](LICENSE) file for full details.

13 changes: 5 additions & 8 deletions RvtVa3c.sln
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
# Visual Studio 15
VisualStudioVersion = 15.0.28307.757
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RvtVa3c", "RvtVa3c\RvtVa3c.csproj", "{3F865D22-8849-4DFA-9E7C-3533A8A159EA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynVa3c", "DynVa3c\DynVa3c.csproj", "{1127D4DE-31BB-4D7E-B663-759ACE7B8230}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -17,12 +15,11 @@ Global
{3F865D22-8849-4DFA-9E7C-3533A8A159EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3F865D22-8849-4DFA-9E7C-3533A8A159EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3F865D22-8849-4DFA-9E7C-3533A8A159EA}.Release|Any CPU.Build.0 = Release|Any CPU
{1127D4DE-31BB-4D7E-B663-759ACE7B8230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1127D4DE-31BB-4D7E-B663-759ACE7B8230}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1127D4DE-31BB-4D7E-B663-759ACE7B8230}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1127D4DE-31BB-4D7E-B663-759ACE7B8230}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F258DCE5-3575-4A0A-9423-949D11A5146D}
EndGlobalSection
EndGlobal
18 changes: 14 additions & 4 deletions RvtVa3c/Command.cs
Original file line number Diff line number Diff line change
@@ -92,21 +92,31 @@ Va3cExportContext context
/// </summary>
/// <param name="doc">Revit Document</param>
/// <param name="includeType">Include Type Parameters in the filter dialog</param>
public void filterElementParameters( Document doc, bool includeType )
public void filterElementParameters(
Document doc,
bool includeType )
{
_parameterDictionary = new Dictionary<string, List<string>>();
_toExportDictionary = new Dictionary<string, List<string>>();

FilteredElementCollector collector = new FilteredElementCollector( doc, doc.ActiveView.Id );
FilteredElementCollector collector
= new FilteredElementCollector( doc,
doc.ActiveView.Id );

// Create a dictionary with all the properties for each category.

foreach( var fi in collector )
{

if( null == fi.Category )
{
continue;
}
string category = fi.Category.Name;

if( category != "Title Blocks" && category != "Generic Annotations" && category != "Detail Items" && category != "Cameras" )
if( category != "Title Blocks"
&& category != "Generic Annotations"
&& category != "Detail Items"
&& category != "Cameras" )
{
IList<Parameter> parameters = fi.GetOrderedParameters();
List<string> parameterNames = new List<string>();
10 changes: 7 additions & 3 deletions RvtVa3c/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
[assembly: AssemblyConfiguration( "" )]
[assembly: AssemblyCompany( "Autodesk Inc." )]
[assembly: AssemblyProduct( "RvtVa3c" )]
[assembly: AssemblyCopyright( "Copyright 2014-2017 © Jeremy Tammik Autodesk Inc." )]
[assembly: AssemblyCopyright( "Copyright 2014-2020 © Jeremy Tammik Autodesk Inc." )]
[assembly: AssemblyTrademark( "" )]
[assembly: AssemblyCulture( "" )]

@@ -50,6 +50,10 @@
// 2015-04-13 2015.0.0.31 cleaned up after ana
// 2016-12-10 2017.0.0.0 flat migration to Revit 2017
// 2017-06-29 2018.0.0.0 flat migration to Revit 2018
// 2019-10-02 2020.0.0.0 flat migration to Revit 2020
// 2020-07-10 2020.0.0.1 integrated updated build events and debug settings for Revit 2020 from pull request #16 by @pabloderen
// 2020-07-10 2021.0.0.0 flat migration to Revit 2021
// 2020-12-14 2021.0.0.1 check for null category to avoid null reference exception in issue #18 (and #17?)
//
[assembly: AssemblyVersion( "2018.0.0.0" )]
[assembly: AssemblyFileVersion( "2018.0.0.0" )]
[assembly: AssemblyVersion( "2021.0.0.1" )]
[assembly: AssemblyFileVersion( "2021.0.0.1" )]
20 changes: 9 additions & 11 deletions RvtVa3c/RvtVa3c.csproj
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RvtVa3c</RootNamespace>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,7 +40,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<StartAction>Program</StartAction>
<StartProgram>$(ProgramW6432)\Autodesk\Revit 2015\Revit.exe</StartProgram>
<StartProgram>$(ProgramW6432)\Autodesk\Revit 2020\Revit.exe</StartProgram>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
@@ -51,12 +51,10 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="RevitAPI">
<HintPath>..\..\..\..\Program Files\Autodesk\Revit 2018\RevitAPI.dll</HintPath>
<Private>False</Private>
<HintPath>C:\Program Files\Autodesk\Revit 2021\RevitAPI.dll</HintPath>
</Reference>
<Reference Include="RevitAPIUI">
<HintPath>..\..\..\..\Program Files\Autodesk\Revit 2018\RevitAPIUI.dll</HintPath>
<Private>False</Private>
<HintPath>C:\Program Files\Autodesk\Revit 2021\RevitAPIUI.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
@@ -93,12 +91,12 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AfterClean">
<Delete Files="$(AppData)\Autodesk\REVIT\Addins\2015\RvtVa3c.addin" />
<Delete Files="$(AppData)\Autodesk\REVIT\Addins\2015\RvtVa3c.dll" />
<Delete Files="$(AppData)\Autodesk\REVIT\Addins\2020\RvtVa3c.addin" />
<Delete Files="$(AppData)\Autodesk\REVIT\Addins\2020\RvtVa3c.dll" />
</Target>
<PropertyGroup>
<PostBuildEvent>copy "$(ProjectDir)RvtVa3c.addin" "$(AppData)\Autodesk\REVIT\Addins\2018"
copy "$(ProjectDir)bin\debug\RvtVa3c.dll" "$(AppData)\Autodesk\REVIT\Addins\2018"
copy "$(ProjectDir)bin\debug\Newtonsoft.Json.dll" "$(AppData)\Autodesk\REVIT\Addins\2018"</PostBuildEvent>
<PostBuildEvent>copy "$(ProjectDir)RvtVa3c.addin" "$(AppData)\Autodesk\REVIT\Addins\2021\"
copy "$(ProjectDir)bin\debug\RvtVa3c.dll" "$(AppData)\Autodesk\REVIT\Addins\2021\"
copy "$(ProjectDir)bin\debug\Newtonsoft.Json.dll" "$(AppData)\Autodesk\REVIT\Addins\2021\"</PostBuildEvent>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion RvtVa3c/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
</packages>