Skip to content

Commit

Permalink
Helix upgrade PR to merge the changes from the master branch (#10388)
Browse files Browse the repository at this point in the history
* LibG Binaries Update (#10295)

* "LibG/ASM224,7418555f"

* "LibG/ASM224.4,918b3d73"

* "LibG/ASM225,2b68d3dd"

* "LibG/ASM226,2b308956"

* Change mechanism to retreive the certificate from assembly (#10301)

* DYN-2225 - Marshaling Performance optimization - Heap Cleanup (#10026)

* fast path for zero size heap allocation

* Cache mechanism for marshalling lookups

* Do not allocate heap stack values for class properties for CLR objects

* Test removing getter heap interaction for CLR object

* Remove unused Heap Object set

* make variables non-static

* remove GetterFunctionPointer class

Co-authored-by: aparajit-pratap <[email protected]>

* DYN-2289: Fix crash with NodeToCode (#10305)

* search for property by getter if not found

* add test

* Geometry Color Tests More (#10291)

* Add geometry color check for Display_ByGeometryColor_HasColoredMesh

Add geometry color check for Display_ByGeometryColor_HasColoredMesh

* Test updates

* Add Geometry Transparency Test

* Update test name

* update newly added test (#10313)

* DYN-2286: fix for crash upon unresolved node undo (#10315)

* fix for crash upon unresolved node undo

* override Equals in PortModel

* add recorded test

* DYN-2328 Add test for geometry labeling (#10311)

* DYN-2328 Add test for geometry lablling

* DYN-2328 Add test for geometry labeling

* Removing extra assignments

* updating the test and the test dyn file.

* Removing the extra variable that is not being used

* First Github Action (#10131)

This Github Action will greet Github users who submit a PR or issue first time to our repo

* Removal of PR trigger for now (#10323)

* Analytics Agreement Workflow Update (#10314)

* Initial Commit to Update Analytics Agreement Workflow

* update

* Add unit test for deserializing analytics setting

* Update instrumentation default agreement setting in unit test

* Add more comments

* Add missing resource string (#10329)

* LibG Binaries Update (#10331)

* "LibG/ASM224,7418555f"

* "LibG/ASM224.4,918b3d73"

* "LibG/ASM225,2b68d3dd"

* "LibG/ASM226,5c8f1fdd"

* Fix the library view display issues introduced by MS WebBrowser (#10316)

* Disable the context menu on the library viewer.

* Zoom the libarary view to adapt the current DPI scale.

* Disable the horizontal scroll bar on the bottom of the library view.

* Disable the library view is zoomed by keyboard or mouse wheel.

* Zoom the library bar to adapt the current DPI scale.

* Hide the extra search text bar close button.

* [DYN-2382] LibraryViewExtensionMSWebBrowser does not scale correctly when using display scaling (#10335)

* Disable the context menu on the library viewer.

* Zoom the libarary view to adapt the current DPI scale.

* Disable the horizontal scroll bar on the bottom of the library view.

* Disable the library view is zoomed by keyboard or mouse wheel.

* Zoom the library bar to adapt the current DPI scale.

* Hide the extra search text bar close button.

* Unsubscribing the event handler in dispose method

* Skip GA Client Tear Down Process if NOT Necessary (#10340)

* Skip Analytics Client Tear down if it is not needed

* Add unit test covering analytics tear down

* Touch test naming

* [Analytics] Update Tracking Conditions (#10345)

* Update Tracking Conditions

* Add same check to ReportingUsage

* Add properties comments

* PR comment (#10347)

* Code improvements: (#10348)

1. Unsubscribe DpiChanged event handler in the browser Dispose method.
2. Move the overflow-x style setting from script to html to avoid to set it when the script method is called every time.
3. Add necessary comments.

* Update HelixWatch3DViewModelTests.cs

* Updating Watch3D_Disconnect_Reconnect_CorrectRenderings test

Co-authored-by: DynamoEngOps <[email protected]>
Co-authored-by: Craig Long <[email protected]>
Co-authored-by: aparajit-pratap <[email protected]>
Co-authored-by: Aaron (Qilong) <[email protected]>
Co-authored-by: StarLee <[email protected]>
  • Loading branch information
6 people authored Feb 14, 2020
1 parent fa0f1bc commit 58d5116
Show file tree
Hide file tree
Showing 58 changed files with 1,053 additions and 300 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Greetings

on: [issues]

jobs:
greeting:
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: 'Thank you for submitting the issue to us. We are sorry if you get stuck on your workflow. While waiting for our team member to respond, please feel free to browse our forum at https://forum.dynamobim.com/ for more Dynamo related information.'
pr-message: 'Thank you for contributing to Dynamo. We are thrilled to see you take a step forward and please allow up to 30 days for us to review your PR. While waiting for our team member to respond, please feel free to browse our forum at https://forum.dynamobim.com/ for more Dynamo related information.'
Binary file modified extern/LibG_224_0_1/LibG.AsmPreloader.Managed.dll
Binary file not shown.
Binary file modified extern/LibG_224_0_1/LibG.AsmPreloader.Unmanaged.dll
Binary file not shown.
Binary file modified extern/LibG_224_0_1/LibG.Managed.dll
Binary file not shown.
Binary file modified extern/LibG_224_0_1/LibG.ProtoInterface.dll
Binary file not shown.
Binary file modified extern/LibG_224_0_1/LibG.dll
Binary file not shown.
Binary file modified extern/LibG_224_0_1/LibGCore.dll
Binary file not shown.
Binary file modified extern/LibG_224_4_0/LibG.AsmPreloader.Managed.dll
Binary file not shown.
Binary file modified extern/LibG_224_4_0/LibG.AsmPreloader.Unmanaged.dll
Binary file not shown.
Binary file modified extern/LibG_224_4_0/LibG.Managed.dll
Binary file not shown.
Binary file modified extern/LibG_224_4_0/LibG.ProtoInterface.dll
Binary file not shown.
Binary file modified extern/LibG_224_4_0/LibG.dll
Binary file not shown.
Binary file modified extern/LibG_224_4_0/LibGCore.dll
Binary file not shown.
Binary file modified extern/LibG_225_0_0/LibG.AsmPreloader.Managed.dll
Binary file not shown.
Binary file modified extern/LibG_225_0_0/LibG.AsmPreloader.Unmanaged.dll
Binary file not shown.
Binary file modified extern/LibG_225_0_0/LibG.Managed.dll
Binary file not shown.
Binary file modified extern/LibG_225_0_0/LibG.ProtoInterface.dll
Binary file not shown.
Binary file modified extern/LibG_225_0_0/LibG.dll
Binary file not shown.
Binary file modified extern/LibG_225_0_0/LibGCore.dll
Binary file not shown.
Binary file modified extern/LibG_226_0_0/LibG.AsmPreloader.Managed.dll
Binary file not shown.
Binary file modified extern/LibG_226_0_0/LibG.AsmPreloader.Unmanaged.dll
Binary file not shown.
Binary file modified extern/LibG_226_0_0/LibG.Managed.dll
Binary file not shown.
Binary file modified extern/LibG_226_0_0/LibG.ProtoInterface.dll
Binary file not shown.
Binary file modified extern/LibG_226_0_0/LibG.dll
Binary file not shown.
Binary file modified extern/LibG_226_0_0/LibGCore.dll
Binary file not shown.
Binary file modified extern/ProtoGeometry/LibG.Interface.dll
Binary file not shown.
Binary file modified extern/ProtoGeometry/ProtoGeometry.dll
Binary file not shown.
Binary file modified extern/ProtoGeometry/en-US/ProtoGeometry.resources.dll
Binary file not shown.
14 changes: 10 additions & 4 deletions src/DynamoCore/Graph/Nodes/CodeBlockNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ public override ProtoCore.Type GetTypeHintForOutput(int index)
if (statement == null)
return type;

BinaryExpressionNode expr = statement.AstNode as BinaryExpressionNode;
var expr = statement.AstNode as BinaryExpressionNode;
if (expr == null || expr.Optr != Operator.assign)
return type;

Expand All @@ -554,15 +554,21 @@ public override ProtoCore.Type GetTypeHintForOutput(int index)
return type;

var classIndex = core.ClassTable.IndexOf(fullyQualifiedName);
if (classIndex == ProtoCore.DSASM.Constants.kInvalidIndex)
if (classIndex == Constants.kInvalidIndex)
return type;

var targetClass = core.ClassTable.ClassNodes[classIndex];
var func = targetClass.GetFirstMemberFunctionBy(funcNode.Function.Name);
var funcName = funcNode.Function.Name;
var func = targetClass.GetFirstMemberFunctionBy(funcName);
if (func == null)
{
func = targetClass.ProcTable.GetPropertyGetterByName(funcName);
}
type = func.ReturnType;
return type;
}
else if (expr.RightNode is FunctionCallNode)

if (expr.RightNode is FunctionCallNode)
{
var functionCallNode = expr.RightNode as FunctionCallNode;
ProtoCore.FunctionGroup funcGroup;
Expand Down
28 changes: 20 additions & 8 deletions src/DynamoCore/Graph/Nodes/DummyNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Xml;

namespace Dynamo.Graph.Nodes
Expand Down Expand Up @@ -250,11 +251,10 @@ private void LoadNode(XmlNode nodeElement)
OutputCount = Int32.Parse(outputCount.Value);
LegacyNodeName = legacyName.Value;

if (nodeElement.ChildNodes != null)
foreach (XmlNode childNode in nodeElement.ChildNodes)
{
foreach (XmlNode childNode in nodeElement.ChildNodes)
if (childNode.Name.Equals("OriginalNodeContent"))
OriginalNodeContent = (XmlElement)nodeElement.FirstChild.FirstChild;
if (childNode.Name.Equals("OriginalNodeContent"))
OriginalNodeContent = (XmlElement) nodeElement.FirstChild.FirstChild;
}

if (originalElement != null)
Expand Down Expand Up @@ -292,18 +292,30 @@ private void LoadNode(XmlNode nodeElement)

private void UpdatePorts()
{
var guids = InPorts.Select(x => x.GUID).ToArray();
InPorts.Clear();
for (int input = 0; input < InputCount; input++)
{
var name = string.Format("Port {0}", input + 1);
InPorts.Add(new PortModel(PortType.Input, this, new PortData(name, "")));
var name = $"Port {input + 1}";
var pm = new PortModel(PortType.Input, this, new PortData(name, ""));
InPorts.Add(pm);
if (guids.Length == InputCount)
{
pm.GUID = guids[input];
}
}

guids = OutPorts.Select(x => x.GUID).ToArray();
OutPorts.Clear();
for (int output = 0; output < OutputCount; output++)
{
var name = string.Format("Port {0}", output + 1);
OutPorts.Add(new PortModel(PortType.Output, this, new PortData(name, "")));
var name = $"Port {output + 1}";
var pm = new PortModel(PortType.Output, this, new PortData(name, ""));
OutPorts.Add(pm);
if (guids.Length == OutputCount)
{
pm.GUID = guids[output];
}
}

RegisterAllPorts();
Expand Down
19 changes: 18 additions & 1 deletion src/DynamoCore/Graph/Nodes/PortModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public enum PortType { Input, Output };
/// <summary>
/// PortModel represents Dynamo ports.
/// </summary>
public class PortModel : ModelBase
public class PortModel : ModelBase, IEquatable<PortModel>
{
#region private fields
ObservableCollection<ConnectorModel> connectors = new ObservableCollection<ConnectorModel>();
Expand Down Expand Up @@ -369,6 +369,23 @@ protected override void DeserializeCore(XmlElement nodeElement, SaveContext cont
}

#endregion

public bool Equals(PortModel other)
{
if (other == null) return false;

if (this == other) return true;

if (GUID == other.GUID) return true;

return false;
}

public override int GetHashCode()
{
return GUID.GetHashCode();
}

}

/// <summary>
Expand Down
44 changes: 32 additions & 12 deletions src/DynamoCore/Logging/DynamoAnalyticsClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,15 @@ public void Dispose()
else
StabilityCookie.WriteCleanShutdown();

Service.ShutDown();
//Unregister the GATrackerFactory only after shutdown is recorded.
//Unregister is required, so that the host app can re-start Analytics service.
Service.Instance.Unregister(GATrackerFactory.Name);
// If the Analytics Client was initialized, shut it down.
// Otherwise skip this step because it would cause an exception.
if (Service.IsInitialized)
{
Service.ShutDown();
// Unregister the GATrackerFactory only after shutdown is recorded.
// Unregister is required, so that the host app can re-start Analytics service.
Service.Instance.Unregister(GATrackerFactory.Name);
}

if (null != heartbeat)
Heartbeat.DestroyInstance();
Expand Down Expand Up @@ -123,14 +128,27 @@ public void Dispose() { }

public virtual IAnalyticsSession Session { get; private set; }

/// <summary>
/// Return if Analytics Client is allowed to send analytics info
/// </summary>
public bool ReportingAnalytics
{
get { return preferences != null && preferences.IsAnalyticsReportingApproved; }
get
{
return preferences != null
&& Service.IsInitialized
&& preferences.IsAnalyticsReportingApproved;
}
}

/// <summary>
/// Return if Analytics Client is allowed to send instrumentation info
/// </summary>
public bool ReportingUsage
{
get { return preferences != null && preferences.IsUsageReportingApproved; }
get { return preferences != null
&& Service.IsInitialized
&& preferences.IsUsageReportingApproved; }
}

/// <summary>
Expand Down Expand Up @@ -160,12 +178,14 @@ public DynamoAnalyticsClient(DynamoModel dynamoModel)
/// </summary>
public void Start()
{
//If not ReportingAnalytics, then set the idle time as infinite so idle state is not recorded.
Service.StartUp(product,
new UserInfo(Session.UserId), ReportingAnalytics ? TimeSpan.FromMinutes(30) : TimeSpan.MaxValue);

TrackPreferenceInternal("ReportingAnalytics", "", ReportingAnalytics ? 1 : 0);
TrackPreferenceInternal("ReportingUsage", "", ReportingUsage ? 1 : 0);
if (preferences!= null && preferences.IsAnalyticsReportingApproved)
{
//If not ReportingAnalytics, then set the idle time as infinite so idle state is not recorded.
Service.StartUp(product,
new UserInfo(Session.UserId), preferences.IsAnalyticsReportingApproved ? TimeSpan.FromMinutes(30) : TimeSpan.MaxValue);
TrackPreferenceInternal("ReportingAnalytics", "", ReportingAnalytics ? 1 : 0);
TrackPreferenceInternal("ReportingUsage", "", ReportingUsage ? 1 : 0);
}
}

public void ShutDown()
Expand Down
58 changes: 18 additions & 40 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 9 additions & 19 deletions src/DynamoCoreWpf/Properties/Resources.en-US.resx
Original file line number Diff line number Diff line change
Expand Up @@ -757,25 +757,9 @@ You will get a chance to save your work.</value>
<value>Decimal Inch</value>
<comment>Setting menu | Decimal inch</comment>
</data>
<data name="DynamoViewSettingMenuEnableDataReporting" xml:space="preserve">
<value>Enable detailed usability data reporting (Instrumentation)</value>
<comment>Setting menu | Enable data reporting during usage</comment>
</data>
<data name="DynamoViewSettingMenuEnableDataReportingTooltip" xml:space="preserve">
<value>Detailed reporting sends behaviour data that we use for improving {0}.

It includes the graph being created as well as errors and warnings</value>
<comment>Setting menu | Tooltip for enable data reporting during usage menu item</comment>
</data>
<data name="DynamoViewSettingMenuEnableSummaryReporting" xml:space="preserve">
<value>Enable anonymous summary reporting (Google Analytics)</value>
<comment>Setting menu | Enable summary reporting</comment>
</data>
<data name="DynamoViewSettingMenuEnableSummaryReportingTooltip" xml:space="preserve">
<value>Anonymous summary reporting sends a minimal set of data for computing user counts, stability and performance metrics.

It does not contain your graph or any personal data</value>
<comment>Setting menu | Tooltip for enable summary reporting during usage menu item</comment>
<data name="DynamoViewSettingMenuShowDataReportingDialog" xml:space="preserve">
<value>Agreement to Collect Usability Data</value>
<comment>Setting menu | Show user agreement dialog about data collecting</comment>
</data>
<data name="DynamoViewSettingMenuFractionalFoot" xml:space="preserve">
<value>Fractional Foot</value>
Expand Down Expand Up @@ -2231,4 +2215,10 @@ Uninstall the following packages: {0}?</value>
<data name="PackageSearchViewFilterByButton" xml:space="preserve">
<value>Filter by</value>
</data>
<data name="DynamoViewSettingMenuShowDataReportingDialogTooltip" xml:space="preserve">
<value>Display the dialog for user to pick agreement on data collecting.</value>
</data>
<data name="CrashPromptGithubNewIssueTitle" xml:space="preserve">
<value>Crash report from Dynamo {0}</value>
</data>
</root>
25 changes: 6 additions & 19 deletions src/DynamoCoreWpf/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -482,25 +482,9 @@
<value>Decimal Inch</value>
<comment>Setting menu | Decimal inch</comment>
</data>
<data name="DynamoViewSettingMenuEnableDataReporting" xml:space="preserve">
<value>Enable detailed usability data reporting (Instrumentation)</value>
<comment>Setting menu | Enable data reporting during usage</comment>
</data>
<data name="DynamoViewSettingMenuEnableDataReportingTooltip" xml:space="preserve">
<value>Detailed reporting sends behaviour data that we use for improving {0}.

It includes the graph being created as well as errors and warnings</value>
<comment>Setting menu | Tooltip for enable data reporting during usage menu item</comment>
</data>
<data name="DynamoViewSettingMenuEnableSummaryReporting" xml:space="preserve">
<value>Enable anonymous summary reporting (Google Analytics)</value>
<comment>Setting menu | Enable summary reporting</comment>
</data>
<data name="DynamoViewSettingMenuEnableSummaryReportingTooltip" xml:space="preserve">
<value>Anonymous summary reporting sends a minimal set of data for computing user counts, stability and performance metrics.

It does not contain your graph or any personal data</value>
<comment>Setting menu | Tooltip for enable summary reporting during usage menu item</comment>
<data name="DynamoViewSettingMenuShowDataReportingDialog" xml:space="preserve">
<value>Agreement to Collect Usability Data</value>
<comment>Setting menu | Show user agreement dialog about data collecting</comment>
</data>
<data name="DynamoViewSettingShowRunPreview" xml:space="preserve">
<value>Show Run Preview</value>
Expand Down Expand Up @@ -2234,4 +2218,7 @@ Uninstall the following packages: {0}?</value>
<data name="PackageSearchViewFilterByButton" xml:space="preserve">
<value>Filter by</value>
</data>
<data name="DynamoViewSettingMenuShowDataReportingDialogTooltip" xml:space="preserve">
<value>Display the dialog for user to pick agreement on data collecting.</value>
</data>
</root>
Loading

0 comments on commit 58d5116

Please sign in to comment.