conflict_resolution
stringlengths
27
16k
<<<<<<< public Task<IAppEntity?> GetAppAsync(DomainId appId) ======= public async Task<IAppEntity?> GetAppAsync(Guid appId, bool canCache = false) >>>>>>> public async Task<IAppEntity?> GetAppAsync(DomainId appId, bool canCache = false) <<<<<<< public Task<ISchemaEntity?> GetSchemaAs...
<<<<<<< //dynSettings.DynamoLogger.Log(topMost); } ======= var sleep = (int)args.Argument; Thread.Sleep(sleep); } while (bw != null && !bw.CancellationPending); >>>>>>> var sleep = (int)args.Argument; ...
<<<<<<< ======= using System.Diagnostics; using System.Windows.Media.Media3D; using Autodesk.Revit.DB.Architecture; using Autodesk.Revit.DB.Electrical; using Autodesk.Revit.DB.Structure; using Autodesk.Revit.UI; >>>>>>> using System.Diagnostics; using System.Windows.Media.Media3D; using Autodesk.Revit.DB.Architect...
<<<<<<< using ProtoCore.Utils; using System.Text; ======= using Dynamo.UI; >>>>>>> using ProtoCore.Utils; using Dynamo.UI;
<<<<<<< private CodeBlockNodeModel nodeModel = null; ======= private CompletionWindow completionWindow = null; private CodeBlockNodeModel nodeModel = null; private CodeCompletionParser codeParser = null; >>>>>>> private CodeBlockNodeModel nodeModel = null; ...
<<<<<<< [DataMember] internal string NodeName { get; private set; } [DataMember] ======= // Faster, direct creation internal NodeModel Node { get; private set; } // If it was deserialized internal XmlElement NodeXml { get; private s...
<<<<<<< [Test] public void MAGN_6799_ListMapDoesntWorkWithFlatten() { // http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-6799 // Flatten Does Not work With List.Map. var model = ViewModel.Model; string openPath = Path.Combine(TestDir...
<<<<<<< var pkg = PackageUploadBuilder.NewPackageVersion(rootPkgDir, customNodeManager, l, files, packageUploadHandle); ======= var pkg = PackageUploadBuilder.NewPackageVersion(this.dynamoModel, l, files, packageUploadHandle); packageUploadHandl...
<<<<<<< private bool graphExecuted; public bool RunEnabled { get { return runEnabled; } set { if (Equals(value, runEnabled)) return; runEnabled = value; RaisePropertyChanged("RunEnabled"); } }...
<<<<<<< string LastUpdateDownloadPath { get; set; } ======= int MaxNumRecentFiles { get; set; } List<string> RecentFiles { get; set; } >>>>>>> string LastUpdateDownloadPath { get; set; } int MaxNumRecentFiles { get; set; } List<string> RecentFiles { get; set; }
<<<<<<< #if USE_DSENGINE public void ImportLibrary(object parameter) { string fileFilter = "Assembly Library Files (*.dll)|*.dll|" + "All Files (*.*)|*.*"; OpenFileDialog openFileDialog = new OpenFileDialog(); openFileDialog.Filter = fi...
<<<<<<< var newlyPlacedCollapsedNode = currentWorkspace.Nodes .Where(node => node is Function) .First(node => ((Function)node).Definition.FunctionId == newNodeDefinition.FunctionId); ======= >>>>>>> <<<...
<<<<<<< [IsVisibleInDynamoLibrary(false)] public static IList DiagonalRight(IList list, int subLength) ======= public static IList DiagonalRight([ArbitraryDimensionArrayImport] IList list, int subLength) >>>>>>> [IsVisibleInDynamoLibrary(false)] public static IList DiagonalRig...
<<<<<<< } private void WorkspaceTabs_TargetUpdated(object sender, DataTransferEventArgs e) { ToggleWorkspaceTabVisibility(WorkspaceTabs.SelectedIndex); } private void WorkspaceTabs_SizeChanged(object sender, SizeChangedEventArgs e) { ToggleWorkspaceTab...
<<<<<<< using Dynamo.Interfaces; using Dynamo.Nodes; using ProtoCore.Lang; ======= using ProtoCore.AST.AssociativeAST; >>>>>>> using Dynamo.Interfaces; using ProtoCore.AST.AssociativeAST; <<<<<<< public TypedParameter(string parameter, ProtoCore.Type type, object defaultValue = null) ======= publi...
<<<<<<< ViewModel.OpenCommand.Execute(testPath); Assert.DoesNotThrow(() => ViewModel.Model.RunExpression()); ======= Controller.DynamoViewModel.OpenCommand.Execute(testPath); Assert.DoesNotThrow(() => dynSettings.Controller.RunExpression()); AssertPreviewCo...
<<<<<<< ======= if (workspaceModel == null) { return; } var dynamoModel = workspaceModel.DynamoModel; >>>>>>> <<<<<<< engineController.LiveRunnerCore.SetTraceDataForNodes(traceData); ======= if (dynamoModel == null ...
<<<<<<< using Expression = Dynamo.FScheme.Expression; using Dynamo.Connectors; ======= using Value = Dynamo.FScheme.Value; >>>>>>> using Dynamo.Connectors; using Value = Dynamo.FScheme.Value; <<<<<<< [NodeName("Web Request")] [NodeCategory(BuiltinNodeCategories.MISC)] [NodeDescription("An element which gat...
<<<<<<< // Setup Temp PreferenceSetting Location for testing PreferenceSettings.DYNAMO_TEST_PATH = Path.Combine(TempFolder, "UserPreferenceTest.xml"); Controller = DynamoController.MakeSandbox(); Controller.Testing = true; //create the view Ui =...
<<<<<<< RunCommandsFromFile("Defect_MAGN_57.xml"); ======= // Details are available in defect http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-57 RunCommandsFromFile("Defect_MAGN_57.xml", true); >>>>>>> // Details are available in defect http://adsk-oss.myjetbrains...
<<<<<<< ======= using System.Windows.Forms; using System.Collections.Generic; using System.Drawing; using System.Windows.Media.Imaging; using System.Windows.Interop; using Excel = Microsoft.Office.Interop.Excel; >>>>>>> using System.Drawing; using System.Windows.Media.Imaging; using System.Windows.Interop; <<<<<<< ...
<<<<<<< private readonly ConcurrentDictionary<DomainId, IEnrichedContentEntity?> cachedContents = new ConcurrentDictionary<DomainId, IEnrichedContentEntity?>(); private readonly ConcurrentDictionary<DomainId, IEnrichedAssetEntity?> cachedAssets = new ConcurrentDictionary<DomainId, IEnrichedAssetEntity?>...
<<<<<<< ======= using System.Text; using System.Windows; >>>>>>> using System.Text; using System.Windows; <<<<<<< public IWatch3DView BackgroundPreView { get { return dynamoView.BackgroundPreview; } } public IRenderPackageFactory RenderPackageFactory { get { ...
<<<<<<< A.CallTo(() => appPlansBillingManager.ChangePlanAsync(A<string>._, A<NamedId<DomainId>>._, A<string?>._)) ======= A.CallTo(() => appPlansBillingManager.ChangePlanAsync(A<string>._, A<NamedId<Guid>>._, A<string?>._, A<string?>._)) >>>>>>> A.CallTo(() => appPlansBillingManag...
<<<<<<< [assembly: InternalsVisibleTo("DynamoMSOfficeTests")] [assembly: InternalsVisibleTo("DynamoWebServer")] ======= [assembly: InternalsVisibleTo("DynamoMSOfficeTests")] [assembly: InternalsVisibleTo("DSCoreNodesUI")] >>>>>>> [assembly: InternalsVisibleTo("DynamoMSOfficeTests")] [assembly: InternalsVisibleTo("DS...
<<<<<<< public interface WatchHandler { bool AcceptsValue(object o); void ProcessNode(object value, WatchNode node, bool showRawData); } ======= >>>>>>> public interface WatchHandler { bool AcceptsValue(object o); void ProcessNode(object value, WatchItem node, boo...
<<<<<<< /// <summary> /// Registers the given element id with the DMU such that any change in the element will /// trigger a workspace modification event (dynamic running and saving). /// </summary> /// <param name="id">ElementId of the element to watch.</param> public void Register...
<<<<<<< static readonly JsonSerializerSettings JsonSettings; public string SessionId { get; private set; } ======= private readonly DynamoViewModel dynamoViewModel; private readonly JsonSerializerSettings jsonSettings; >>>>>>> private readonly DynamoViewModel dynamoV...
<<<<<<< private void TextBoxGotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e) { if (viewModel != null) viewModel.SearchIconAlignment = System.Windows.HorizontalAlignment.Left; } private void TextBoxLostKeyboardFocus(object sender, KeyboardFocus...
<<<<<<< var state = new TextContentState { UniqueContentId = contentId }; A.CallTo(() => inner.GetAsync(A<HashSet<DomainId>>.That.Is(contentIds))) .Returns(new Dictionary<DomainId, TextContentState>()); ======= A.CallTo(() => inner.GetAsync(A<HashSet<Guid>>.That.Is...
<<<<<<< using System.Text.RegularExpressions; using Dynamo.Models; using Dynamo.Nodes; ======= using System.Globalization; using System.Windows; using System.Windows.Media; >>>>>>> using System.Text.RegularExpressions; using Dynamo.Models; using Dynamo.Nodes; <<<<<<< ======= using Dynamo.Models; using Dyna...
<<<<<<< using System.ComponentModel.DataAnnotations; using Squidex.Infrastructure; ======= using Squidex.Infrastructure.Validation; >>>>>>> using Squidex.Infrastructure; using Squidex.Infrastructure.Validation; <<<<<<< [Required] public List<DomainId> Ids { get; set; } ======= [LocalizedRe...
<<<<<<< //int count = 0; ======= >>>>>>> //int count = 0; <<<<<<< //int count = 0; ======= >>>>>>> //int count = 0; <<<<<<< ======= public override void SetupCustomUIElements(dynNodeView nodeUI) { //add a text box to the input gri...
<<<<<<< _isSelected = value; RaisePropertyChanged(/*NXLT*/"IsSelected"); ======= isSelected = value; RaisePropertyChanged("IsSelected"); >>>>>>> isSelected = value; RaisePropertyChanged(/*NXLT*/"IsSelected"); <<<<<<< ...
<<<<<<< var graph = new GraphLayout.Graph(); foreach (var x in CurrentWorkspace.Nodes) graph.AddNode(x.GUID, x.Width, x.Height); foreach (var x in CurrentWorkspace.Connectors) graph.AddEdge(x.GUID, x.Start.Owner.GUID, x.End.Owner.GUID); ...
<<<<<<< internal int Optimizations = -1; ======= internal int TreeTrimming = -1; >>>>>>> internal int Optimizations = -1; internal int TreeTrimming = -1; <<<<<<< WasSuccessful(options.DoOptimizationSteps, this.Optimizations) && ======= ...
<<<<<<< #region Test RestOfList [Test] public void TestRestOfListEmptyInput() { DynamoModel model = ViewModel.Model; string testFilePath = Path.Combine(listTestFolder, "testRestOfList_emptyInput.dyn"); RunModel(testFilePath); Assert.Inconclusive("Add assertions"); } ======= #region Test Re...
<<<<<<< ======= using Dynamo.Interfaces; using Dynamo.Models; using Dynamo.Nodes; using Dynamo.Selection; >>>>>>> using Dynamo.Interfaces; <<<<<<< Controller = new DynamoController(new ExecutionEnvironment(), typeof (DynamoViewModel), Context.NONE, new UpdateManager.UpdateManager(), units) ...
<<<<<<< using Dynamo.Utilities; using DSCoreNodesUI.Properties; ======= >>>>>>> <<<<<<< RaisePropertyChanged(/*NXLT*/"FormulaString"); RequiresRecalc = true; EnableReporting(); if (Workspace != null) ...
<<<<<<< [Test] public void TestUnboundVariableWarning01() { // Test that there are no warnings because the unbound variable is resolved downstream string code = @" a = b; b = 1; "; Guid guid = System....
<<<<<<< public virtual void OnRequestTogglePan(object sender, EventArgs e) { if (RequestTogglePan != null) { RequestTogglePan(this, e); } } public virtual void OnRequestStopPan(object sender, EventArgs e) { if (Requ...
<<<<<<< // We need to move the ClassDetails object to the right index. classObjectBase = collection[currentClassDetailsIndex]; collection.RemoveAt(currentClassDetailsIndex); if (correctClassDetailsIndex <= collection.Count) collection.Insert(correctClassDe...
<<<<<<< public static string DYNAMO_TEST_PATH = null; const string DYNAMO_SETTINGS_FILE = /*NXLT*/"DynamoSettings.xml"; private LengthUnit _lengthUnit; private AreaUnit _areaUnit; private VolumeUnit _volumeUnit; private string _numberFormat; ======= public stati...
<<<<<<< //trigger the event to request the display //of the preset name dialogue var args = new PresetsNamePromptEventArgs(); this.Model.OnRequestPresetNamePrompt(args); //Select only Input nodes for preset var IDS = select...
<<<<<<< signCmd.Append(string.Format(" -signedjar {0}-unaligned.apk {1}", Utils.generateSafePathString(Path.Combine(bin,projectName)), Utils.generateSafePathString(Path.Combine(bin,"*unsigned.apk")))); signCmd.Append(string.Format(" {0}", project.al...
<<<<<<< public const double InitialMargin = 0; public const string ToolTipForTempVariable = /*NXLT*/"Statement Output"; ======= public const double INITIAL_MARGIN = 0; public const string TOOL_TIP_FOR_TEMP_VARIABLE = "Statement Output"; >>>>>>> public const...
<<<<<<< using Dynamo.Models; ======= using Dynamo.PackageManager.UI; >>>>>>> using Dynamo.Models; <<<<<<< public partial class dynFunction : dynBuiltinFunction ======= public class dynFunction : dynNodeWithOneOutput >>>>>>> public partial class dynFunction : dynNodeWithOneOutput <<<<<<< ...
<<<<<<< var parameters1 = new List<TypedParameter>(); parameters1.Add(new TypedParameter("x", new ProtoCore.Type { Name = "double" })); parameters1.Add(new TypedParameter("y", new ProtoCore.Type { Name = "double" })); var functionItem1 = new FunctionDescriptor(new Functio...
<<<<<<< ======= using Microsoft.Practices.Prism.ViewModel; using System.IO; using System.Xml; using DynamoUtilities; >>>>>>> using System.Xml; using DynamoUtilities;
<<<<<<< using RevitServices.Elements; using RevitServices.Persistence; using RevitServices.Transactions; using ChangeType = RevitServices.Elements.ChangeType; using CurveLoop = Autodesk.Revit.DB.CurveLoop; ======= using Length = Dynamo.Nodes.Length; >>>>>>> using RevitServices.Elements; using RevitServices.Persisten...
<<<<<<< var model = ViewModel.Model; OpenModel(@".\01 Create Point\create point_sequence.dyn"); ======= var model = dynSettings.Controller.DynamoModel; string samplePath = Path.Combine(_testPath, @".\Samples\createpoint_sequence.dyn"); string testPath = Pat...
<<<<<<< public void ShowPopup(object parameter) { controller.PopupViewmodel.UpdatePopupCommand.Execute(parameter); controller.PopupViewmodel.FadeInCommand.Execute(null); } internal bool CanShowPopup(object parameter) { return true; } ...
<<<<<<< using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.ComponentModel; using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; using System.Reflection; using System.Xml; ======= using DSCoreN...
<<<<<<< using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; using System.Text; using Dynamo.Core; using Dynamo.Utilities; using Greg.Requests; ======= using Greg.Requests; >>>>>>> using Dynamo.Core; using Greg.Requests;
<<<<<<< /// <search>filter,in,out,mask,dispatch,bool filter,boolfilter,bool filter</search> [MultiReturn(new[] { /*NXLT*/"in", /*NXLT*/"out" })] ======= /// <search>filter,in,out,mask,dispatch</search> [MultiReturn(new[] { "in", "out" })] >>>>>>> /// <search>filter,in,out,mask...
<<<<<<< dynSettings.Controller.DynamoViewModel.RequestAuthentication += RegisterSingleSignOn; ======= //Predicate<NodeModel> requiresTransactionPredicate = node => node is RevitTransactionNode; //CheckRequiresTransaction = new PredicateTraverser(requiresTransactionPredicate); ...
<<<<<<< }).AddStackExchangeRedis(Configuration.GetConnectionString("Redis"), options => { options.Configuration.ChannelPrefix = "ExilenceSignalR"; options.Configuration.ConnectTimeout = 10000; ======= o.MaximumReceiveMessageSize = 50 * 1024 * 102...
<<<<<<< protected abstract string getInputRootName(); protected virtual int getNewInputIndex() ======= public override void SetupCustomUIElements(dynNodeView nodeUI) { System.Windows.Controls.Button addButton = new dynNodeButton(); addButton.Content = "+"; ...
<<<<<<< using System.Windows.Documents; ======= using Dynamo.Controls; >>>>>>> using System.Windows.Documents; using Dynamo.Controls;
<<<<<<< public abstract partial class VariableInput ======= public abstract partial class Enum : NodeWithOneOutput { public override void SetupCustomUIElements(object ui) { var nodeUI = ui as dynNodeView; var comboBox = new ComboBox { ...
<<<<<<< using System.Runtime.Remoting.Messaging; ======= >>>>>>> <<<<<<< using Microsoft.Practices.Prism; ======= >>>>>>> using Microsoft.Practices.Prism;
<<<<<<< using System.Collections.Generic; ======= using Dynamo.Wpf.Extensions; using Dynamo.Interfaces; using Dynamo.Wpf.Views.PackageManager; >>>>>>> using System.Collections.Generic; using Dynamo.Wpf.Extensions; using Dynamo.Interfaces; using Dynamo.Wpf.Views.PackageManager;
<<<<<<< ======= using System.Collections.ObjectModel; using Dynamo.UI.Commands; using System.Windows.Data; using Dynamo.UI.Controls; using System.Windows.Media; >>>>>>> using System.Collections.ObjectModel; using Dynamo.UI.Commands; using System.Windows.Data; using Dynamo.UI.Controls; using System.Windows.Media; <<...
<<<<<<< ======= >>>>>>> <<<<<<< argumentList.Add(procNode.argInfoList[i].Name, procNode.argTypeList[i].ToString().Split('.').Last()); ======= argumentList.Add(procNode.argInfoList[i].Name, ...
<<<<<<< long amount = svEnd.ToInteger().IntegerValue; ======= int amount = (int)svEnd.ToInteger().opdata; >>>>>>> long amount = svEnd.ToInteger().IntegerValue; <<<<<<< decimal stepnum = new decimal(Math.Round(svStep.IsDouble ? svStep.Double...
<<<<<<< ======= public static NodeModel FindNodeWithDrawable(object drawable) { return GetDrawableNodesInModel() .FirstOrDefault( x => GetDrawableFromValue(new List<int>(), x.OldValue.Data as ...
<<<<<<< throw new Exception(String.Format(Properties.Resources.MalformedHeaderPackage, headerPath)); ======= throw new Exception( headerPath + " contains a package with a malformed header. Ignoring it."); >>>>>>> thr...
<<<<<<< var eid = element.InnerText; try { runElements.Add(dynRevitSettings.Doc.Document.GetElement(eid).Id); } ...
<<<<<<< node.NickName = LibraryServices.Instance.NicknameFromFunctionSignatureHint(signature); ======= var libraryServices = dynamoModel.EngineController.LibraryServices; node.NickName = libraryServices.NicknameFromFunctionSignatureHint(signature); >>>>>>> ...
<<<<<<< using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; using Dynamo.Models; using Dynamo.Nodes; using Dynamo.Nodes.Search; ======= >>>>>>> using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Serialization; using Dynamo.Mo...
<<<<<<< ======= using Dynamo.Core.Threading; >>>>>>> using Dynamo.Core.Threading;
<<<<<<< ======= public PointGeometry3D Points { get; set; } public LineGeometry3D Lines { get; set; } public LineGeometry3D LinesSelected { get; set; } public MeshGeometry3D DynamoMesh { get; set; } public MeshGeometry3D Mesh { get; set; } >>>>>>> <<<<<<< #endif ...
<<<<<<< using Dynamo.UI; using DSCoreNodesUI.Properties; ======= >>>>>>> using DSCoreNodesUI.Properties; <<<<<<< [NodeName(/*NXLT*/"Watch Image")] [NodeDescription(/*NXLT*/"WatchImageDescription", typeof(Resources))] ======= [NodeName("Watch Image")] [NodeDescription("Previews an image")] >>>>...
<<<<<<< ======= /// <summary> /// Called back from the view to enable users to setup their own view elements /// </summary> /// <param name="view"></param> internal void InitializeUI(dynamic view) { //Runtime dispatch (this as dynamic).SetupC...
<<<<<<< dynamoModel.Logger.Log(/*NXLT*/"Error in Node. Not sent for building and compiling"); ======= Log("Error in Node. Not sent for building and compiling"); >>>>>>> Log(/*NXLT*/"Error in Node. Not sent for building and compiling"); <<<<<<< string r...
<<<<<<< using Dynamo.Wpf; using Dynamo.Wpf.Properties; ======= >>>>>>> using Dynamo.Wpf; using Dynamo.Wpf.Properties;
<<<<<<< using DynCmd = Dynamo.ViewModels.DynamoViewModel; ======= using Dynamo.Core; >>>>>>> using Dynamo.Core; using DynCmd = Dynamo.ViewModels.DynamoViewModel;
<<<<<<< var searchElementVM = senderButton.DataContext as NodeSearchElementViewModel; if (searchElementVM != null) dragDropHelper.HandleMouseMove(senderButton, e.GetPosition(null)); ======= var searchElementVM = senderButton.DataContext as NodeSearchElementViewModel...
<<<<<<< using Unity.MLAgents.Inference; using Unity.MLAgents.Policies; using Unity.Barracuda; ======= using Unity.Barracuda; using MLAgents.Inference; using MLAgents.Policies; >>>>>>> using Unity.Barracuda; using Unity.MLAgents.Inference; using Unity.MLAgents.Policies;
<<<<<<< ======= protected override AssociativeNode BuildAstNode(IAstBuilder builder, List<AssociativeNode> inputs) { return builder.Build(this, inputs); } public override Value Evaluate(FSharpList<Value> args) { var keyMapper = ((Value.Function) args[0...
<<<<<<< [TestFixture] class FormulaTests : DSEvaluationViewModelUnitTest ======= public class FormulaTests : DSEvaluationUnitTest >>>>>>> class FormulaTests : DSEvaluationViewModelUnitTest
<<<<<<< [TestFixture] public class HigherOrder : DSEvaluationViewModelUnitTest ======= public class HigherOrder : DSEvaluationUnitTest >>>>>>> public class HigherOrder : DSEvaluationViewModelUnitTest
<<<<<<< using Dynamo.Search.SearchElements; using System.Collections.Generic; ======= using System.Windows.Media.Imaging; >>>>>>> using Dynamo.Search.SearchElements; using System.Collections.Generic; using System.Windows.Media.Imaging; <<<<<<< private void LibraryItem_OnMouseEnter(object sender, MouseEventA...
<<<<<<< private bool graphExecuted; public bool DynamicRunEnabled; public readonly bool VerboseLogging; ======= /// <summary> /// Before the Workspace has been built the first time, we do not respond to /// NodeModification events. /// ...
<<<<<<< public class ReferencePoint : AbstractGeometry, IGraphicItem ======= [ShortName("refPt")] public class ReferencePoint : AbstractGeometry >>>>>>> [ShortName("refPt")] public class ReferencePoint : AbstractGeometry, IGraphicItem
<<<<<<< if (DynamoController.IsTestMode) // Do not want logging in unit tests. return false; if (dynSettings.Controller != null) return dynSettings.Controller.PreferenceSettings.IsUsageReportingApproved; else re...
<<<<<<< var elementResolver = model.CurrentWorkspace.ElementResolver; cbn.SetCodeContent("Point.ByCoordinates(a<1>,a<1>,a<1>);", elementResolver); ======= cbn.SetCodeContent("Point.ByCoordinates(a<1>,a<1>,a<1>);"); var ws = ViewModel.Model.CurrentWorkspace...
<<<<<<< if (result.IsString && (result as FScheme.Value.String).Item == _failureString) ======= if (result.IsString && (result as Value.String).Item == FailureString) >>>>>>> if (result.IsString && (result as FScheme.Value.String).Item == FailureString) <<<<<<< ...
<<<<<<< public Dictionary<StackValue, StackValue> Dict; private StackValue[] Stack; ======= >>>>>>> <<<<<<< private int GetNewSize(int size) ======= // // TODO Jun: Optimize the reallocation routines // 1. Copying the temps can be optimized. // 2. ...
<<<<<<< ======= //Start heartbeat reporting Services.InstrumentationLogger.Start(); //create the view model to which the main window will bind //the DynamoModel is created therein this.DynamoViewModel = (DynamoViewModel)Activator.CreateInstance(viewModelTyp...
<<<<<<< TransactionManager = new TransactionWrapper(); TransactionManager.TransactionStarted += TransactionManager_TransactionCommitted; TransactionManager.TransactionCancelled += TransactionManager_TransactionCancelled; TransactionManager.FailuresRaised += TransactionMan...
<<<<<<< using UnitsUI.Properties; ======= using ProtoCore.Namespace; >>>>>>> using UnitsUI.Properties; using ProtoCore.Namespace;
<<<<<<< return reachClient.Send(HomeWorkspace, CustomNodesWorkspaces); ======= var result = reachClient.Send(HomeWorkspace, CustomNodeWorkspaces); >>>>>>> return reachClient.Send(HomeWorkspace, CustomNodeWorkspaces);
<<<<<<< ======= //if we are running in revit (or any context other than NONE) use the DoNotLoadOnPlatforms attribute, //if available, to discern whether we should load this type if (!dynamoModel.Context.Equals(Context.NONE)) ...
<<<<<<< using RevitGeometry = Revit.Geometry; ======= using System.Xml; >>>>>>> using RevitGeometry = Revit.Geometry; using System.Xml;
<<<<<<< using Double = System.Double; ======= using DSNodeServices; using Dynamo.Core; using Dynamo.UI; using Dynamo.Core.Threading; using Dynamo.Interfaces; using Dynamo.Nodes; using Dynamo.PackageManager; using Dynamo.Search; using Dynamo.Services; using Dynamo.UpdateManager; using Dynamo.Utilities; using Dynamo....
<<<<<<< public VariableInputNode(WorkspaceModel workspace) : base(workspace) {} ======= public virtual void SetupCustomUIElements(dynNodeView view) { VariableInputController.SetupNodeUI(view); } private BasicVariableInputNodeController VariableInputControl...
<<<<<<< switch (e.Key) ======= // ignore the key command if modifiers are present if (e.KeyboardDevice.IsKeyDown(Key.LeftCtrl) || e.KeyboardDevice.IsKeyDown(Key.RightCtrl) || e.KeyboardDevice.IsKeyDown(Key.LeftAlt) || e.KeyboardDev...
<<<<<<< using System.Windows.Threading; ======= using ICSharpCode.AvalonEdit; using ICSharpCode.AvalonEdit.Highlighting.Xshd; using System.Xml; using ICSharpCode.AvalonEdit.Highlighting; using ICSharpCode.AvalonEdit.Rendering; using ICSharpCode.AvalonEdit.Editing; >>>>>>> using System.Windows.Threading; using ICShar...
<<<<<<< ======= public class CreateAnnotationCommand : RecordableCommand { #region Public Class Methods public CreateAnnotationCommand(Guid nodeId, string annotationText, double x, double y, bool defaultPosition) { if (string.IsNull...