Merge branch 'develop' of https://github.com/specklesystems/speckle-cpp-connectors into develop

SpeckleConnector/Connector/Interface/Browser/Bridge/Base/GetDocumentState.cpp

@@ -13,12 +13,6 @@ using namespace connector::database;
 using namespace connector::record;
 using namespace speckle::utility;
 
-namespace {
-	
-	using WrappedValue = active::serialise::CargoHold<ContainerWrap<Vector<ModelCard>>, Vector<ModelCard>>;
-
-}
-
 /*--------------------------------------------------------------------
 	Default constructor
   --------------------------------------------------------------------*/

SpeckleConnector/RFIX.WIN/Connector.rc

@@ -8,6 +8,7 @@
 #include "Connector.grc.rc2"
 #include "ConnectorMenu.grc.rc2"
 #include "SpecklePalette.grc.rc2"
+#include "Speckle.grc.rc2"
 
 #include "ConnectorFix.grc.rc2"
 

SpeckleLib/Make.win/buildResAC.bat

@@ -3,6 +3,7 @@ REM AC Resource build script
 ECHO "Building AC Resources"
 
 if not exist "%RES_OUTPUT%" MD "%RES_OUTPUT%"
-python "%HEADER_PATH_5%\Tools\CompileResources.py" "INT" "%HEADER_PATH_5%\.." "%HEADER_PATH_6%Source" "%SYMROOT%\" "%RES_OUTPUT%" "%RES_SOURCE%\CodesignImport.apx.mui"
+python "%HEADER_PATH_5%\Tools\CompileResources.py" "INT" "%HEADER_PATH_5%\.." "%HEADER_PATH_6%\Connector" "%SYMROOT%\" "%RES_OUTPUT%" "%RES_SOURCE%\Speckle Connector.apx.mui"
+python "%HEADER_PATH_5%\Tools\CompileResources.py" "INT" "%HEADER_PATH_5%\.." "%HEADER_PATH_4%\Speckle" "%HEADER_PATH_4%" "%RES_OUTPUT%" "%RES_SOURCE%\Speckle Connector.apx.mui"
 
 ECHO "Finished AC Resource"

SpeckleLib/Speckle/Environment/Project.cpp

@@ -41,25 +41,21 @@ Project::Info Project::getInfo() const {
 #ifdef ARCHICAD
 	API_ProjectInfo	projectInfo;
 	if (ACAPI_ProjectOperation_Project(&projectInfo) == NoError) {
-		if (projectInfo.projectName != nullptr)
+		if ((projectInfo.projectName != nullptr) && !projectInfo.projectName->IsEmpty())
 			result.name = *projectInfo.projectName;
 		result.isShared = projectInfo.teamwork;
-		if (projectInfo.teamwork) {
-			if (projectInfo.projectPath != nullptr)
-				result.path = String{*projectInfo.projectPath};
-			else if (projectInfo.location_team != nullptr) {
+		if ((projectInfo.projectPath != nullptr) && !projectInfo.projectPath->IsEmpty())
+			result.path = String{*projectInfo.projectPath};
+		else if (projectInfo.teamwork) {
+			if (projectInfo.location_team != nullptr) {
 				GS::UniString path;
 				if (projectInfo.location_team->ToPath(&path) == NoError)
 					result.path = String{path};
 			}
-		} else {
-			if (projectInfo.projectPath != nullptr)
-				result.path = String{*projectInfo.projectPath};
-			else if (projectInfo.location != nullptr) {
-				GS::UniString path;
-				if (projectInfo.location->ToPath(&path) == NoError)
-					result.path = String{path};
-			}
+		} else if (projectInfo.location != nullptr) {
+			GS::UniString path;
+			if (projectInfo.location->ToPath(&path) == NoError)
+				result.path = String{path};
 		}
 	}
 #endif

SpeckleLib/SpeckleLib17.vcxproj

@@ -27,6 +27,7 @@
     <ClInclude Include="Speckle\Database\Storage\DocumentStore\DocumentStoreEngine.h" />
     <ClInclude Include="Speckle\Environment\Addon.h" />
     <ClInclude Include="Speckle\Environment\Platform.h" />
+    <ClInclude Include="Speckle\Environment\Project.h" />
     <ClInclude Include="Speckle\Event\Subscriber\DocStoreSubscriber.h" />
     <ClInclude Include="Speckle\Event\Subscriber\MenuSubscriber.h" />
     <ClInclude Include="Speckle\Event\Subscriber\ProjectSubscriber.h" />
@@ -58,10 +59,12 @@
     <ClInclude Include="Speckle\Record\Credentials\ServerMigration.h" />
     <ClInclude Include="Speckle\Record\Credentials\UserInfo.h" />
     <ClInclude Include="Speckle\Serialise\JSBase\JSBaseTransport.h" />
+    <ClInclude Include="Speckle\SpeckleResource.h" />
     <ClInclude Include="Speckle\Utility\Exception.h" />
     <ClInclude Include="Speckle\Utility\Guid.h" />
     <ClInclude Include="Speckle\Utility\Guid64.h" />
     <ClInclude Include="Speckle\Utility\String.h" />
+    <ClInclude Include="Speckle\Version.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Speckle\Database\AccountDatabase.cpp" />
@@ -70,10 +73,12 @@
     <ClCompile Include="Speckle\Database\Storage\DocumentStore\DocumentStoreCore.cpp" />
     <ClCompile Include="Speckle\Environment\Addon.cpp" />
     <ClCompile Include="Speckle\Environment\Platform.cpp" />
+    <ClCompile Include="Speckle\Environment\Project.cpp" />
     <ClCompile Include="Speckle\Event\Subscriber\DocStoreSubscriber.cpp" />
     <ClCompile Include="Speckle\Event\Subscriber\MenuSubscriber.cpp" />
     <ClCompile Include="Speckle\Event\Subscriber\ProjectSubscriber.cpp" />
     <ClCompile Include="Speckle\Event\Subscriber\SelectionSubscriber.cpp" />
+    <ClCompile Include="Speckle\Event\Type\ProjectEvent.cpp" />
     <ClCompile Include="Speckle\Interface\Browser\Bridge\BridgeArgument.cpp" />
     <ClCompile Include="Speckle\Interface\Browser\Bridge\BridgeArgumentWrap.cpp" />
     <ClCompile Include="Speckle\Interface\Browser\Bridge\BrowserBridge.cpp" />
@@ -97,6 +102,7 @@
     <Text Include="Speckle\Serialise\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="RINT\Speckle.grc" />
     <None Include="Speckle\Environment\Environment.md" />
     <None Include="Speckle\Event\Event.md" />
     <None Include="Speckle\Serialise\Serialisation.md" />

SpeckleLib/SpeckleLib17.vcxproj.filters

@@ -193,6 +193,15 @@
     <ClInclude Include="Speckle\Database\Storage\DocumentStore\DocumentStoreEngine.h">
       <Filter>Speckle\Database\Storage\DocumentStore</Filter>
     </ClInclude>
+    <ClInclude Include="Speckle\Environment\Project.h">
+      <Filter>Speckle\Environment</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\SpeckleResource.h">
+      <Filter>Speckle</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Version.h">
+      <Filter>Speckle</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Speckle\Environment\Addon.cpp">
@@ -270,6 +279,12 @@
     <ClCompile Include="Speckle\Database\Storage\DocumentStore\DocumentStoreCore.cpp">
       <Filter>Speckle\Database\Storage\DocumentStore</Filter>
     </ClCompile>
+    <ClCompile Include="Speckle\Environment\Project.cpp">
+      <Filter>Speckle\Environment</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Event\Type\ProjectEvent.cpp">
+      <Filter>Speckle\Event\Type</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="Speckle\CMakeLists.txt">
@@ -295,5 +310,8 @@
     <None Include="Speckle\Serialise\Serialisation.md">
       <Filter>Speckle\Serialise</Filter>
     </None>
+    <None Include="RINT\Speckle.grc">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
 </Project>