Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

Dimitrie/dev/integrations #12

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f7c317a
Basically checks the serialisation and deserialisation from a speckle…
didimitrie Oct 27, 2018
ad8009d
minor cleanup & extra comments
didimitrie Oct 27, 2018
0fe8ffd
init receiver ui
teocomi Oct 30, 2018
8c593a9
Finalized UI, added speckle popup, added specklecore integration
Oct 31, 2018
8229637
Added OnUpdateGlobal event
Nov 1, 2018
75083be
Added dropdowns for accounts and streams
Nov 1, 2018
470cb4d
it is alive
didimitrie Nov 2, 2018
c0c83a9
- grevit walls & levels now scale themselves on creation with the scale
didimitrie Nov 3, 2018
6009b33
fixed download icon and login logic when no account exists
teocomi Nov 3, 2018
941d399
diffing objects on the speckle side & other fixes and hacks
didimitrie Nov 3, 2018
c712ecf
broke down classes a bit
didimitrie Nov 4, 2018
22ef884
Picking up mr @teocomi 's latest bestest
didimitrie Nov 4, 2018
ce8938c
making grevit multi-model compatible (ie, multiple sources, multiple …
didimitrie Nov 4, 2018
8a3d35f
detached logic from global references & added interfaces re future ui…
didimitrie Nov 5, 2018
7f8cae1
nailed diffing, updates, deleting and adding - for now
didimitrie Nov 5, 2018
3a414de
it works! better diffing & handling of user deleted elements from a s…
didimitrie Nov 5, 2018
cdb3c93
cleanup & commented code a bit
didimitrie Nov 5, 2018
2191ac2
core update
didimitrie Nov 5, 2018
1d7f0cf
refresh icon bug fix - canexecute
teocomi Nov 5, 2018
bd9d5ea
Merge branch 'Matteo/dev/speckle-ui' into Dimitrie/dev/integrations 🤞
didimitrie Nov 5, 2018
9025b62
painful merge
didimitrie Nov 5, 2018
919fe78
some stuff got lost in the merge
didimitrie Nov 6, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ indent_style = space

# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4
indent_size = 2
insert_final_newline = true
charset = utf-8-bom

Expand Down
34 changes: 34 additions & 0 deletions Grevit.Revit.2019/ExtEventHandler.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Autodesk.Revit.UI;
using SpeckleClientUI;
using SpeckleCore;

namespace Grevit.Revit
{
/// <summary>
/// This one here works the magic
/// </summary>
public class SpeckleExternalEventHandler : IExternalEventHandler
{
public Receiver Receiver;
/// <summary>
/// Where the speckle build and bake gets triggered.
/// </summary>
/// <param name="app"></param>
public void Execute( UIApplication app )
{
// There's something wrong with the line below.
// TODO: Cleanup flow and referncing, etc. I obviously got confused in the process.
Receiver.Builder.Build( Receiver );
}

public string GetName( )
{
return "Speckle Bake";
}
}
}
4 changes: 4 additions & 0 deletions Grevit.Revit.2019/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<Weavers>
<Costura DisableCompression="true"/>
</Weavers>
89 changes: 79 additions & 10 deletions Grevit.Revit.2019/Grevit.Revit.2019.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Costura.Fody.3.1.6\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.3.1.6\build\Costura.Fody.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -12,6 +13,9 @@
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -31,16 +35,41 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Costura, Version=3.1.6.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.6\lib\net46\Costura.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignThemes.Wpf, Version=2.5.0.1205, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignThemes.2.5.0.1205\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="RevitAPI">
<HintPath>C:\Program Files\Autodesk\Revit 2019\RevitAPI.dll</HintPath>
<Reference Include="RevitAPI, Version=19.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\Revit.RevitApi.x64.2019.0.0\lib\net45\RevitAPI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RevitAPIUI">
<HintPath>C:\Program Files\Autodesk\Revit 2019\RevitAPIUI.dll</HintPath>
<Reference Include="RevitAPIUI, Version=19.0.0.0, Culture=neutral, processorArchitecture=AMD64">
<HintPath>..\packages\Revit.RevitApiUI.x64.2019.0.0\lib\net45\RevitAPIUI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="SQLite-net, Version=1.5.231.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\sqlite-net-pcl.1.5.231\lib\netstandard1.1\SQLite-net.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.batteries_green, Version=1.1.11.121, Culture=neutral, PublicKeyToken=a84b7dcfb1391f7f, processorArchitecture=MSIL">
<HintPath>..\packages\SQLitePCLRaw.bundle_green.1.1.11\lib\net45\SQLitePCLRaw.batteries_green.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.batteries_v2, Version=1.1.11.121, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
<HintPath>..\packages\SQLitePCLRaw.bundle_green.1.1.11\lib\net45\SQLitePCLRaw.batteries_v2.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.core, Version=1.1.11.121, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
<HintPath>..\packages\SQLitePCLRaw.core.1.1.11\lib\net45\SQLitePCLRaw.core.dll</HintPath>
</Reference>
<Reference Include="SQLitePCLRaw.provider.e_sqlite3, Version=1.1.11.121, Culture=neutral, PublicKeyToken=9c301db686d0bd12, processorArchitecture=MSIL">
<HintPath>..\packages\SQLitePCLRaw.provider.e_sqlite3.net45.1.1.11\lib\net45\SQLitePCLRaw.provider.e_sqlite3.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
Expand All @@ -55,39 +84,50 @@
</ItemGroup>
<ItemGroup>
<Compile Include="..\Grevit.Revit\ComponentExtension.cs">
<Link>ComponentExtension.cs</Link>
<Link>Grevit\ComponentExtension.cs</Link>
</Compile>
<Compile Include="..\Grevit.Revit\CreateExtension.cs">
<Link>CreateExtension.cs</Link>
<Link>Grevit\CreateExtension.cs</Link>
</Compile>
<Compile Include="..\Grevit.Revit\ParameterExtension.cs">
<Link>ParameterExtension.cs</Link>
<Link>Grevit\ParameterExtension.cs</Link>
</Compile>
<Compile Include="..\Grevit.Revit\ParameterList.cs">
<Link>ParameterList.cs</Link>
<Link>Grevit\ParameterList.cs</Link>
<SubType>Form</SubType>
</Compile>
<Compile Include="..\Grevit.Revit\ParameterList.Designer.cs">
<Link>ParameterList.Designer.cs</Link>
<Link>Grevit\ParameterList.Designer.cs</Link>
</Compile>
<Compile Include="..\Grevit.Revit\Revit.cs">
<Link>Revit.cs</Link>
</Compile>
<Compile Include="..\Grevit.Revit\Utilities.cs">
<Link>Utilities.cs</Link>
</Compile>
<Compile Include="ExtEventHandler.cs" />
<Compile Include="Grevit\GrevitBuildModel.cs" />
<Compile Include="Grevit\GrevitCommand.cs" />
<Compile Include="Grevit\GrevitFaceReference.cs" />
<Compile Include="Grevit\ParameterNames.cs" />
<Compile Include="Grevit\SpeckleGrevitBuilder.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="UI\SpeckleClientWindow.xaml.cs">
<DependentUpon>SpeckleClientWindow.xaml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Resource Include="FodyWeavers.xml" />
<Content Include="Grevit.Revit.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</Content>
<None Include="packages.config" />
<None Include="Resources\2xlogo%404x.png" />
<None Include="Resources\radio_button.png" />
<None Include="Resources\tag_hash.png" />
Expand All @@ -96,7 +136,7 @@
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Grevit.Revit\ParameterList.resx">
<Link>ParameterList.resx</Link>
<Link>Grevit\ParameterList.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
Expand All @@ -108,11 +148,26 @@
<Project>{4e16464a-4495-4a27-b810-a54f9ce3d191}</Project>
<Name>Grevit.Types</Name>
</ProjectReference>
<ProjectReference Include="..\SpeckleAccountManager\SpecklePopup.csproj">
<Project>{d65594c8-ea2e-46ca-a756-b1634edc3ae3}</Project>
<Name>SpecklePopup</Name>
</ProjectReference>
<ProjectReference Include="..\SpeckleClientUI\SpeckleClientUI.csproj">
<Project>{5ffc275e-4dc5-4351-a12d-10985bff4e04}</Project>
<Name>SpeckleClientUI</Name>
</ProjectReference>
<ProjectReference Include="..\SpeckleCore\SpeckleCore\SpeckleCore.csproj">
<Project>{cfe27d3d-8a1a-43f9-9387-8fd9e119e174}</Project>
<Name>SpeckleCore</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="UI\SpeckleClientWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<!--
Expand All @@ -133,4 +188,18 @@
<Output TaskParameter="CopiedFiles" ItemName="SuccessfullyCopiedFiles" />
</Copy>
</Target>
<Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
<Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
<Error Condition="!Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
<Error Condition="!Exists('..\packages\Costura.Fody.3.1.6\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.1.6\build\Costura.Fody.props'))" />
<Error Condition="!Exists('..\packages\Fody.3.2.16\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.3.2.16\build\Fody.targets'))" />
</Target>
<Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
<Import Project="..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.11\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
<Import Project="..\packages\Fody.3.2.16\build\Fody.targets" Condition="Exists('..\packages\Fody.3.2.16\build\Fody.targets')" />
</Project>
Loading