conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
/// <summary>
/// Whether sign in should be shown in Dynamo. In instances where Dynamo obtains
/// authentication capabilities from a host, Dynamo's sign in should generally be
/// hidden to avoid inconsistencies in state.
/// </summary>
public bool ShowLogin { get; private set; }
=======
public bool ShowRunPreview
{
get { return model.ShowRunPreview; }
set
{
model.ShowRunPreview = value;
RaisePropertyChanged("ShowRunPreview");
}
}
>>>>>>>
/// <summary>
/// Whether sign in should be shown in Dynamo. In instances where Dynamo obtains
/// authentication capabilities from a host, Dynamo's sign in should generally be
/// hidden to avoid inconsistencies in state.
/// </summary>
public bool ShowLogin { get; private set; }
public bool ShowRunPreview
{
get { return model.ShowRunPreview; }
set
{
model.ShowRunPreview = value;
RaisePropertyChanged("ShowRunPreview");
}
} |
<<<<<<<
/// <summary>
/// Indicates whether surface and solid edges will
/// be rendered.
/// </summary>
public bool ShowEdges { get; set; }
=======
/// <summary>
/// Indicates the default state of the "Open in Manual Mode"
/// checkbox in OpenFileDialog
/// </summary>
public bool OpenFileInManualExecutionMode { get; set; }
>>>>>>>
/// <summary>
/// Indicates whether surface and solid edges will
/// be rendered.
/// </summary>
public bool ShowEdges { get; set; }
/// Indicates the default state of the "Open in Manual Mode"
/// checkbox in OpenFileDialog
/// </summary>
public bool OpenFileInManualExecutionMode { get; set; }
<<<<<<<
ShowEdges = false;
=======
OpenFileInManualExecutionMode = false;
>>>>>>>
ShowEdges = false;
OpenFileInManualExecutionMode = false; |
<<<<<<<
public void ProcessExit(object sender, EventArgs e)
{
messageQueue.Shutdown();
}
=======
public void ExecuteFileFromSocket(byte[] file, string sessionId)
{
UploadFileMessage msg = new UploadFileMessage(file);
ExecuteMessageFromSocket(msg, sessionId);
}
>>>>>>>
public void ExecuteFileFromSocket(byte[] file, string sessionId)
{
UploadFileMessage msg = new UploadFileMessage(file);
ExecuteMessageFromSocket(msg, sessionId);
}
public void ProcessExit(object sender, EventArgs e)
{
messageQueue.Shutdown();
} |
<<<<<<<
using Dynamo.Utilities;
using Dynamo.Core;
=======
using Microsoft.Practices.Prism.ViewModel;
>>>>>>>
using Dynamo.Utilities;
using Dynamo.Core;
using Microsoft.Practices.Prism.ViewModel;
<<<<<<<
=======
>>>>>>> |
<<<<<<<
InPortData.Add(new PortData("colors", "A list of colors to include in the range."));
InPortData.Add(new PortData("indices", "A list of values between 0.0 and 1.0 which position the colors along the range."));
InPortData.Add(new PortData("value", "A list of values between 0 and 1. These values are used to look up the color within the range."));
OutPortData.Add(new PortData("color", "The selected color."));
=======
InPortData.Add(new PortData("start", Resources.ColorRangePortDataStartToolTip));
InPortData.Add(new PortData("end", Resources.ColorRangePortDataEndToolTip));
InPortData.Add(new PortData("value", Resources.ColorRangePortDataValueToolTip));
OutPortData.Add(new PortData("color", Resources.ColorRangePortDataResultToolTip));
>>>>>>>
InPortData.Add(new PortData("colors", Resources.ColorRangePortDataStartToolTip));
InPortData.Add(new PortData("indices", Resources.ColorRangePortDataEndToolTip));
InPortData.Add(new PortData("value", Resources.ColorRangePortDataValueToolTip));
OutPortData.Add(new PortData("color", Resources.ColorRangePortDataResultToolTip)); |
<<<<<<<
using Dynamo.UI.Commands;
using DSCoreNodesUI.Properties;
=======
using Microsoft.Practices.Prism.Commands;
>>>>>>>
using DSCoreNodesUI.Properties;
using Microsoft.Practices.Prism.Commands;
<<<<<<<
RequiresRecalc = true;
RaisePropertyChanged(/*NXLT*/"SelectionResults");
=======
OnAstUpdated();
RaisePropertyChanged("SelectionResults");
>>>>>>>
OnAstUpdated();
RaisePropertyChanged(/*NXLT*/"SelectionResults"); |
<<<<<<<
Assert.AreEqual(42, ws.Nodes.Count());
// The number of connectors is less than what we would expect
// beause several of the nodes load as un-commented dummy nodes.
Assert.AreEqual(46, ws.Connectors.Count());
=======
Assert.AreEqual(42, ws.Nodes.Count);
Assert.AreEqual(49, ws.Connectors.Count());
>>>>>>>
Assert.AreEqual(42, ws.Nodes.Count());
Assert.AreEqual(49, ws.Connectors.Count()); |
<<<<<<<
if (command.DefaultPosition == false) // Position was specified.
{
node.X = command.X;
node.Y = command.Y;
}
if ((node is Symbol || node is Output) && CurrentWorkspace is HomeWorkspace)
=======
if ((node is Symbol || node is Output) && CurrentWorkspace is HomeWorkspaceModel)
>>>>>>>
if (command.DefaultPosition == false) // Position was specified.
{
node.X = command.X;
node.Y = command.Y;
}
if ((node is Symbol || node is Output) && CurrentWorkspace is HomeWorkspaceModel) |
<<<<<<<
undoRecorder.BeginActionGroup();
var newNodeWorkspace = new CustomNodeWorkspaceModel(args.Name, args.Category, args.Description, 0, 0)
{
WatchChanges = false,
HasUnsavedChanges = true
};
var newNodeDefinition = new CustomNodeDefinition(Guid.NewGuid())
=======
using (undoRecorder.BeginActionGroup())
>>>>>>>
using (undoRecorder.BeginActionGroup())
<<<<<<<
}
#endregion
// save and load the definition from file
newNodeDefinition.SyncWithWorkspace(
dynamoModel.EngineController,
dynamoModel.CustomNodeManager,
dynamoModel.SearchModel,
dynamoModel.Logger,
true,
true);
dynamoModel.Workspaces.Add(newNodeWorkspace);
=======
>>>>>>> |
<<<<<<<
}
[HttpPut]
[Route("api/v1/product/{ProductId:int:min(1)}/flags/{FeatureId:int:min(1)}/rollout")]
public async Task<IActionResult> Rollout([FromRoute]RolloutFlagRequest rolloutFlagRequest, CancellationToken cancellationToken = default)
{
=======
}
[HttpPut]
[Route("api/v1/product/{productId:int}/flags/{featureId:int}/rollout")]
public async Task<IActionResult> Rollout([FromQuery]RolloutFlagRequest rolloutFlagRequest, CancellationToken cancellationToken = default)
{
>>>>>>>
}
[HttpPut]
[Route("api/v1/product/{productId:int:min(1)}/flags/{featureId:int:min(1)}/rollout")]
public async Task<IActionResult> Rollout([FromRoute]RolloutFlagRequest rolloutFlagRequest, CancellationToken cancellationToken = default)
{
<<<<<<<
return Ok();
}
//[HttpGet]
//[Route("api/v1/product/{id:int}/flags/{id:int}")]
//public IActionResult GetBy(int productId, int flagId)
//{
// return Ok();
//}
//[HttpGet]
//[Route("api/v1/product/{id:int}/flags")]
//public IActionResult GetBy(int productId)
//{
// return Ok();
//}
//[HttpPost]
//[Route("api/v1/product/{id:int}/flags")]
//public IActionResult Add(int productId)
//{
// return Created(string.Empty, null);
//}
//[HttpPut]
//[Route("api/v1/features")]
//public IActionResult Update()
//{
// return Ok();
//}
//[HttpDelete]
//[Route("api/v1/features/{id:int}")]
//public IActionResult Delete(int id)
//{
// return NoContent();
//}
}
}
=======
return Ok();
}
[HttpGet]
[Route("api/v1/product/{id:int}/flags/{id:int}")]
public IActionResult GetBy(DetailsFlagRequest request, CancellationToken cancellationToken = default)
{
var flag = _mediator.Send(request, cancellationToken);
return Ok(flag);
}
//[HttpGet]
//[Route("api/v1/product/{id:int}/flags")]
//public IActionResult GetBy(int productId)
//{
// return Ok();
//}
//[HttpPost]
//[Route("api/v1/product/{id:int}/flags")]
//public IActionResult Add(int productId)
//{
// return Created(string.Empty, null);
//}
//[HttpPut]
//[Route("api/v1/features")]
//public IActionResult Update()
//{
// return Ok();
//}
[HttpDelete]
[Route("api/v1/features/{id:int}")]
public async Task<IActionResult> Delete(DeleteFlagRequest request)
{
await _mediator.Send(request);
return NoContent();
}
}
}
>>>>>>>
return Ok();
}
[HttpGet]
[Route("api/v1/product/{id:int}/flags/{id:int}")]
public IActionResult GetBy(DetailsFlagRequest request, CancellationToken cancellationToken = default)
{
var flag = _mediator.Send(request, cancellationToken);
return Ok(flag);
}
[HttpDelete]
[Route("api/v1/features/{id:int}")]
public async Task<IActionResult> Delete(DeleteFlagRequest request)
{
await _mediator.Send(request);
return NoContent();
}
}
} |
<<<<<<<
var message = "'AttachmentToRowColumnConverter' expects a " +
"'ConverterParameter' value to be either 'Row' or 'Column'";
=======
var message = Wpf.Properties.Resources.MessageFailedToAttachToRowColumn;
>>>>>>>
var message = Wpf.Properties.Resources.MessageFailedToAttachToRowColumn;
<<<<<<<
if ((bool)value != true) return "(Up-to-date)";
=======
if ((bool) value != true) return Resources.AboutWindowUpToDate;
>>>>>>>
if ((bool)value != true) return Resources.AboutWindowUpToDate;
<<<<<<<
return latest != null ? latest.ToString() : "Could not get version.";
=======
return latest != null? latest.ToString() : Resources.AboutWindowCannotGetVersion;
>>>>>>>
return latest != null ? latest.ToString() : Resources.AboutWindowCannotGetVersion; |
<<<<<<<
else if (message is ClearWorkspaceMessage)
{
ClearWorkspace();
}
=======
else if (message is SaveFileMessage)
{
SaveFile(dynamo, message, sessionId);
}
else if (message is GetNodeGeometryMessage)
{
RetrieveGeometry(((GetNodeGeometryMessage)message).NodeID, sessionId);
}
>>>>>>>
else if (message is SaveFileMessage)
{
SaveFile(dynamo, message, sessionId);
}
else if (message is GetNodeGeometryMessage)
{
RetrieveGeometry(((GetNodeGeometryMessage)message).NodeID, sessionId);
}
else if (message is ClearWorkspaceMessage)
{
ClearWorkspace();
}
<<<<<<<
/// <summary>
/// Cleanup workspace
/// </summary>
private void ClearWorkspace()
{
var dynamoModel = dynamoViewModel.Model;
var customNodeManager = dynamoModel.CustomNodeManager;
var searchModel = dynamoViewModel.SearchViewModel.Model;
var nodeInfos = customNodeManager.NodeInfos;
dynamoModel.Home(null);
foreach (var guid in nodeInfos.Keys)
{
searchModel.RemoveNodeAndEmptyParentCategory(guid);
var name = nodeInfos[guid].Name;
dynamoModel.Workspaces.RemoveAll(elem =>
{
// To avoid deleting home workspace
// because of coincidence in the names
return elem != dynamoModel.HomeSpace && elem.Name == name;
});
customNodeManager.LoadedCustomNodes.Remove(guid);
}
nodeInfos.Clear();
dynamoModel.Clear(null);
}
=======
private void RetrieveGeometry(string nodeId, string sessionId)
{
Guid guid;
var nodeMap = dynamoViewModel.Model.NodeMap;
if (Guid.TryParse(nodeId, out guid) && nodeMap.ContainsKey(guid))
{
NodeModel model = nodeMap[guid];
OnResultReady(this, new ResultReadyEventArgs(new GeometryDataResponse
{
GeometryData = new GeometryData(nodeId, model.RenderPackages)
}, sessionId));
}
}
>>>>>>>
private void RetrieveGeometry(string nodeId, string sessionId)
{
Guid guid;
var nodeMap = dynamoViewModel.Model.NodeMap;
if (Guid.TryParse(nodeId, out guid) && nodeMap.ContainsKey(guid))
{
NodeModel model = nodeMap[guid];
OnResultReady(this, new ResultReadyEventArgs(new GeometryDataResponse
{
GeometryData = new GeometryData(nodeId, model.RenderPackages)
}, sessionId));
}
}
/// Cleanup workspace
/// </summary>
private void ClearWorkspace()
{
var dynamoModel = dynamoViewModel.Model;
var customNodeManager = dynamoModel.CustomNodeManager;
var searchModel = dynamoViewModel.SearchViewModel.Model;
var nodeInfos = customNodeManager.NodeInfos;
dynamoModel.Home(null);
foreach (var guid in nodeInfos.Keys)
{
searchModel.RemoveNodeAndEmptyParentCategory(guid);
var name = nodeInfos[guid].Name;
dynamoModel.Workspaces.RemoveAll(elem =>
{
// To avoid deleting home workspace
// because of coincidence in the names
return elem != dynamoModel.HomeSpace && elem.Name == name;
});
customNodeManager.LoadedCustomNodes.Remove(guid);
}
nodeInfos.Clear();
dynamoModel.Clear(null);
} |
<<<<<<<
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.com/youtrack/issue/MAGN-57
RunCommandsFromFile("Defect_MAGN_57.xml");
<<<<<<<
RunCommandsFromFile("Defect_MAGN_190.xml");
=======
// Details are available in defect http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-190
RunCommandsFromFile("Defect_MAGN_190.xml", true);
>>>>>>>
// Details are available in defect http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-190
RunCommandsFromFile("Defect_MAGN_190.xml");
<<<<<<<
RunCommandsFromFile("Defect_MAGN_429.xml");
=======
// Details are available in defect http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-429
RunCommandsFromFile("Defect_MAGN_429.xml", true);
>>>>>>>
// Details are available in defect http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-429
RunCommandsFromFile("Defect_MAGN_429.xml");
<<<<<<<
RunCommandsFromFile("Defect_MAGN_478.xml");
=======
// Details are available in defect http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-478
RunCommandsFromFile("Defect_MAGN_478.xml", true);
>>>>>>>
// Details are available in defect http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-478
RunCommandsFromFile("Defect_MAGN_478.xml"); |
<<<<<<<
=======
try
{
zipPath = Greg.Utility.FileUtilities.Zip(rootDir.FullName);
info = new FileInfo(zipPath);
}
catch
{
// give nicer error
throw new Exception("Could not compress file. Is the file in use?");
}
if (info.Length > 15 * 1000000) throw new Exception("The package is too large! The package must be less than 15 MB!");
>>>>>>>
try
{
zipPath = Greg.Utility.FileUtilities.Zip(rootDir.FullName);
info = new FileInfo(zipPath);
}
catch
{
// give nicer error
throw new Exception("Could not compress file. Is the file in use?");
}
if (info.Length > 15 * 1000000) throw new Exception("The package is too large! The package must be less than 15 MB!");
<<<<<<<
else if (file.EndsWith("dll") || file.EndsWith("exe"))
=======
else if (file.ToLower().EndsWith(".dll") || IsXmlDocFile(file, files)
|| IsDynamoCustomizationFile(file, files))
>>>>>>>
else if (file.ToLower().EndsWith(".dll") || IsXmlDocFile(file, files)
|| IsDynamoCustomizationFile(file, files)) |
<<<<<<<
=======
private Timer backupFilesTimer;
>>>>>>>
private Timer backupFilesTimer; |
<<<<<<<
//var env = new ExecutionEnvironment();
Controller = new DynamoController(typeof(DynamoViewModel), "None", null, updateManager, new DefaultWatchHandler(), new PreferenceSettings())
{
Testing = true
};
=======
var env = new ExecutionEnvironment();
Controller = new DynamoController(env, typeof(DynamoViewModel), "None", null, updateManager, new UnitsManager(), new DefaultWatchHandler(), new PreferenceSettings());
DynamoController.IsTestMode = true;
>>>>>>>
//var env = new ExecutionEnvironment();
Controller = new DynamoController(typeof(DynamoViewModel), "None", null, updateManager, new DefaultWatchHandler(), new PreferenceSettings());
DynamoController.IsTestMode = true; |
<<<<<<<
//return FScheme.Value.NewList(Utils.SequenceToFSharpList(data));
{
FSharpList<FScheme.Value> result = FSharpList<FScheme.Value>.Empty;
//data.reverse(); // this breaks under certain circumstances
List<dynamic> reversal_list = new List<dynamic>();
foreach (var x in data)
{
reversal_list.Add(x);
}
for (int i = reversal_list.Count - 1; i >= 0; --i)
{
var x = reversal_list[i];
result = FSharpList<FScheme.Value>.Cons(convertToValue(x), result);
}
//foreach (var x in data)
//{
// result = FSharpList<FScheme.Value>.Cons(convertToValue(x), result);
//}
return FScheme.Value.NewList(result);
}
=======
return FScheme.Value.NewList(Utils.SequenceToFSharpList(data));
>>>>>>>
{
FSharpList<FScheme.Value> result = FSharpList<FScheme.Value>.Empty;
//data.reverse(); // this breaks under certain circumstances
List<dynamic> reversal_list = new List<dynamic>();
foreach (var x in data)
{
reversal_list.Add(x);
}
for (int i = reversal_list.Count - 1; i >= 0; --i)
{
var x = reversal_list[i];
result = FSharpList<FScheme.Value>.Cons(convertToValue(x), result);
}
//foreach (var x in data)
//{
// result = FSharpList<FScheme.Value>.Cons(convertToValue(x), result);
//}
return FScheme.Value.NewList(result);
} |
<<<<<<<
// Populating each class entry vtables with their respective
// member variables signatures
globalClassIndex = core.ClassTable.GetClassId(classDecl.className);
=======
// Populating each class entry vtables with their respective member variables signatures
globalClassIndex = core.ClassTable.GetClassId(classDecl.ClassName);
>>>>>>>
// Populating each class entry vtables with their respective
// member variables signatures
globalClassIndex = core.ClassTable.GetClassId(classDecl.ClassName); |
<<<<<<<
=======
/// <summary>
/// The maximum number of recent file paths to be saved.
/// </summary>
>>>>>>>
/// <summary>
/// The maximum number of recent file paths to be saved.
/// </summary>
<<<<<<<
=======
public LengthUnit LengthUnit
{
get { return lengthUnit; }
set
{
lengthUnit = value;
RaisePropertyChanged("LengthUnit");
}
}
public AreaUnit AreaUnit
{
get { return areaUnit; }
set
{
areaUnit = value;
RaisePropertyChanged("AreaUnit");
}
}
public VolumeUnit VolumeUnit
{
get { return volumeUnit; }
set
{
volumeUnit = value;
RaisePropertyChanged("VolumeUnit");
}
}
/// <summary>
/// The last X coordinate of the Dynamo window.
/// </summary>
>>>>>>>
/// <summary>
/// The last X coordinate of the Dynamo window.
/// </summary> |
<<<<<<<
[NodeDescription("ListMapDescription", typeof(Resources))]
[NodeSearchTags("ListMapSearchTags",typeof(Resources))]
=======
[NodeDescription("ListMapDescription", typeof(DSCoreNodesUI.Properties.Resources))]
>>>>>>>
[NodeDescription("ListMapDescription", typeof(DSCoreNodesUI.Properties.Resources))]
[NodeSearchTags("ListMapSearchTags",typeof(DSCoreNodesUI.Properties.Resources))]
<<<<<<<
[NodeDescription("ListCombineDescription", typeof(Resources))]
[NodeSearchTags("ListCombineSearchTags", typeof(Resources))]
=======
[NodeDescription("ListCombineDescription", typeof(DSCoreNodesUI.Properties.Resources))]
>>>>>>>
[NodeDescription("ListCombineDescription", typeof(DSCoreNodesUI.Properties.Resources))]
[NodeSearchTags("ListCombineSearchTags", typeof(DSCoreNodesUI.Properties.Resources))]
<<<<<<<
[NodeDescription("ListForEachDescription", typeof(Resources))]
[NodeSearchTags("ListForEachSearchTags", typeof(Resources))]
=======
[NodeDescription("ListForEachDescription", typeof(DSCoreNodesUI.Properties.Resources))]
>>>>>>>
[NodeDescription("ListForEachDescription", typeof(DSCoreNodesUI.Properties.Resources))]
[NodeSearchTags("ListForEachSearchTags", typeof(DSCoreNodesUI.Properties.Resources))]
<<<<<<<
[NodeDescription("ListLaceShortestDescription", typeof(Resources))]
[NodeSearchTags("ListLaceShortestSearchTags", typeof(Resources))]
=======
[NodeDescription("ListLaceShortestDescription", typeof(DSCoreNodesUI.Properties.Resources))]
>>>>>>>
[NodeDescription("ListLaceShortestDescription", typeof(DSCoreNodesUI.Properties.Resources))]
[NodeSearchTags("ListLaceShortestSearchTags", typeof(DSCoreNodesUI.Properties.Resources))]
<<<<<<<
[NodeDescription("ListLaceLongestDescription", typeof(Resources))]
[NodeSearchTags("ListLaceLongestSearchTags", typeof(Resources))]
=======
[NodeDescription("ListLaceLongestDescription", typeof(DSCoreNodesUI.Properties.Resources))]
>>>>>>>
[NodeDescription("ListLaceLongestDescription", typeof(DSCoreNodesUI.Properties.Resources))]
[NodeSearchTags("ListLaceLongestSearchTags", typeof(DSCoreNodesUI.Properties.Resources))]
<<<<<<<
[NodeDescription("ListCartesianProductDescription", typeof(Resources))]
[NodeSearchTags("ListCartesianProductSearchTags", typeof(Resources))]
=======
[NodeDescription("ListCartesianProductDescription", typeof(DSCoreNodesUI.Properties.Resources))]
>>>>>>>
[NodeSearchTags("ListCartesianProductSearchTags", typeof(DSCoreNodesUI.Properties.Resources))]
[NodeDescription("ListCartesianProductDescription", typeof(DSCoreNodesUI.Properties.Resources))]
<<<<<<<
[NodeDescription("ListReduceDescription", typeof(Resources))]
[NodeSearchTags("ListReduceSearchTags", typeof(Resources))]
=======
[NodeDescription("ListReduceDescription", typeof(DSCoreNodesUI.Properties.Resources))]
>>>>>>>
[NodeSearchTags("ListReduceSearchTags", typeof(DSCoreNodesUI.Properties.Resources))]
[NodeDescription("ListReduceDescription", typeof(DSCoreNodesUI.Properties.Resources))]
<<<<<<<
[NodeDescription("ListScanDescription", typeof(Resources))]
[NodeSearchTags("ListScanSearchTags", typeof(Resources))]
=======
[NodeDescription("ListScanDescription", typeof(DSCoreNodesUI.Properties.Resources))]
>>>>>>>
[NodeDescription("ListScanDescription", typeof(Resources))]
[NodeDescription("ListScanDescription", typeof(DSCoreNodesUI.Properties.Resources))]
[NodeSearchTags("ListScanSearchTags", typeof(DSCoreNodesUI.Properties.Resources))]
<<<<<<<
[NodeDescription("ListFilterDescription", typeof(Resources))]
[NodeSearchTags("ListFilterSearchTags", typeof(Resources))]
=======
[NodeDescription("ListFilterDescription", typeof(DSCoreNodesUI.Properties.Resources))]
>>>>>>>
[NodeDescription("ListFilterDescription", typeof(DSCoreNodesUI.Properties.Resources))]
[NodeSearchTags("ListFilterSearchTags", typeof(DSCoreNodesUI.Properties.Resources))]
<<<<<<<
[NodeDescription("ReplaceByConditionDescription", typeof(Resources))]
[NodeSearchTags("ReplaceByConditionSearchTags", typeof(Resources))]
=======
[NodeDescription("ReplaceByConditionDescription", typeof(DSCoreNodesUI.Properties.Resources))]
>>>>>>>
[NodeDescription("ReplaceByConditionDescription", typeof(DSCoreNodesUI.Properties.Resources))]
[NodeSearchTags("ReplaceByConditionSearchTags", typeof(DSCoreNodesUI.Properties.Resources))] |
<<<<<<<
runtimeCore.RuntimeStatus.LogWarning(WarningID.kDereferencingNonPointer,
Resources.kDeferencingNonPointer);
=======
core.RuntimeStatus.LogWarning(WarningID.kDereferencingNonPointer,
StringConstants.kDeferencingNonPointer);
>>>>>>>
core.RuntimeStatus.LogWarning(WarningID.kDereferencingNonPointer,
Resources.kDeferencingNonPointer); |
<<<<<<<
public PackageLoader PackageLoader { get; private set; }
=======
internal PackageLoader PackageLoader
{
get { return packageLoader; }
}
>>>>>>>
internal PackageLoader PackageLoader { get; private set; }
<<<<<<<
PackageLoader.MessageLogged -= OnMessageLogged;
PackageLoader.Dispose();
=======
packageLoader.MessageLogged -= OnMessageLogged;
packageLoader.RequestLoadNodeLibrary -= OnRequestLoadNodeLibrary;
>>>>>>>
PackageLoader.MessageLogged -= OnMessageLogged;
PackageLoader.Dispose();
<<<<<<<
PackageLoader = new PackageLoader(startupParams.PathManager.PackagesDirectory);
PackageLoader.MessageLogged += OnMessageLogged;
PackageLoader.RequestLoadNodeLibrary += startupParams.DynamoModel.LoadNodeLibraryFromAssembly;
PackageLoader.RequestLoadCustomNodeDirectory +=
(dir) => startupParams.DynamoModel.CustomNodeManager
=======
packageLoader = new PackageLoader(startupParams.PathManager.PackagesDirectories);
packageLoader.MessageLogged += OnMessageLogged;
packageLoader.RequestLoadNodeLibrary += OnRequestLoadNodeLibrary;
packageLoader.RequestLoadCustomNodeDirectory +=
(dir) => startupParams.CustomNodeManager
>>>>>>>
PackageLoader = new PackageLoader(startupParams.PathManager.PackagesDirectories);
PackageLoader.MessageLogged += OnMessageLogged;
PackageLoader.RequestLoadNodeLibrary += startupParams.DynamoModel.LoadNodeLibraryFromAssembly;
PackageLoader.RequestLoadCustomNodeDirectory +=
(dir) => startupParams.DynamoModel.CustomNodeManager
<<<<<<<
PackageManagerClient = new PackageManagerClient(new GregClient(startupParams.AuthProvider, url),
uploadBuilder, PackageLoader.RootPackagesDirectory);
=======
packageManagerClient = new PackageManagerClient(
new GregClient(startupParams.AuthProvider, url),
uploadBuilder, packageLoader.DefaultPackagesDirectory);
>>>>>>>
PackageManagerClient = new PackageManagerClient(
new GregClient(startupParams.AuthProvider, url),
uploadBuilder, PackageLoader.DefaultPackagesDirectory); |
<<<<<<<
var c = new ConnectorViewModel(_port);
dynSettings.Controller.DynamoViewModel.CurrentSpaceViewModel.ActiveConnector = c;
dynSettings.Controller.DynamoViewModel.CurrentSpaceViewModel.IsConnecting = true;
=======
if (_port.PortType != PortType.INPUT)
{
var c = new ConnectorViewModel(_port);
workspaceViewModel.ActiveConnector = c;
workspaceViewModel.IsConnecting = true;
}
>>>>>>>
var c = new ConnectorViewModel(_port);
dynSettings.Controller.DynamoViewModel.CurrentSpaceViewModel.ActiveConnector = c;
dynSettings.Controller.DynamoViewModel.CurrentSpaceViewModel.IsConnecting = true;
<<<<<<<
ConnectorModel newConnectorModel;
if (_port.PortType == PortType.INPUT)
newConnectorModel = ConnectorModel.Make(start.Owner, end.Owner, start.Index, end.Index, 0);
else
{
newConnectorModel = ConnectorModel.Make(end.Owner, start.Owner, end.Index, start.Index, 0);
//newConnectorModel.
}
=======
var newConnectorModel = ConnectorModel.Make(start.Owner,
end.Owner, start.Index, end.Index, 0);
>>>>>>>
ConnectorModel newConnectorModel;
if (_port.PortType == PortType.INPUT)
newConnectorModel = ConnectorModel.Make(start.Owner, end.Owner, start.Index, end.Index, 0);
else
{
newConnectorModel = ConnectorModel.Make(end.Owner, start.Owner, end.Index, start.Index, 0);
} |
<<<<<<<
#region Icon Resources Strings
public const string SmallIconPostfix = ".Small";
public const string LargeIconPostfix = ".Large";
public const string ResourcesDLL = ".resources.dll";
#endregion
#region Class button
public const int MaxLengthClassButtonTitle = 22;
public const int MaxLengthRowClassButtonTitle = 8; // How many characters can be in one row.
public const string TwoDots = "..";
#endregion
#region LibraryView
public const double MinWidthLibraryView = 308;
public const string TopResult = "Top Result";
public const string CategoryGroupCreate = "Create";
public const string CategoryGroupAction = "Actions";
public const string CategoryGroupQuery = "Query";
public const char CategoryDelimiter = '.';
public const char ShortenedCategoryDelimiter = '>';
#endregion
#if DEBUG
public const string UpdateDownloadLocation = "http://dyn-builds-dev.s3.amazonaws.com/";
public const string UpdateSignatureLocation = "http://dyn-builds-dev-sig.s3.amazonaws.com/";
#else
public const string UpdateDownloadLocation = "http://dyn-builds-data.s3.amazonaws.com/";
public const string UpdateSignatureLocation = "http://dyn-builds-data-sig.s3.amazonaws.com/";
#endif
=======
>>>>>>>
#region Icon Resources Strings
public const string SmallIconPostfix = ".Small";
public const string LargeIconPostfix = ".Large";
public const string ResourcesDLL = ".resources.dll";
#endregion
#region Class button
public const int MaxLengthClassButtonTitle = 22;
public const int MaxLengthRowClassButtonTitle = 8; // How many characters can be in one row.
public const string TwoDots = "..";
#endregion
#region LibraryView
public const double MinWidthLibraryView = 308;
public const string TopResult = "Top Result";
public const string CategoryGroupCreate = "Create";
public const string CategoryGroupAction = "Actions";
public const string CategoryGroupQuery = "Query";
public const char CategoryDelimiter = '.';
public const char ShortenedCategoryDelimiter = '>';
#endregion
#if DEBUG
public const string UpdateDownloadLocation = "http://dyn-builds-dev.s3.amazonaws.com/";
public const string UpdateSignatureLocation = "http://dyn-builds-dev-sig.s3.amazonaws.com/";
#else
public const string UpdateDownloadLocation = "http://dyn-builds-data.s3.amazonaws.com/";
public const string UpdateSignatureLocation = "http://dyn-builds-data-sig.s3.amazonaws.com/";
#endif |
<<<<<<<
using ICSharpCode.AvalonEdit.Rendering;
using ProtoCore.Mirror;
=======
>>>>>>>
using ProtoCore.Mirror;
<<<<<<<
private ICompletionData[] GetCompletionData(string code, string stringToComplete, Guid codeBlockGuid)
{
var completions = new List<CodeBlockCompletionData>();
var engineController = this.dynamoViewModel.Model.EngineController;
// Determine if the string to be completed is a class
var type = engineController.GetStaticType(stringToComplete);
if (type == null)
{
// Check if the string to be completed is a declared variable
string typeName = CodeCompletionParser.GetVariableType(code, stringToComplete);
if (typeName != null)
type = engineController.GetStaticType(typeName);
}
if (type != null)
{
var members = type.GetMembers();
completions = members.Select<StaticMirror, CodeBlockCompletionData>(
x => CodeBlockCompletionData.ConvertMirrorToCompletionData(x, this)).ToList();
}
return completions.ToArray();
}
internal string GetDescription()
{
return "";
}
public static HighlightingRule CreateDigitRule()
{
var digitRule = new HighlightingRule();
Color color = (Color)ColorConverter.ConvertFromString("#2585E5");
digitRule.Color = new HighlightingColor()
{
Foreground = new CustomizedBrush(color)
};
// These Regex's must match with the grammars in the DS ATG for digits
// Refer to the 'number' and 'float' tokens in Start.atg
//*******************************************************************************
// number = digit {digit} .
// float = digit {digit} '.' digit {digit} [('E' | 'e') ['+'|'-'] digit {digit}].
//*******************************************************************************
string digit = @"(-?\b\d+)";
string floatingPoint = @"(\.[0-9]+)";
string numberWithOptionalDecimal = digit + floatingPoint + "?";
string exponent = @"([eE][+-]?[0-9]+)";
string numberWithExponent = digit + floatingPoint + exponent;
digitRule.Regex = new Regex(numberWithExponent + "|" + numberWithOptionalDecimal);
return digitRule;
}
=======
>>>>>>>
private ICompletionData[] GetCompletionData(string code, string stringToComplete, Guid codeBlockGuid)
{
var completions = new List<CodeBlockCompletionData>();
var engineController = this.dynamoViewModel.Model.EngineController;
// Determine if the string to be completed is a class
var type = engineController.GetStaticType(stringToComplete);
if (type == null)
{
// Check if the string to be completed is a declared variable
string typeName = CodeCompletionParser.GetVariableType(code, stringToComplete);
if (typeName != null)
type = engineController.GetStaticType(typeName);
}
if (type != null)
{
var members = type.GetMembers();
completions = members.Select<StaticMirror, CodeBlockCompletionData>(
x => CodeBlockCompletionData.ConvertMirrorToCompletionData(x, this)).ToList();
}
return completions.ToArray();
}
internal string GetDescription()
{
return "";
} |
<<<<<<<
using RuntimeWarning = ProtoCore.Runtime.WarningEntry;
=======
using RuntimeWarning = ProtoCore.RuntimeData.WarningEntry;
using ProtoCore.Utils;
>>>>>>>
using RuntimeWarning = ProtoCore.Runtime.WarningEntry;
using ProtoCore.Utils; |
<<<<<<<
//private bool _isCustomFunction = false;
=======
>>>>>>>
<<<<<<<
catch(CancelEvaluationException ex)
=======
catch (CancelEvaluationException)
>>>>>>> |
<<<<<<<
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.7.2.*")]
[assembly: InternalsVisibleTo("DynamoCoreWpf")]
=======
[assembly: ThemeInfo(
ResourceDictionaryLocation.ExternalAssembly, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]
>>>>>>>
[assembly: InternalsVisibleTo("DynamoCoreWpf")] |
<<<<<<<
//string newNodeName ="", newNodeCategory ="";
var args = new FunctionNamePromptEventArgs();
dynSettings.Controller.DynamoModel.OnRequestsFunctionNamePrompt(null, args);
//if (!dynSettings.Controller.DynamoViewModel.ShowNewFunctionDialog(ref newNodeName, ref newNodeCategory))
if(!args.Success)
=======
string newNodeName = "", newNodeCategory = "", newNodeDescription = "A collapsed node";
if (!dynSettings.Controller.DynamoViewModel.ShowNewFunctionDialog(ref newNodeName, ref newNodeCategory, ref newNodeDescription))
>>>>>>>
//string newNodeName ="", newNodeCategory ="";
var args = new FunctionNamePromptEventArgs();
dynSettings.Controller.DynamoModel.OnRequestsFunctionNamePrompt(null, args);
//if (!dynSettings.Controller.DynamoViewModel.ShowNewFunctionDialog(ref newNodeName, ref newNodeCategory))
if(!args.Success)
<<<<<<<
var newNodeWorkspace = new FuncWorkspace(args.Name, args.Category, 0, 0)
=======
var newNodeWorkspace = new FuncWorkspace(newNodeName, newNodeCategory, newNodeDescription, 0, 0)
>>>>>>>
var newNodeWorkspace = new FuncWorkspace(args.Name, args.Category, 0, 0)
<<<<<<<
collapsedNode.NickName = args.Name;
=======
collapsedNode.NickName = newNodeName;
>>>>>>>
collapsedNode.NickName = args.Name;
<<<<<<<
dynSettings.Controller.CustomNodeLoader.SetNodeInfo(args.Name, args.Category, newNodeDefinition.FunctionId, "");
=======
var customNodeInfo = new CustomNodeInfo(newNodeDefinition.FunctionId, newNodeName, newNodeCategory, "", "");
dynSettings.Controller.CustomNodeManager.SetNodeInfo(customNodeInfo);
>>>>>>>
var customNodeInfo = new CustomNodeInfo(newNodeDefinition.FunctionId, args.Name, args.Category, "", "");
dynSettings.Controller.CustomNodeManager.SetNodeInfo(customNodeInfo);
<<<<<<<
dynSettings.Controller.CustomNodeLoader.SetNodePath(newNodeDefinition.FunctionId, path);
dynSettings.Controller.SearchViewModel.Add(args.Name, args.Category, newNodeDefinition.FunctionId);
=======
dynSettings.Controller.CustomNodeManager.SetNodePath(newNodeDefinition.FunctionId, path);
dynSettings.Controller.SearchViewModel.Add(newNodeName, newNodeCategory, "No description provided", newNodeDefinition.FunctionId);
>>>>>>>
dynSettings.Controller.CustomNodeManager.SetNodePath(newNodeDefinition.FunctionId, path);
dynSettings.Controller.SearchViewModel.Add(args.Name, args.Category, "No description provided", newNodeDefinition.FunctionId); |
<<<<<<<
/// <summary>
/// </summary>
/// <param name="workspaceGuid">Guid of the target workspace. Guid.Empty means current workspace</param>
/// <param name="modelGuid">Guid of node model</param>
/// <param name="name"></param>
/// <param name="value"></param>
public UpdateModelValueCommand(Guid workspaceGuid, Guid modelGuid, string name, string value)
: this(workspaceGuid, new[] {modelGuid}, name, value)
=======
[JsonConstructor]
public UpdateModelValueCommand(string modelGuid, string name, string value)
: base(modelGuid)
>>>>>>>
/// <summary>
/// </summary>
/// <param name="workspaceGuid">Guid of the target workspace. Guid.Empty means current workspace</param>
/// <param name="modelGuid">Guid of node model</param>
/// <param name="name"></param>
/// <param name="value"></param>
public UpdateModelValueCommand(Guid workspaceGuid, Guid modelGuid, string name, string value)
: this(workspaceGuid, new[] {modelGuid}, name, value) { }
[JsonConstructor]
public UpdateModelValueCommand(string modelGuid, string name, string value)
: base(modelGuid)
<<<<<<<
public SwitchTabCommand(int modelIndex)
=======
[JsonConstructor]
public SwitchTabCommand(int tabIndex)
>>>>>>>
[JsonConstructor]
public SwitchTabCommand(int modelIndex)
<<<<<<<
internal int WorkspaceModelIndex { get; private set; }
=======
[DataMember]
internal int TabIndex { get; private set; }
>>>>>>>
[DataMember]
internal int WorkspaceModelIndex { get; private set; } |
<<<<<<<
public List<ICustomNodeWorkspaceModel> CustomNodesWorkspaces
=======
public List<CustomNodeWorkspaceModel> CustomNodeWorkspaces
>>>>>>>
public List<ICustomNodeWorkspaceModel> CustomNodeWorkspaces
<<<<<<<
CustomNodesWorkspaces = new List<ICustomNodeWorkspaceModel>();
=======
CustomNodeWorkspaces = new List<CustomNodeWorkspaceModel>();
>>>>>>>
CustomNodeWorkspaces = new List<ICustomNodeWorkspaceModel>();
<<<<<<<
var result = reachClient.Send(HomeWorkspace, CustomNodesWorkspaces.OfType<CustomNodeWorkspaceModel>());
=======
var result = reachClient.Send(HomeWorkspace, CustomNodeWorkspaces);
>>>>>>>
var result = reachClient.Send(HomeWorkspace, CustomNodeWorkspaces.OfType<CustomNodeWorkspaceModel>()); |
<<<<<<<
services.AddMvc(options => options.EnableEndpointRouting = false)
.AddNewtonsoftJson();
// In production, the React files will be served from this directory
services.AddSpaStaticFiles(configuration =>
{
configuration.RootPath = "ClientApp/dist";
});
=======
EsquioUIApiConfiguration.ConfigureServices(services)
.AddDbContext<StoreDbContext>(options =>
{
options.UseSqlServer("");
})
.AddSpaStaticFiles(configuration =>
{
configuration.RootPath = "ClientApp/build";
});
>>>>>>>
EsquioUIApiConfiguration.ConfigureServices(services)
.AddDbContext<StoreDbContext>(options =>
{
options.UseSqlServer("");
})
.AddSpaStaticFiles(configuration =>
{
configuration.RootPath = "ClientApp/dist";
});
<<<<<<<
if (env.IsDevelopment())
{
spa.UseProxyToSpaDevelopmentServer("http://localhost:8080");
}
=======
return host;
>>>>>>>
return host; |
<<<<<<<
DocumentManager.CurrentDoc = dynRevitSettings.Doc.Document;
if (!DynamoViewModel.RunInDebug)
{
//Do we need manual transaction control?
bool manualTrans = topElements.Any(CheckManualTransaction.TraverseUntilAny);
=======
DocumentManager.GetInstance().CurrentDBDocument = dynRevitSettings.Doc.Document;
>>>>>>>
DocumentManager.GetInstance().CurrentDBDocument = dynRevitSettings.Doc.Document;
if (!DynamoViewModel.RunInDebug)
{
//Do we need manual transaction control?
bool manualTrans = topElements.Any(CheckManualTransaction.TraverseUntilAny); |
<<<<<<<
private readonly string rootPkgDir;
private readonly CustomNodeManager customNodeManager;
=======
[Obsolete]
internal readonly static string PackageContainsBinariesConstant = "|ContainsBinaries(5C698212-A139-4DDD-8657-1BF892C79821)";
[Obsolete]
internal readonly static string PackageContainsPythonScriptsConstant = "|ContainsPythonScripts(58B25C0B-CBBE-4DDC-AC39-ECBEB8B55B10)";
private readonly DynamoModel dynamoModel;
>>>>>>>
private readonly string rootPkgDir;
private readonly CustomNodeManager customNodeManager;
[Obsolete]
internal readonly static string PackageContainsBinariesConstant = "|ContainsBinaries(5C698212-A139-4DDD-8657-1BF892C79821)";
[Obsolete]
internal readonly static string PackageContainsPythonScriptsConstant = "|ContainsPythonScripts(58B25C0B-CBBE-4DDC-AC39-ECBEB8B55B10)";
<<<<<<<
public PackageManagerClient(string rootPkgDir, CustomNodeManager customNodeManager)
=======
private static readonly string serverUrl = "https://www.dynamopackages.com/";
public PackageManagerClient(DynamoModel dynamoModel)
>>>>>>>
private static readonly string serverUrl = "https://www.dynamopackages.com/";
public PackageManagerClient(string rootPkgDir, CustomNodeManager customNodeManager)
<<<<<<<
var pkg = PackageUploadBuilder.NewPackageVersion(rootPkgDir, customNodeManager, l, files, packageUploadHandle);
=======
var pkg = PackageUploadBuilder.NewPackageVersion(this.dynamoModel, l, files, packageUploadHandle);
>>>>>>>
var pkg = PackageUploadBuilder.NewPackageVersion(rootPkgDir, customNodeManager, l, files, packageUploadHandle); |
<<<<<<<
/// <summary>
/// Determine if undo operation is currently possible.
/// </summary>
public bool CanUndo
{
get { return ((null == undoRecorder) ? false : undoRecorder.CanUndo); }
}
/// <summary>
/// Determine if redo operation is currently possible.
/// </summary>
public bool CanRedo
{
get { return ((null == undoRecorder) ? false : undoRecorder.CanRedo); }
}
=======
internal Version WorkspaceVersion { get; set; }
>>>>>>>
/// <summary>
/// Determine if undo operation is currently possible.
/// </summary>
public bool CanUndo
{
get { return ((null == undoRecorder) ? false : undoRecorder.CanUndo); }
}
/// <summary>
/// Determine if redo operation is currently possible.
/// </summary>
public bool CanRedo
{
get { return ((null == undoRecorder) ? false : undoRecorder.CanRedo); }
}
internal Version WorkspaceVersion { get; set; }
<<<<<<<
undoRecorder = new UndoRedoRecorder(this);
=======
WorkspaceVersion = AssemblyHelper.GetDynamoVersion();
>>>>>>>
WorkspaceVersion = AssemblyHelper.GetDynamoVersion();
undoRecorder = new UndoRedoRecorder(this); |
<<<<<<<
{
throw new Exception(/*NXLT*/"The header is missing a name or version field.");
}
=======
throw new Exception("The header is missing a name or version field.");
>>>>>>>
throw new Exception(/*NXLT*/"The header is missing a name or version field.");
<<<<<<<
logger.Log(/*NXLT*/"Exception when attempting to load package " + this.Name + /*NXLT*/" from " + this.RootDirectory);
logger.Log(e.GetType() + ": " + e.Message);
=======
Log("Exception when attempting to load package " + Name + " from " + RootDirectory);
Log(e.GetType() + ": " + e.Message);
>>>>>>>
Log(/*NXLT*/"Exception when attempting to load package " + Name + /*NXLT*/" from " + RootDirectory);
Log(e.GetType() + ": " + e.Message);
<<<<<<<
.Where(x => !x.ToLower().EndsWith(".dyf") && !x.ToLower().EndsWith(/*NXLT*/".dll") && !x.ToLower().EndsWith(/*NXLT*/"pkg.json") && !x.ToLower().EndsWith(/*NXLT*/".backup"))
.Select(x => new PackageFileInfo(this.RootDirectory, x));
=======
.Where(x => !x.ToLower().EndsWith(".dyf") && !x.ToLower().EndsWith(".dll") && !x.ToLower().EndsWith("pkg.json") && !x.ToLower().EndsWith(".backup"))
.Select(x => new PackageFileInfo(RootDirectory, x));
>>>>>>>
.Where(x => !x.ToLower().EndsWith(/*NXLT*/".dyf") && !x.ToLower().EndsWith(/*NXLT*/".dll") && !x.ToLower().EndsWith(/*NXLT*/"pkg.json") && !x.ToLower().EndsWith(/*NXLT*/".backup"))
.Select(x => new PackageFileInfo(RootDirectory, x));
<<<<<<<
return Directory.EnumerateFiles(
RootDirectory,
/*NXLT*/"*.dll",
SearchOption.AllDirectories);
=======
return Directory.EnumerateFiles(RootDirectory, "*.dll", SearchOption.AllDirectories);
>>>>>>>
return Directory.EnumerateFiles(RootDirectory, /*NXLT*/"*.dll", SearchOption.AllDirectories);
<<<<<<<
logger.Log(/*NXLT*/"Exception when attempting to uninstall the package " + this.Name + /*NXLT*/" from " + this.RootDirectory);
logger.Log(e.GetType() + ": " + e.Message);
throw e;
=======
Log("Exception when attempting to uninstall the package " + Name + " from " + RootDirectory);
Log(e.GetType() + ": " + e.Message);
throw;
>>>>>>>
Log(/*NXLT*/"Exception when attempting to uninstall the package " + Name + /*NXLT*/" from " + RootDirectory);
Log(e.GetType() + ": " + e.Message);
throw; |
<<<<<<<
=======
/// <summary>
/// Event that is fired when a workspace requests that a Node or Note model is
/// centered.
/// </summary>
>>>>>>>
/// <summary>
/// Event that is fired when a workspace requests that a Node or Note model is
/// centered.
/// </summary>
<<<<<<<
public event Action OnModified;
public event WorkspaceSavedEvent WorkspaceSaved;
#endregion
=======
/// <summary>
/// Event that is fired when the workspace is saved.
/// </summary>
public event Action WorkspaceSaved;
protected virtual void OnWorkspaceSaved()
{
LastSaved = DateTime.Now;
HasUnsavedChanges = false;
>>>>>>>
/// <summary>
/// Event that is fired when the workspace is saved.
/// </summary>
public event Action WorkspaceSaved;
protected virtual void OnWorkspaceSaved()
{
LastSaved = DateTime.Now;
HasUnsavedChanges = false;
<<<<<<<
WorkspaceSaved += OnWorkspaceSaved;
=======
>>>>>>>
WorkspaceSaved += OnWorkspaceSaved; |
<<<<<<<
using Autodesk.DesignScript.Interfaces;
=======
using DynCmd = Dynamo.ViewModels.DynamoViewModel;
using System.Reflection;
>>>>>>>
using Autodesk.DesignScript.Interfaces;
using DynCmd = Dynamo.ViewModels.DynamoViewModel;
using System.Reflection; |
<<<<<<<
using System.Xml;
using Dynamo.Models;
=======
using Dynamo.Models;
using Dynamo.Selection;
>>>>>>>
using System.Xml;
using Dynamo.Models;
using Dynamo.Selection;
<<<<<<<
private int renderingTier;
private DynamoViewModel viewModel;
=======
private int renderingTier;
private static readonly Size DefaultPointSize = new Size(8,8);
private Dictionary<string, Model3D> model3DDictionary = new Dictionary<string, Model3D>();
private Dictionary<string, Model3D> Model3DDictionary
{
get
{
return model3DDictionary;
}
set
{
model3DDictionary = value;
}
}
>>>>>>>
private int renderingTier;
private DynamoViewModel viewModel;
<<<<<<<
internal Vector3D defaultCameraLookDirection = new Vector3D(-10, -10, -10);
internal Point3D defaultCameraPosition = new Point3D(10, 15, 10);
internal Vector3D defaultCameraUpDirection = new Vector3D(0, 1, 0);
=======
>>>>>>>
internal Vector3D defaultCameraLookDirection = new Vector3D(-10, -10, -10);
internal Point3D defaultCameraPosition = new Point3D(10, 15, 10);
internal Vector3D defaultCameraUpDirection = new Vector3D(0, 1, 0);
private static readonly Size DefaultPointSize = new Size(8,8);
private Dictionary<string, Model3D> model3DDictionary = new Dictionary<string, Model3D>();
private Dictionary<string, Model3D> Model3DDictionary
{
get
{
return model3DDictionary;
}
set
{
model3DDictionary = value;
}
}
<<<<<<<
private void SetCameraToDefaultOrientation()
{
Camera.LookDirection = defaultCameraLookDirection;
Camera.Position = defaultCameraPosition;
Camera.UpDirection = defaultCameraUpDirection;
=======
/// <summary>
/// Initialize the Helix with these values. These values should be attached before the
/// visualization starts. Deleting them and attaching them does not make any effect on helix.
/// So they are initialized before the process starts.
/// </summary>
private void InitializeHelix()
{
directionalLight = new DirectionalLight3D
{
Color = directionalLightColor,
Direction = directionalLightDirection
};
if (model3DDictionary != null && !model3DDictionary.ContainsKey("DirectionalLight"))
{
model3DDictionary.Add("DirectionalLight", directionalLight);
}
LineGeometryModel3D gridModel3D = new LineGeometryModel3D
{
Geometry = Grid,
Transform = Model1Transform,
Color = SharpDX.Color.White,
Thickness = 0.3,
IsHitTestVisible = false
};
if (model3DDictionary != null && !model3DDictionary.ContainsKey("Grid"))
{
model3DDictionary.Add("Grid", gridModel3D);
}
LineGeometryModel3D axesModel3D = new LineGeometryModel3D
{
Geometry = Axes,
Transform = Model1Transform,
Color = SharpDX.Color.White,
Thickness = 0.3,
IsHitTestVisible = false
};
if (model3DDictionary != null && !model3DDictionary.ContainsKey("Axes"))
{
model3DDictionary.Add("Axes", axesModel3D);
}
}
private void ResetCamera()
{
Camera.Position = new Point3D(10, 15, 10);
Camera.LookDirection = new Vector3D(-10, -10, -10);
>>>>>>>
private void SetCameraToDefaultOrientation()
{
Camera.LookDirection = defaultCameraLookDirection;
Camera.Position = defaultCameraPosition;
Camera.UpDirection = defaultCameraUpDirection;
<<<<<<<
private void UnregisterEventHandlers()
{
UnregisterButtonHandlers();
if (viewModel == null) return;
UnregisterVisualizationManagerEventHandlers();
viewModel.PropertyChanged -= ViewModel_PropertyChanged;
CompositionTarget.Rendering -= CompositionTarget_Rendering;
UnregisterModelEventHandlers(viewModel.Model);
UnregisterWorkspaceEventHandlers(viewModel.Model);
}
=======
>>>>>>>
private void UnregisterEventHandlers()
{
UnregisterButtonHandlers();
if (viewModel == null) return;
UnregisterVisualizationManagerEventHandlers();
viewModel.PropertyChanged -= ViewModel_PropertyChanged;
CompositionTarget.Rendering -= CompositionTarget_Rendering;
UnregisterModelEventHandlers(viewModel.Model);
UnregisterWorkspaceEventHandlers(viewModel.Model);
}
<<<<<<<
viewModel = DataContext as DynamoViewModel;
CompositionTarget.Rendering += CompositionTarget_Rendering;
RegisterButtonHandlers();
//check this for null so the designer can load the preview
if (viewModel == null) return;
RegisterVisualizationManagerEventHandlers();
LogVisualizationCapabilities();
viewModel.PropertyChanged += ViewModel_PropertyChanged;
RegisterModelEventhandlers(viewModel.Model);
RegisterWorkspaceEventHandlers(viewModel.Model);
#if DEBUG
TestSelectionCommand = new Dynamo.UI.Commands.DelegateCommand(TestSelection, CanTestSelection);
#endif
}
private void RegisterButtonHandlers()
{
=======
>>>>>>>
viewModel = DataContext as DynamoViewModel;
CompositionTarget.Rendering += CompositionTarget_Rendering;
RegisterButtonHandlers();
//check this for null so the designer can load the preview
if (viewModel == null) return;
RegisterVisualizationManagerEventHandlers();
LogVisualizationCapabilities();
viewModel.PropertyChanged += ViewModel_PropertyChanged;
RegisterModelEventhandlers(viewModel.Model);
RegisterWorkspaceEventHandlers(viewModel.Model);
}
private void RegisterButtonHandlers()
{
<<<<<<<
private void UnregisterButtonHandlers()
{
MouseLeftButtonDown -= view_MouseButtonIgnore;
MouseLeftButtonUp -= view_MouseButtonIgnore;
MouseRightButtonUp -= view_MouseRightButtonUp;
PreviewMouseRightButtonDown -= view_PreviewMouseRightButtonDown;
}
=======
var vm = DataContext as IWatchViewModel;
//check this for null so the designer can load the preview
if (vm == null) return;
RegisterEventHandlers(vm);
>>>>>>>
private void UnregisterButtonHandlers()
{
MouseLeftButtonDown -= view_MouseButtonIgnore;
MouseLeftButtonUp -= view_MouseButtonIgnore;
MouseRightButtonUp -= view_MouseRightButtonUp;
PreviewMouseRightButtonDown -= view_PreviewMouseRightButtonDown;
} |
<<<<<<<
[Test, Category("RegressionTests")]
public void Defect_MAGN_4364()
{
//Detail steps are here http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-4364
DynamoModel model = ViewModel.Model;
string openPath = Path.Combine(GetTestDirectory(), @"core\DynamoDefects\Defect_MAGN_4364.dyn");
RunModel(openPath);
string watchNodeID1 = "4d3e33b8-877e-4c7f-9b2e-25c5e2f7ca83";
AssertPreviewValue(watchNodeID1, new string[] { "10", "Jack", "Dynamo", "King", "40" });
string watchNodeID2 = "0a0f829d-fe4d-4f82-8565-dd620f39b702";
AssertPreviewValue(watchNodeID2, new string[] { "foo", "bar" });
string watchNodeID3 = "2ac27d00-2c4f-4a07-8ae4-e5ce8784e2dc";
AssertPreviewValue(watchNodeID3, new string[] { "a", "b", "c", "d" });
string watchNodeID4 = "b96146c7-7fbc-4ae5-b8e4-563c72bd6522";
AssertPreviewValue(watchNodeID4, "a");
string watchNodeID5 = "0805b17c-c007-461e-9c2e-33dc2bc6551e";
AssertPreviewValue(watchNodeID5, new int[] { 1, 2, 3 });
string watchNodeID6 = "775db841-b486-4e41-9a6b-2f319696d469";
AssertPreviewValue(watchNodeID6, new int[] { 1, 2, 3, 4 });
string watchNodeID7 = "862f1f50-4a40-47e0-b0aa-d8c9a28f4597";
AssertPreviewValue(watchNodeID7, new int[] { 1, 2, 1, 2 });
}
=======
[Test, Category("RegressionTests")]
public void Defect_MAGN_2607()
{
//Detail steps are here http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-2607
DynamoModel model = ViewModel.Model;
string openPath = Path.Combine(GetTestDirectory(), @"core\DynamoDefects\Defect_MAGN_2607.dyn");
RunModel(openPath);
AssertPreviewValue("99975a42-f887-4b99-9b0a-e36513d2bd6d", 12);
IntegerSlider input = model.CurrentWorkspace.NodeFromWorkspace
("7cbafd1f-cec2-48b2-ac52-c9605acfb644") as IntegerSlider;
input.Value = 12;
RunCurrentModel();
AssertPreviewValue("99975a42-f887-4b99-9b0a-e36513d2bd6d", 24);
}
>>>>>>>
public void Defect_MAGN_2607()
{
//Detail steps are here http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-2607
DynamoModel model = ViewModel.Model;
string openPath = Path.Combine(GetTestDirectory(), @"core\DynamoDefects\Defect_MAGN_2607.dyn");
RunModel(openPath);
AssertPreviewValue("99975a42-f887-4b99-9b0a-e36513d2bd6d", 12);
IntegerSlider input = model.CurrentWorkspace.NodeFromWorkspace
("7cbafd1f-cec2-48b2-ac52-c9605acfb644") as IntegerSlider;
input.Value = 12;
RunCurrentModel();
AssertPreviewValue("99975a42-f887-4b99-9b0a-e36513d2bd6d", 24);
}
[Test, Category("RegressionTests")]
public void Defect_MAGN_4364()
{
//Detail steps are here http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-4364
DynamoModel model = ViewModel.Model;
string openPath = Path.Combine(GetTestDirectory(), @"core\DynamoDefects\Defect_MAGN_4364.dyn");
RunModel(openPath);
string watchNodeID1 = "4d3e33b8-877e-4c7f-9b2e-25c5e2f7ca83";
AssertPreviewValue(watchNodeID1, new string[] { "10", "Jack", "Dynamo", "King", "40" });
string watchNodeID2 = "0a0f829d-fe4d-4f82-8565-dd620f39b702";
AssertPreviewValue(watchNodeID2, new string[] { "foo", "bar" });
string watchNodeID3 = "2ac27d00-2c4f-4a07-8ae4-e5ce8784e2dc";
AssertPreviewValue(watchNodeID3, new string[] { "a", "b", "c", "d" });
string watchNodeID4 = "b96146c7-7fbc-4ae5-b8e4-563c72bd6522";
AssertPreviewValue(watchNodeID4, "a");
string watchNodeID5 = "0805b17c-c007-461e-9c2e-33dc2bc6551e";
AssertPreviewValue(watchNodeID5, new int[] { 1, 2, 3 });
string watchNodeID6 = "775db841-b486-4e41-9a6b-2f319696d469";
AssertPreviewValue(watchNodeID6, new int[] { 1, 2, 3, 4 });
string watchNodeID7 = "862f1f50-4a40-47e0-b0aa-d8c9a28f4597";
AssertPreviewValue(watchNodeID7, new int[] { 1, 2, 1, 2 });
} |
<<<<<<<
using Esquio.Abstractions.Providers;
using Esquio.AspNetCore.Toggles;
using FluentAssertions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
=======
using Microsoft.Extensions.DependencyInjection;
>>>>>>>
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
<<<<<<<
serviceProvider.GetService<IRoleNameProviderService>()
.Should().NotBeNull();
serviceProvider.GetService<IRoleNameProviderService>()
.Should().NotBeNull();
serviceProvider.GetServices<HeaderValueToggle>()
.Should().NotBeNull();
=======
>>>>>>> |
<<<<<<<
public void Track(IEnumerable<LivenessResult> responses)
{
if (_beatPulseContext.AllTrackers != null)
{
foreach (var tracker in _beatPulseContext.AllTrackers)
{
tracker.Track(responses);
}
}
}
async Task<LivenessResult> RunLiveness(IBeatPulseLiveness liveness, HttpContext httpContext,CancellationToken cancellationToken)
=======
async Task<LivenessResult> RunLiveness(IBeatPulseLiveness liveness, BeatPulseOptions options, HttpContext httpContext)
>>>>>>>
public void Track(IEnumerable<LivenessResult> responses)
{
if (_beatPulseContext.AllTrackers != null)
{
foreach (var tracker in _beatPulseContext.AllTrackers)
{
tracker.Track(responses);
}
}
}
async Task<LivenessResult> RunLiveness(IBeatPulseLiveness liveness, BeatPulseOptions options, HttpContext httpContext) |
<<<<<<<
[ScriptField]
public Dictionary XhrFields {
=======
[IntrinsicProperty]
public Dictionary<string, object> XhrFields {
>>>>>>>
[ScriptField]
public Dictionary<string, object> XhrFields { |
<<<<<<<
var st = new Kernel32.SYSTEMTIME();
int res = (int)User32.SendMessageW(this, (User32.WindowMessage)User32.MCM.GETTODAY, IntPtr.Zero, ref st);
=======
Kernel32.SYSTEMTIME st = new Kernel32.SYSTEMTIME();
int res = (int)UnsafeNativeMethods.SendMessage(new HandleRef(this, Handle), (int)ComCtl32.MCM.GETTODAY, 0, ref st);
>>>>>>>
var st = new Kernel32.SYSTEMTIME();
int res = (int)User32.SendMessageW(this, (User32.WindowMessage)User32.MCM.GETTODAY, IntPtr.Zero, ref st);
<<<<<<<
var st = new Kernel32.SYSTEMTIME
=======
Kernel32.SYSTEMTIME st = new Kernel32.SYSTEMTIME
>>>>>>>
var st = new Kernel32.SYSTEMTIME
<<<<<<<
var sys = new Kernel32.SYSTEMTIME
=======
Kernel32.SYSTEMTIME sys = new Kernel32.SYSTEMTIME
>>>>>>>
var sys = new Kernel32.SYSTEMTIME
<<<<<<<
Kernel32.SYSTEMTIME st = DateTimePicker.DateTimeToSysTime(todayDate);
User32.SendMessageW(this, (User32.WindowMessage)User32.MCM.SETTODAY, IntPtr.Zero, ref st);
=======
Kernel32.SYSTEMTIME st = DateTimePicker.DateTimeToSysTime(todayDate);
UnsafeNativeMethods.SendMessage(new HandleRef(this, Handle), (int)ComCtl32.MCM.SETTODAY, 0, ref st);
>>>>>>>
Kernel32.SYSTEMTIME st = DateTimePicker.DateTimeToSysTime(todayDate);
User32.SendMessageW(this, (User32.WindowMessage)User32.MCM.SETTODAY, IntPtr.Zero, ref st);
<<<<<<<
var sa = new NativeMethods.SYSTEMTIMEARRAY();
int flag = NativeMethods.GDTR_MIN | NativeMethods.GDTR_MAX;
Kernel32.SYSTEMTIME sys = DateTimePicker.DateTimeToSysTime(minDate);
=======
int flag = 0;
NativeMethods.SYSTEMTIMEARRAY sa = new NativeMethods.SYSTEMTIMEARRAY();
flag |= NativeMethods.GDTR_MIN | NativeMethods.GDTR_MAX;
Kernel32.SYSTEMTIME sys = DateTimePicker.DateTimeToSysTime(minDate);
>>>>>>>
var sa = new NativeMethods.SYSTEMTIMEARRAY();
int flag = NativeMethods.GDTR_MIN | NativeMethods.GDTR_MAX;
Kernel32.SYSTEMTIME sys = DateTimePicker.DateTimeToSysTime(minDate);
<<<<<<<
[ComVisible(true)]
internal class MonthCalendarAccessibleObject : ControlAccessibleObject
{
private readonly MonthCalendar calendar;
public MonthCalendarAccessibleObject(Control owner)
: base(owner)
{
calendar = owner as MonthCalendar;
}
public override AccessibleRole Role
{
get
{
if (calendar != null)
{
AccessibleRole role = calendar.AccessibleRole;
if (role != AccessibleRole.Default)
{
return role;
}
}
return AccessibleRole.Table;
}
}
public override string Help
{
get
{
var help = base.Help;
if (help != null)
{
return help;
}
else
{
if (calendar != null)
{
return calendar.GetType().Name + "(" + calendar.GetType().BaseType.Name + ")";
}
}
return string.Empty;
}
}
public override string Name
{
get
{
string name = base.Name;
if (name != null)
{
return name;
}
if (calendar != null)
{
if (calendar._mcCurView == ComCtl32.MCMV.MONTH)
{
if (System.DateTime.Equals(calendar.SelectionStart.Date, calendar.SelectionEnd.Date))
{
name = string.Format(SR.MonthCalendarSingleDateSelected, calendar.SelectionStart.ToLongDateString());
}
else
{
name = string.Format(SR.MonthCalendarRangeSelected, calendar.SelectionStart.ToLongDateString(), calendar.SelectionEnd.ToLongDateString());
}
}
else if (calendar._mcCurView == ComCtl32.MCMV.YEAR)
{
if (System.DateTime.Equals(calendar.SelectionStart.Month, calendar.SelectionEnd.Month))
{
name = string.Format(SR.MonthCalendarSingleDateSelected, calendar.SelectionStart.ToString("y"));
}
else
{
name = string.Format(SR.MonthCalendarRangeSelected, calendar.SelectionStart.ToString("y"), calendar.SelectionEnd.ToString("y"));
}
}
else if (calendar._mcCurView == ComCtl32.MCMV.DECADE)
{
if (System.DateTime.Equals(calendar.SelectionStart.Year, calendar.SelectionEnd.Year))
{
name = string.Format(SR.MonthCalendarSingleYearSelected, calendar.SelectionStart.ToString("yyyy"));
}
else
{
name = string.Format(SR.MonthCalendarYearRangeSelected, calendar.SelectionStart.ToString("yyyy"), calendar.SelectionEnd.ToString("yyyy"));
}
}
else if (calendar._mcCurView == ComCtl32.MCMV.CENTURY)
{
name = string.Format(SR.MonthCalendarSingleDecadeSelected, calendar.SelectionStart.ToString("yyyy"));
}
}
return name;
}
}
public override string Value
{
get
{
var value = string.Empty;
try
{
if (calendar != null)
{
if (calendar._mcCurView == ComCtl32.MCMV.MONTH)
{
if (System.DateTime.Equals(calendar.SelectionStart.Date, calendar.SelectionEnd.Date))
{
value = calendar.SelectionStart.ToLongDateString();
}
else
{
value = string.Format("{0} - {1}", calendar.SelectionStart.ToLongDateString(), calendar.SelectionEnd.ToLongDateString());
}
}
else if (calendar._mcCurView == ComCtl32.MCMV.YEAR)
{
if (System.DateTime.Equals(calendar.SelectionStart.Month, calendar.SelectionEnd.Month))
{
value = calendar.SelectionStart.ToString("y");
}
else
{
value = string.Format("{0} - {1}", calendar.SelectionStart.ToString("y"), calendar.SelectionEnd.ToString("y"));
}
}
else
{
value = string.Format("{0} - {1}", calendar.SelectionRange.Start.ToString(), calendar.SelectionRange.End.ToString());
}
}
}
catch
{
value = base.Value;
}
return value;
}
set
{
base.Value = value;
}
}
}
=======
>>>>>>> |
<<<<<<<
=======
private ITelemetryService2 _telemetry;
>>>>>>>
<<<<<<<
=======
_telemetry = services.GetService<ITelemetryService2>();
>>>>>>> |
<<<<<<<
AccessibilityObject.RaiseStructureChangedEvent(UiaCore.StructureChangeType.ChildRemoved, dgv.EditingControlAccessibleObject.RuntimeId);
=======
AccessibilityObject.RaiseStructureChangedEvent(UnsafeNativeMethods.StructureChangeType.ChildRemoved, dgv.EditingControlAccessibleObject.RuntimeId);
}
>>>>>>>
AccessibilityObject.RaiseStructureChangedEvent(UiaCore.StructureChangeType.ChildRemoved, dgv.EditingControlAccessibleObject.RuntimeId);
} |
<<<<<<<
MCM_SETMAXSELCOUNT = (0x1000 + 4),
MCM_SETSELRANGE = (0x1000 + 6),
MCM_GETMONTHRANGE = (0x1000 + 7),
MCM_GETMINREQRECT = (0x1000 + 9),
MCM_SETCOLOR = (0x1000 + 10),
MCM_HITTEST = (0x1000 + 14),
MCM_SETFIRSTDAYOFWEEK = (0x1000 + 15),
MCM_SETRANGE = (0x1000 + 18),
MCM_SETMONTHDELTA = (0x1000 + 20),
MCM_GETMAXTODAYWIDTH = (0x1000 + 21),
MCHT_TITLE = 0x00010000,
MCHT_CALENDAR = 0x00020000,
MCHT_TODAYLINK = 0x00030000,
MCHT_TITLEBK = (0x00010000),
MCHT_TITLEMONTH = (0x00010000 | 0x0001),
MCHT_TITLEYEAR = (0x00010000 | 0x0002),
MCHT_TITLEBTNNEXT = (0x00010000 | 0x01000000 | 0x0003),
MCHT_TITLEBTNPREV = (0x00010000 | 0x02000000 | 0x0003),
MCHT_CALENDARBK = (0x00020000),
MCHT_CALENDARDATE = (0x00020000 | 0x0001),
MCHT_CALENDARDATENEXT = ((0x00020000 | 0x0001) | 0x01000000),
MCHT_CALENDARDATEPREV = ((0x00020000 | 0x0001) | 0x02000000),
MCHT_CALENDARDAY = (0x00020000 | 0x0002),
MCHT_CALENDARWEEKNUM = (0x00020000 | 0x0003),
MCSC_TEXT = 1,
MCSC_TITLEBK = 2,
MCSC_TITLETEXT = 3,
MCSC_MONTHBK = 4,
MCSC_TRAILINGTEXT = 5,
=======
>>>>>>>
MCM_SETMAXSELCOUNT = (0x1000 + 4),
MCM_SETSELRANGE = (0x1000 + 6),
MCM_GETMONTHRANGE = (0x1000 + 7),
MCM_GETMINREQRECT = (0x1000 + 9),
MCM_SETCOLOR = (0x1000 + 10),
MCM_HITTEST = (0x1000 + 14),
MCM_SETFIRSTDAYOFWEEK = (0x1000 + 15),
MCM_SETRANGE = (0x1000 + 18),
MCM_SETMONTHDELTA = (0x1000 + 20),
MCM_GETMAXTODAYWIDTH = (0x1000 + 21),
MCHT_TITLE = 0x00010000,
MCHT_CALENDAR = 0x00020000,
MCHT_TODAYLINK = 0x00030000,
MCHT_TITLEBK = (0x00010000),
MCHT_TITLEMONTH = (0x00010000 | 0x0001),
MCHT_TITLEYEAR = (0x00010000 | 0x0002),
MCHT_TITLEBTNNEXT = (0x00010000 | 0x01000000 | 0x0003),
MCHT_TITLEBTNPREV = (0x00010000 | 0x02000000 | 0x0003),
MCHT_CALENDARBK = (0x00020000),
MCHT_CALENDARDATE = (0x00020000 | 0x0001),
MCHT_CALENDARDATENEXT = ((0x00020000 | 0x0001) | 0x01000000),
MCHT_CALENDARDATEPREV = ((0x00020000 | 0x0001) | 0x02000000),
MCHT_CALENDARDAY = (0x00020000 | 0x0002),
MCHT_CALENDARWEEKNUM = (0x00020000 | 0x0003),
MCSC_TEXT = 1,
MCSC_TITLEBK = 2,
MCSC_TITLETEXT = 3,
MCSC_MONTHBK = 4,
MCSC_TRAILINGTEXT = 5,
<<<<<<<
[StructLayout(LayoutKind.Sequential)]
=======
public class Ole
{
public const int PICTYPE_UNINITIALIZED = -1;
public const int PICTYPE_NONE = 0;
public const int PICTYPE_BITMAP = 1;
public const int PICTYPE_METAFILE = 2;
public const int PICTYPE_ICON = 3;
public const int PICTYPE_ENHMETAFILE = 4;
}
[StructLayout(LayoutKind.Sequential)]
>>>>>>>
[StructLayout(LayoutKind.Sequential)]
<<<<<<<
public class MCHITTESTINFO
{
public int cbSize = Marshal.SizeOf<MCHITTESTINFO>();
public int pt_x = 0;
public int pt_y = 0;
public int uHit = 0;
public short st_wYear = 0;
public short st_wMonth = 0;
public short st_wDayOfWeek = 0;
public short st_wDay = 0;
public short st_wHour = 0;
public short st_wMinute = 0;
public short st_wSecond = 0;
public short st_wMilliseconds = 0;
}
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
=======
public class NMSELCHANGE
{
public NMHDR nmhdr;
public Interop.Kernel32.SYSTEMTIME stSelStart;
public Interop.Kernel32.SYSTEMTIME stSelEnd;
}
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
public class NMDAYSTATE
{
public NMHDR nmhdr;
public Interop.Kernel32.SYSTEMTIME stStart;
public int cDayState = 0;
public IntPtr prgDayState;
}
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
public class NMVIEWCHANGE
{
public NMHDR nmhdr;
public uint uOldView;
public uint uNewView;
}
[StructLayout(LayoutKind.Sequential)]
public struct NMLVCUSTOMDRAW
{
public NMCUSTOMDRAW nmcd;
public int clrText;
public int clrTextBk;
public int iSubItem;
public int dwItemType;
// Item Custom Draw
public int clrFace;
public int iIconEffect;
public int iIconPhase;
public int iPartId;
public int iStateId;
// Group Custom Draw
public Interop.RECT rcText;
public uint uAlign;
}
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
public class NMLVGETINFOTIP
{
public NMHDR nmhdr;
public int flags = 0;
public IntPtr lpszText = IntPtr.Zero;
public int cchTextMax = 0;
public int item = 0;
public int subItem = 0;
public IntPtr lParam = IntPtr.Zero;
}
[StructLayout(LayoutKind.Sequential)]
public class NMLVKEYDOWN
{
public NMHDR hdr;
public short wVKey = 0;
public uint flags = 0;
}
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
>>>>>>>
<<<<<<<
=======
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
public class NMDATETIMECHANGE
{
public NMHDR nmhdr;
public int dwFlags = 0;
public Interop.Kernel32.SYSTEMTIME st;
}
>>>>>>>
<<<<<<<
=======
#region SendKeys SendInput functionality
[StructLayout(LayoutKind.Sequential)]
public struct MOUSEINPUT
{
public int dx;
public int dy;
public int mouseData;
public int dwFlags;
public int time;
public IntPtr dwExtraInfo;
}
[StructLayout(LayoutKind.Sequential)]
public struct KEYBDINPUT
{
public short wVk;
public short wScan;
public int dwFlags;
public int time;
public IntPtr dwExtraInfo;
}
[StructLayout(LayoutKind.Sequential)]
public struct HARDWAREINPUT
{
public int uMsg;
public short wParamL;
public short wParamH;
}
public const int INPUT_MOUSE = 0;
[StructLayout(LayoutKind.Sequential)]
public struct INPUT
{
public int type;
public INPUTUNION inputUnion;
}
// We need to split the field offset out into a union struct to avoid
// silent problems in 64 bit
[StructLayout(LayoutKind.Explicit)]
public struct INPUTUNION
{
[FieldOffset(0)]
public MOUSEINPUT mi;
[FieldOffset(0)]
public KEYBDINPUT ki;
[FieldOffset(0)]
public HARDWAREINPUT hi;
}
#endregion
>>>>>>> |
<<<<<<<
IntPtr hWndOwner = owner == null ? owner.Handle : User32.GetActiveWindow();
=======
IntPtr hWndOwner = owner != null ? owner.Handle : UnsafeNativeMethods.GetActiveWindow();
>>>>>>>
IntPtr hWndOwner = owner != null ? owner.Handle : User32.GetActiveWindow(); |
<<<<<<<
if (ContextMenu != null || ContextMenuStrip != null)
=======
//set the mouse capture .. this is the Child Wndproc..
//
if (ContextMenuStrip != null)
>>>>>>>
if (ContextMenuStrip != null)
<<<<<<<
if (ContextMenu != null)
{
// Set the mouse capture as this is the child Wndproc.
Capture = false;
}
=======
>>>>>>> |
<<<<<<<
=======
/// <summary>
/// Associates an existing module with a new name.
/// </summary>
/// <remarks>New in 2.1</remarks>
public void AddModuleAlias(string moduleName, string moduleAlias) {
if (Modules.TryImport(moduleName, out var modRef)) {
Modules[moduleAlias] = modRef;
}
}
>>>>>>>
<<<<<<<
internal PathResolverSnapshot CurrentPathResolver => _pathResolver.CurrentSnapshot;
internal BuiltinInstanceInfo GetInstance(IPythonType type) {
return GetBuiltinType(type).Instance;
}
=======
internal BuiltinInstanceInfo GetInstance(IPythonType type) => GetBuiltinType(type).Instance;
>>>>>>>
internal PathResolverSnapshot CurrentPathResolver => _pathResolver.CurrentSnapshot;
internal BuiltinInstanceInfo GetInstance(IPythonType type) => GetBuiltinType(type).Instance; |
<<<<<<<
/// Gets or sets the <see cref='MainMenu'/>
/// that is displayed in the form.
/// </summary>
[
SRCategory(nameof(SR.CatWindowStyle)),
DefaultValue(null),
SRDescription(nameof(SR.FormMenuDescr)),
TypeConverter(typeof(ReferenceConverter)),
Browsable(false),
]
public MainMenu Menu
{
get
{
return (MainMenu)Properties.GetObject(PropMainMenu);
}
set
{
MainMenu mainMenu = Menu;
if (mainMenu != value)
{
if (mainMenu != null)
{
mainMenu._form = null;
}
Properties.SetObject(PropMainMenu, value);
if (value != null)
{
if (value._form != null)
{
value._form.Menu = null;
}
value._form = this;
}
if (formState[FormStateSetClientSize] == 1 && !IsHandleCreated)
{
ClientSize = ClientSize;
}
MenuChanged(Windows.Forms.Menu.CHANGE_ITEMS, value);
}
}
}
/// <summary>
=======
>>>>>>>
<<<<<<<
InvalidateMergedMenu();
SetState(States.Visible, false);
=======
SetState(STATE_VISIBLE, false);
>>>>>>>
SetState(States.Visible, false);
<<<<<<<
MainMenu mainMenu = Menu;
// We should only dispose this form's menus!
if (mainMenu != null && mainMenu.ownerForm == this)
{
mainMenu.Dispose();
Properties.SetObject(PropMainMenu, null);
}
if (Properties.GetObject(PropCurMenu) != null)
{
Properties.SetObject(PropCurMenu, null);
}
MenuChanged(Windows.Forms.Menu.CHANGE_ITEMS, null);
MainMenu dummyMenu = (MainMenu)Properties.GetObject(PropDummyMenu);
if (dummyMenu != null)
{
dummyMenu.Dispose();
Properties.SetObject(PropDummyMenu, null);
}
MainMenu mergedMenu = (MainMenu)Properties.GetObject(PropMergedMenu);
if (mergedMenu != null)
{
if (mergedMenu.ownerForm == this || mergedMenu._form == null)
{
mergedMenu.Dispose();
}
Properties.SetObject(PropMergedMenu, null);
}
=======
>>>>>>>
<<<<<<<
int suspendCount = formStateEx[FormStateExUpdateMenuHandlesSuspendCount];
if (suspendCount > 0 && menu != null)
{
formStateEx[FormStateExUpdateMenuHandlesDeferred] = 1;
return;
}
MainMenu curMenu = menu;
if (curMenu != null)
{
curMenu._form = this;
}
if (curMenu != null || Properties.ContainsObject(PropCurMenu))
{
Properties.SetObject(PropCurMenu, curMenu);
}
=======
>>>>>>>
<<<<<<<
if (menu != null)
{
User32.SetMenu(this, new HandleRef(menu, menu.Handle));
}
else
{
User32.SetMenu(this, NativeMethods.NullHandleRef);
}
=======
UnsafeNativeMethods.SetMenu(new HandleRef(this, Handle), NativeMethods.NullHandleRef);
>>>>>>>
User32.SetMenu(this, NativeMethods.NullHandleRef);
<<<<<<<
if (menu == null && mainMenuStrip != null)
{ // If MainMenuStrip, we need to remove any Win32 Menu to make room for it.
IntPtr hMenu = User32.GetMenu(this);
=======
if (mainMenuStrip != null)
{
// If MainMenuStrip, we need to remove any Win32 Menu to make room for it.
IntPtr hMenu = UnsafeNativeMethods.GetMenu(new HandleRef(this, Handle));
>>>>>>>
if (mainMenuStrip != null)
{
// If MainMenuStrip, we need to remove any Win32 Menu to make room for it.
IntPtr hMenu = User32.GetMenu(this);
<<<<<<<
// double check GetMenu incase someone is using interop
IntPtr hMenu = User32.GetMenu(this);
if (hMenu == IntPtr.Zero)
=======
MenuStrip sourceMenuStrip = ToolStripManager.GetMainMenuStrip(this);
if (sourceMenuStrip != null)
>>>>>>>
MenuStrip sourceMenuStrip = ToolStripManager.GetMainMenuStrip(this);
if (sourceMenuStrip != null)
<<<<<<<
/// WM_INITMENUPOPUP handler
/// </summary>
private void WmInitMenuPopup(ref Message m)
{
MainMenu curMenu = (MainMenu)Properties.GetObject(PropCurMenu);
if (curMenu != null)
{
//curMenu.UpdateRtl((RightToLeft == RightToLeft.Yes));
if (curMenu.ProcessInitMenuPopup(m.WParam))
{
return;
}
}
base.WndProc(ref m);
}
/// <summary>
/// Handles the WM_MENUCHAR message
/// </summary>
private void WmMenuChar(ref Message m)
{
MainMenu curMenu = (MainMenu)Properties.GetObject(PropCurMenu);
if (curMenu == null)
{
Form formMdiParent = (Form)Properties.GetObject(PropFormMdiParent);
if (formMdiParent != null && formMdiParent.Menu != null)
{
UnsafeNativeMethods.PostMessage(new HandleRef(formMdiParent, formMdiParent.Handle), WindowMessages.WM_SYSCOMMAND, (IntPtr)User32.SC.KEYMENU, m.WParam);
m.Result = (IntPtr)NativeMethods.Util.MAKELONG(0, 1);
return;
}
}
if (curMenu != null)
{
curMenu.WmMenuChar(ref m);
if (m.Result != IntPtr.Zero)
{
// This char is a mnemonic on our menu.
return;
}
}
base.WndProc(ref m);
}
/// <summary>
=======
>>>>>>> |
<<<<<<<
case "?":
Console.WriteLine("Available commands:");
Console.WriteLine(" ? help (this menu)");
Console.WriteLine(" q quit");
Console.WriteLine(" cls clear screen");
Console.WriteLine(" list list clients");
Console.WriteLine(" send send message to client");
Console.WriteLine(" remove disconnect client");
break;
case "q":
runForever = false;
break;
case "cls":
Console.Clear();
break;
case "list":
clients = server.ListClients();
if (clients != null && clients.Count > 0)
{
Console.WriteLine("Clients");
foreach (string curr in clients)
=======
Console.Write("Command [? for help]: ");
string userInput = Console.ReadLine();
List<string> clients;
string ipPort;
if (String.IsNullOrEmpty(userInput)) continue;
switch (userInput)
{
case "?":
Console.WriteLine("Available commands:");
Console.WriteLine(" ? help (this menu)");
Console.WriteLine(" q quit");
Console.WriteLine(" cls clear screen");
Console.WriteLine(" list list clients");
Console.WriteLine(" send send message to client");
break;
case "q":
runForever = false;
break;
case "cls":
Console.Clear();
break;
case "list":
clients = server.ListClients();
if (clients != null && clients.Count > 0)
{
Console.WriteLine("Clients");
foreach (string curr in clients)
{
Console.WriteLine(" " + curr);
}
}
else
>>>>>>>
Console.Write("Command [? for help]: ");
string userInput = Console.ReadLine();
List<string> clients;
string ipPort;
if (String.IsNullOrEmpty(userInput)) continue;
switch (userInput)
{
case "?":
Console.WriteLine("Available commands:");
Console.WriteLine(" ? help (this menu)");
Console.WriteLine(" q quit");
Console.WriteLine(" cls clear screen");
Console.WriteLine(" list list clients");
Console.WriteLine(" send send message to client");
Console.WriteLine(" remove disconnect client");
break;
case "q":
runForever = false;
break;
case "cls":
Console.Clear();
break;
case "list":
clients = server.ListClients();
if (clients != null && clients.Count > 0)
{
Console.WriteLine("Clients");
foreach (string curr in clients)
{
Console.WriteLine(" " + curr);
}
}
else
<<<<<<<
}
else
{
Console.WriteLine("None");
}
break;
case "send":
Console.Write("IP:Port: ");
ipPort = Console.ReadLine();
Console.Write("Data: ");
userInput = Console.ReadLine();
if (String.IsNullOrEmpty(userInput)) break;
server.Send(ipPort, Encoding.UTF8.GetBytes(userInput));
break;
case "remove":
Console.Write("IP:Port: ");
ipPort = Console.ReadLine();
server.DisconnectClient(ipPort);
break;
default:
break;
=======
break;
case "send":
Console.Write("IP:Port: ");
ipPort = Console.ReadLine();
Console.Write("Data: ");
userInput = Console.ReadLine();
if (String.IsNullOrEmpty(userInput)) break;
server.Send(ipPort, Encoding.UTF8.GetBytes(userInput));
break;
default:
break;
}
>>>>>>>
break;
case "send":
Console.Write("IP:Port: ");
ipPort = Console.ReadLine();
Console.Write("Data: ");
userInput = Console.ReadLine();
if (String.IsNullOrEmpty(userInput)) break;
server.Send(ipPort, Encoding.UTF8.GetBytes(userInput));
break;
case "remove":
Console.Write("IP:Port: ");
ipPort = Console.ReadLine();
server.DisconnectClient(ipPort);
break;
default:
break;
} |
<<<<<<<
case @"/debug/TeslaAPI/vehicles":
case @"/debug/TeslaAPI/charge_state":
case @"/debug/TeslaAPI/climate_state":
case @"/debug/TeslaAPI/drive_state":
case @"/debug/TeslaAPI/vehicle_config":
case @"/debug/TeslaAPI/vehicle_state":
case @"/debug/TeslaAPI/command/auto_conditioning_stop":
case @"/debug/TeslaAPI/command/charge_port_door_open":
case @"/debug/TeslaAPI/command/set_charge_limit":
Debug_TeslaAPI(request.Url.LocalPath, request, response);
break;
case @"/debug/TeslaLogger/states":
Debug_TeslaLoggerStates(request, response);
break;
=======
case @"/admin/UpdateElevation":
Admin_UpdateElevation(request, response);
break;
>>>>>>>
case @"/debug/TeslaAPI/vehicles":
case @"/debug/TeslaAPI/charge_state":
case @"/debug/TeslaAPI/climate_state":
case @"/debug/TeslaAPI/drive_state":
case @"/debug/TeslaAPI/vehicle_config":
case @"/debug/TeslaAPI/vehicle_state":
case @"/debug/TeslaAPI/command/auto_conditioning_stop":
case @"/debug/TeslaAPI/command/charge_port_door_open":
case @"/debug/TeslaAPI/command/set_charge_limit":
Debug_TeslaAPI(request.Url.LocalPath, request, response);
break;
case @"/debug/TeslaLogger/states":
Debug_TeslaLoggerStates(request, response);
case @"/admin/UpdateElevation":
Admin_UpdateElevation(request, response);
break; |
<<<<<<<
=======
case bool _ when request.Url.LocalPath.Equals("/setpassword"):
SetPassword(request, response);
break;
// car values
case bool _ when Regex.IsMatch(request.Url.LocalPath, @"/get/[0-9]+/.+"):
Get_CarValue(request, response);
break;
>>>>>>>
case bool _ when request.Url.LocalPath.Equals("/setpassword"):
SetPassword(request, response);
break;
<<<<<<<
private void SendCarCommand(HttpListenerRequest request, HttpListenerResponse response)
{
Match m = Regex.Match(request.Url.LocalPath, @"/get/([0-9]+)/(.+)");
if (m.Success && m.Groups.Count == 3 && m.Groups[1].Captures.Count == 1 && m.Groups[2].Captures.Count == 1)
{
string command = m.Groups[2].Captures[0].ToString();
int.TryParse(m.Groups[1].Captures[0].ToString(), out int CarID);
if (command.Length > 0 && CarID > 0)
{
Car car = Car.GetCarByID(CarID);
if (car != null)
{
// check if command is in list of allowed commands
if (AllowedTeslaAPICommands.Contains(command))
{
switch(command)
{
case "auto_conditioning_start":
WriteString(response, car.webhelper.PostCommand("command/auto_conditioning_start", null).Result);
break;
case "auto_conditioning_stop":
WriteString(response, car.webhelper.PostCommand("command/auto_conditioning_stop", null).Result);
break;
case "auto_conditioning_toggle":
if (car.currentJSON.current_is_preconditioning)
{
WriteString(response, car.webhelper.PostCommand("command/auto_conditioning_stop", null).Result);
}
else
{
WriteString(response, car.webhelper.PostCommand("command/auto_conditioning_start", null).Result);
}
break;
}
}
}
}
}
}
=======
private void SetPassword(HttpListenerRequest request, HttpListenerResponse response)
{
Logfile.Log("SetPassword");
string data;
using (StreamReader reader = new StreamReader(request.InputStream, request.ContentEncoding))
{
data = reader.ReadToEnd();
}
NameValueCollection r = HttpUtility.ParseQueryString(data);
string email = r["email"];
string password = r["password"];
string carid = r["carid"];
string id = r["id"];
if (id != null && id.Length > 0)
{
if (id == "-1")
{
Logfile.Log("Insert Password ID:" + id);
using (MySqlConnection con = new MySqlConnection(DBHelper.DBConnectionstring))
{
con.Open();
MySqlCommand cmd = new MySqlCommand("select max(id)+1 from cars", con);
int newid = Convert.ToInt32(cmd.ExecuteScalar());
cmd = new MySqlCommand("insert cars (id, tesla_name, tesla_password, tesla_carid) values (@id, @tesla_name, @tesla_password, @tesla_carid)", con);
cmd.Parameters.AddWithValue("@id", newid);
cmd.Parameters.AddWithValue("@tesla_name", email);
cmd.Parameters.AddWithValue("@tesla_password", password);
cmd.Parameters.AddWithValue("@tesla_carid", carid);
cmd.ExecuteNonQuery();
}
}
else
{
Logfile.Log("Update Password ID:" + id);
using (MySqlConnection con = new MySqlConnection(DBHelper.DBConnectionstring))
{
con.Open();
MySqlCommand cmd = new MySqlCommand("update cars set tesla_name=@tesla_name, tesla_password=@tesla_password, tesla_carid=@ where id=@id", con);
cmd.Parameters.AddWithValue("@id", id);
cmd.Parameters.AddWithValue("@tesla_name", email);
cmd.Parameters.AddWithValue("@tesla_password", password);
cmd.Parameters.AddWithValue("@tesla_carid", carid);
cmd.ExecuteNonQuery();
}
}
}
}
>>>>>>>
private void SendCarCommand(HttpListenerRequest request, HttpListenerResponse response)
{
Match m = Regex.Match(request.Url.LocalPath, @"/get/([0-9]+)/(.+)");
if (m.Success && m.Groups.Count == 3 && m.Groups[1].Captures.Count == 1 && m.Groups[2].Captures.Count == 1)
{
string command = m.Groups[2].Captures[0].ToString();
int.TryParse(m.Groups[1].Captures[0].ToString(), out int CarID);
if (command.Length > 0 && CarID > 0)
{
Car car = Car.GetCarByID(CarID);
if (car != null)
{
// check if command is in list of allowed commands
if (AllowedTeslaAPICommands.Contains(command))
{
switch(command)
{
case "auto_conditioning_start":
WriteString(response, car.webhelper.PostCommand("command/auto_conditioning_start", null).Result);
break;
case "auto_conditioning_stop":
WriteString(response, car.webhelper.PostCommand("command/auto_conditioning_stop", null).Result);
break;
case "auto_conditioning_toggle":
if (car.currentJSON.current_is_preconditioning)
{
WriteString(response, car.webhelper.PostCommand("command/auto_conditioning_stop", null).Result);
}
else
{
WriteString(response, car.webhelper.PostCommand("command/auto_conditioning_start", null).Result);
}
break;
}
}
}
}
}
}
private void SetPassword(HttpListenerRequest request, HttpListenerResponse response)
{
Logfile.Log("SetPassword");
string data;
using (StreamReader reader = new StreamReader(request.InputStream, request.ContentEncoding))
{
data = reader.ReadToEnd();
}
NameValueCollection r = HttpUtility.ParseQueryString(data);
string email = r["email"];
string password = r["password"];
string carid = r["carid"];
string id = r["id"];
if (id != null && id.Length > 0)
{
if (id == "-1")
{
Logfile.Log("Insert Password ID:" + id);
using (MySqlConnection con = new MySqlConnection(DBHelper.DBConnectionstring))
{
con.Open();
MySqlCommand cmd = new MySqlCommand("select max(id)+1 from cars", con);
int newid = Convert.ToInt32(cmd.ExecuteScalar());
cmd = new MySqlCommand("insert cars (id, tesla_name, tesla_password, tesla_carid) values (@id, @tesla_name, @tesla_password, @tesla_carid)", con);
cmd.Parameters.AddWithValue("@id", newid);
cmd.Parameters.AddWithValue("@tesla_name", email);
cmd.Parameters.AddWithValue("@tesla_password", password);
cmd.Parameters.AddWithValue("@tesla_carid", carid);
cmd.ExecuteNonQuery();
}
}
else
{
Logfile.Log("Update Password ID:" + id);
using (MySqlConnection con = new MySqlConnection(DBHelper.DBConnectionstring))
{
con.Open();
MySqlCommand cmd = new MySqlCommand("update cars set tesla_name=@tesla_name, tesla_password=@tesla_password, tesla_carid=@ where id=@id", con);
cmd.Parameters.AddWithValue("@id", id);
cmd.Parameters.AddWithValue("@tesla_name", email);
cmd.Parameters.AddWithValue("@tesla_password", password);
cmd.Parameters.AddWithValue("@tesla_carid", carid);
cmd.ExecuteNonQuery();
}
}
}
} |
<<<<<<<
private void Debug_TeslaLoggerMessages(HttpListenerRequest request, HttpListenerResponse response)
{
response.AddHeader("Content-Type", "text/html; charset=utf-8");
WriteString(response, "<html><head></head><body><table border=\"1\">" + string.Concat(Tools.debugBuffer.Select(a => string.Format("<tr><td>{0} {1}</td></tr>", a.Key, a.Value))) + "</table></body></html>");
}
=======
private void GetCurrentJson(HttpListenerRequest request, HttpListenerResponse response)
{
System.Diagnostics.Debug.WriteLine(request.Url.LocalPath);
Match m = Regex.Match(request.Url.LocalPath, @"/currentjson/([0-9]+)");
if (m.Success && m.Groups.Count == 2 && m.Groups[1].Captures.Count == 1)
{
int.TryParse(m.Groups[1].Captures[0].ToString(), out int CarID);
try
{
if (CurrentJSON.jsonStringHolder.TryGetValue(CarID, out string json))
{
WriteString(response, json);
}
else
{
response.StatusCode = (int)HttpStatusCode.NotFound;
WriteString(response, @"URL Not Found!");
}
}
catch (Exception ex)
{
WriteString(response, ex.ToString());
Logfile.ExceptionWriter(ex, request.Url.LocalPath);
}
}
}
>>>>>>>
private void Debug_TeslaLoggerMessages(HttpListenerRequest request, HttpListenerResponse response)
{
response.AddHeader("Content-Type", "text/html; charset=utf-8");
WriteString(response, "<html><head></head><body><table border=\"1\">" + string.Concat(Tools.debugBuffer.Select(a => string.Format("<tr><td>{0} {1}</td></tr>", a.Key, a.Value))) + "</table></body></html>");
}
private void GetCurrentJson(HttpListenerRequest request, HttpListenerResponse response)
{
System.Diagnostics.Debug.WriteLine(request.Url.LocalPath);
Match m = Regex.Match(request.Url.LocalPath, @"/currentjson/([0-9]+)");
if (m.Success && m.Groups.Count == 2 && m.Groups[1].Captures.Count == 1)
{
int.TryParse(m.Groups[1].Captures[0].ToString(), out int CarID);
try
{
if (CurrentJSON.jsonStringHolder.TryGetValue(CarID, out string json))
{
WriteString(response, json);
}
else
{
response.StatusCode = (int)HttpStatusCode.NotFound;
WriteString(response, @"URL Not Found!");
}
}
catch (Exception ex)
{
WriteString(response, ex.ToString());
Logfile.ExceptionWriter(ex, request.Url.LocalPath);
}
}
} |
<<<<<<<
if (lines.Length > 1)
{
mod.Desc = lines[1];
=======
if (lines.Length > 2)
{
string s = lines[2];
string[] s2 = s.Split(new char[]{' '});
xOffset = int.Parse(s2[0]);
yOffset = int.Parse(s2[1]);
}
MODs = MODs.Union(new MOD[] { mod }).NullToEmptyArray();
>>>>>>>
if (lines.Length > 1)
{
mod.Desc = lines[1];
if (lines.Length > 2)
{
string s = lines[2];
string[] s2 = s.Split(new char[]{' '});
xOffset = int.Parse(s2[0]);
yOffset = int.Parse(s2[1]);
} |
<<<<<<<
=======
//var list = GameTools.GetContentList(true);
>>>>>>>
<<<<<<<
Session.Resolution = "1024*680"; //"925*520";
//LargeContextMenu = true;
=======
Session.Resolution = "1000*620"; //"925*520";
//LargeContextMenu = true;
>>>>>>>
Session.Resolution = "1000*620"; //"925*520";
//LargeContextMenu = true; |
<<<<<<<
private float circleRaidus = 1f;
//internal Sprite sprite;
//internal Material material;
//internal Color color;
=======
private float colliderRadius = 1f;
internal Sprite sprite;
internal Material material;
internal Color color;
>>>>>>>
private float colliderRadius = 1f;
//internal Sprite sprite;
//internal Material material;
//internal Color color;
<<<<<<<
circleRaidus = runtime.cachedColliderRadius * scale.Max();
//tag = gameObject.tag = runtime.cachedTag;
tag = runtime.cachedTag;
=======
colliderRadius = runtime.cachedColliderRadius * scale.Max();
tag = gameObject.tag = runtime.cachedTag;
>>>>>>>
colliderRadius = runtime.cachedColliderRadius * scale.Max();
//tag = gameObject.tag = runtime.cachedTag;
tag = runtime.cachedTag;
<<<<<<<
//renderer.enabled = false;
is_active = false;
=======
renderer.enabled = false;
>>>>>>>
//renderer.enabled = false; |
<<<<<<<
=======
_compression = compression;
_srpClient = new SrpClient();
>>>>>>>
_compression = compression;
<<<<<<<
if (operation == IscCodes.op_cond_accept || operation == IscCodes.op_accept_data)
{
var data = xdrStream.ReadBuffer();
var acceptPluginName = xdrStream.ReadString();
var isAuthenticated = xdrStream.ReadBoolean();
var keys = xdrStream.ReadString();
if (!isAuthenticated)
{
switch (acceptPluginName)
{
case SrpClient.PluginName:
_authData = Encoding.ASCII.GetBytes(_srp.ClientProof(_userID, _password, data).ToHexString());
break;
case SspiHelper.PluginName:
_authData = _sspi.GetClientSecurity(data);
break;
default:
throw new ArgumentOutOfRangeException();
}
}
}
=======
if (_compression && !((_protocolMinimunType & IscCodes.pflag_compress) != 0))
{
_compression = false;
}
>>>>>>>
if (_compression && !((_protocolMinimunType & IscCodes.pflag_compress) != 0))
{
_compression = false;
}
if (operation == IscCodes.op_cond_accept || operation == IscCodes.op_accept_data)
{
var data = xdrStream.ReadBuffer();
var acceptPluginName = xdrStream.ReadString();
var isAuthenticated = xdrStream.ReadBoolean();
var keys = xdrStream.ReadString();
if (!isAuthenticated)
{
switch (acceptPluginName)
{
case SrpClient.PluginName:
_authData = Encoding.ASCII.GetBytes(_srp.ClientProof(_userID, _password, data).ToHexString());
break;
case SspiHelper.PluginName:
_authData = _sspi.GetClientSecurity(data);
break;
default:
throw new ArgumentOutOfRangeException();
}
}
} |
<<<<<<<
XdrStream.Write(IscCodes.op_attach);
XdrStream.Write(0); // Database object ID
=======
Write(IscCodes.op_attach);
Write(0); // Database object ID
if (!string.IsNullOrEmpty(UserID)) {
dpb.Append(IscCodes.isc_dpb_user_name, UserID);
if (!string.IsNullOrEmpty(Password)) {
dpb.Append(IscCodes.isc_dpb_password, Password);
}
}
>>>>>>>
XdrStream.Write(IscCodes.op_attach);
XdrStream.Write(0); // Database object ID
if (!string.IsNullOrEmpty(UserID)) {
dpb.Append(IscCodes.isc_dpb_user_name, UserID);
if (!string.IsNullOrEmpty(Password)) {
dpb.Append(IscCodes.isc_dpb_password, Password);
}
}
<<<<<<<
XdrStream.Write(IscCodes.op_create);
XdrStream.Write(0);
=======
Write(IscCodes.op_create);
Write(0);
if (!string.IsNullOrEmpty(UserID)) {
dpb.Append(IscCodes.isc_dpb_user_name, UserID);
if (!string.IsNullOrEmpty(Password)) {
dpb.Append(IscCodes.isc_dpb_password, Password);
}
}
>>>>>>>
XdrStream.Write(IscCodes.op_create);
XdrStream.Write(0);
if (!string.IsNullOrEmpty(UserID)) {
dpb.Append(IscCodes.isc_dpb_user_name, UserID);
if (!string.IsNullOrEmpty(Password)) {
dpb.Append(IscCodes.isc_dpb_password, Password);
}
} |
<<<<<<<
using PFW;
=======
/**
* Copyright (c) 2017-present, PFW Contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is
* distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
* the License for the specific language governing permissions and limitations under the License.
*/
using PFW;
>>>>>>>
/**
* Copyright (c) 2017-present, PFW Contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is
* distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
* the License for the specific language governing permissions and limitations under the License.
*/
using PFW;
<<<<<<<
var heightField = transform.Find("HeightField").GetComponent<TextMeshProUGUI>();
heightField.text = _matchSession.TerrainMap.GetTerrainCachedHeight(hit.point).ToString();
=======
_heightField.text = _matchSession.TerrainMap.GetTerrainHeight(hit.point).ToString();
>>>>>>>
_heightField.text = _matchSession.TerrainMap.GetTerrainCachedHeight(hit.point).ToString(); |
<<<<<<<
public IEnumerable<TabInfo> GetPageList(PortalSettings settings, int parentId = -1, string searchKey = "", bool includeHidden = true, bool includeDeleted = false)
=======
public IEnumerable<TabInfo> GetPageList(int parentId = -1, string searchKey = "", bool includeHidden = true, bool includeDeleted = false, bool includeSubpages = false)
>>>>>>>
public IEnumerable<TabInfo> GetPageList(PortalSettings settings, int parentId = -1, string searchKey = "", bool includeHidden = true, bool includeDeleted = false, bool includeSubpages = false)
<<<<<<<
return pages;
}
public IEnumerable<TabInfo> GetPageList(PortalSettings portalSettings, bool? deleted, string tabName, string tabTitle, string tabPath,
string tabSkin, bool? visible, int parentId, out int total, string searchKey = "", int pageIndex = -1, int pageSize = 10)
=======
return includeSubpages ? pages.OrderBy(x => x.ParentId > -1 ? x.ParentId : x.TabID).ThenBy(x => x.TabID) : pages;
}
public IEnumerable<TabInfo> GetPageList(bool? deleted, string tabName, string tabTitle, string tabPath,
string tabSkin, bool? visible, int parentId, out int total, string searchKey = "", int pageIndex = -1, int pageSize = 10, bool includeSubpages = false)
>>>>>>>
return includeSubpages ? pages.OrderBy(x => x.ParentId > -1 ? x.ParentId : x.TabID).ThenBy(x => x.TabID) : pages;
}
public IEnumerable<TabInfo> GetPageList(PortalSettings portalSettings, bool? deleted, string tabName, string tabTitle, string tabPath,
string tabSkin, bool? visible, int parentId, out int total, string searchKey = "", int pageIndex = -1, int pageSize = 10, bool includeSubpages = false)
<<<<<<<
var tabs = GetPageList(portalSettings, parentId, searchKey, true, deleted ?? false);
=======
var tabs = GetPageList(parentId, searchKey, true, deleted ?? false, includeSubpages);
>>>>>>>
var tabs = GetPageList(portalSettings, parentId, searchKey, true, deleted ?? false, includeSubpages);
<<<<<<<
tab.TabSettings["LinkNewWindow"] = pageSettings.LinkNewWindow.ToString();
=======
tab.TabSettings["LinkNewWindow"] = pageSettings.LinkNewWindow.ToString();
>>>>>>>
tab.TabSettings["LinkNewWindow"] = pageSettings.LinkNewWindow.ToString(); |
<<<<<<<
=======
using System.Web.UI.WebControls;
>>>>>>>
using System.Web.UI.WebControls;
<<<<<<<
var cookie = new HttpCookie(MobileViewSiteCookieName, isMobile.ToString())
{
Path = Globals.ApplicationPath
};
response.Cookies.Set(cookie);
=======
if (viewMobileCookie == null)
{
response.Cookies.Add(new HttpCookie(MobileViewSiteCookieName, isMobile.ToString()));
}
else
{
viewMobileCookie.Value = isMobile.ToString();
}
>>>>>>>
if (viewMobileCookie == null)
{
response.Cookies.Set(new HttpCookie(MobileViewSiteCookieName, isMobile.ToString()));
}
else
{
response.Cookies.Set(cookie); |
<<<<<<<
/// <exception cref="DynamicContentTypeDoesNotExistException">requested content type by ContentTypeId and PortalId does not exist</exception>
=======
/// <exception cref="ContentTypeInUseException">Content Type is in use by other component</exception>
>>>>>>>
/// <exception cref="DynamicContentTypeDoesNotExistException">requested content type by ContentTypeId and PortalId does not exist</exception>
/// <exception cref="ContentTypeInUseException">Content Type is in use by other component</exception> |
<<<<<<<
using System.Web.UI;
using System.Collections.Generic;
=======
using System.IO;
>>>>>>>
using System.Web.UI;
using System.Collections.Generic;
using System.IO; |
<<<<<<<
/// <summary>
/// Deprecated Apollo localization.
/// </summary>
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v10.0.0.")]
=======
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v11.0.0.")]
>>>>>>>
/// <summary>
/// Deprecated Apollo localization.
/// </summary>
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v11.0.0.")]
<<<<<<<
/// <inheritdoc/>
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v10.0.0.")]
=======
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v11.0.0.")]
>>>>>>>
/// <inheritdoc/>
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v11.0.0.")]
<<<<<<<
/// <inheritdoc/>
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v10.0.0.")]
=======
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v11.0.0.")]
>>>>>>>
/// <inheritdoc/>
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v11.0.0.")]
<<<<<<<
/// <inheritdoc/>
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v10.0.0.")]
=======
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v11.0.0.")]
>>>>>>>
/// <inheritdoc/>
[Obsolete("Deprecated in 9.4.0, due to limited developer support. Scheduled removal in v11.0.0.")] |
<<<<<<<
robot.LoadScript<ScriptsScripts>();
=======
robot.AutoLoadScripts = false;
robot.LoadScriptFile(@"E:\Code\mmbot\MMBot\Scripts\ping.csx");
robot.LoadScriptFile(@"E:\Code\mmbot\MMBot\Scripts\whenisay.csx");
>>>>>>>
robot.LoadScript<ScriptsScripts>();
robot.AutoLoadScripts = false;
robot.LoadScriptFile(@"E:\Code\mmbot\MMBot\Scripts\ping.csx");
robot.LoadScriptFile(@"E:\Code\mmbot\MMBot\Scripts\whenisay.csx"); |
<<<<<<<
uiImages.Add("ExcelSplitRangeByColumnCommand", taskt.Properties.Resources.command_spreadsheet);
=======
uiImages.Add("WordCreateApplicationCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordCloseApplicationCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordOpenDocumentCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordSaveCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordSaveAsCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordExportToPDFCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordAddDocumentCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordReadDocumentCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordReplaceTextCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordAppendTextCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordAppendImageCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordAppendDataTableCommand", taskt.Properties.Resources.command_files);
>>>>>>>
uiImages.Add("WordCreateApplicationCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordCloseApplicationCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordOpenDocumentCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordSaveCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordSaveAsCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordExportToPDFCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordAddDocumentCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordReadDocumentCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordReplaceTextCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordAppendTextCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordAppendImageCommand", taskt.Properties.Resources.command_files);
uiImages.Add("WordAppendDataTableCommand", taskt.Properties.Resources.command_files);
uiImages.Add("ExcelSplitRangeByColumnCommand", taskt.Properties.Resources.command_spreadsheet); |
<<<<<<<
newLocation.FileLocation.UriBaseId.ShouldBeEquivalentTo(rootName, "We should set the root name for these.");
newLocation.FileLocation.Uri.Should().Be(baseUri.MakeRelativeUri(locationUri).ToString(), "Base URI should be relative if the expected difference is there.");
newLocation.FileLocation.Uri.Should().Be(expectedDifference, "We expect this difference.");
=======
newLocation.FileLocation.UriBaseId.Should().BeEquivalentTo(rootName, "We should set the root name for these.");
newLocation.FileLocation.Uri.Should().BeEquivalentTo(baseUri.MakeRelativeUri(locationUri), "Base URI should be relative if the expected difference is there.");
newLocation.FileLocation.Uri.ToString().Should().BeEquivalentTo(expectedDifference, "We expect this difference.");
>>>>>>>
newLocation.FileLocation.UriBaseId.Should().BeEquivalentTo(rootName, "We should set the root name for these.");
newLocation.FileLocation.Uri.Should().Be(baseUri.MakeRelativeUri(locationUri).ToString(), "Base URI should be relative if the expected difference is there.");
newLocation.FileLocation.Uri.Should().Be(expectedDifference, "We expect this difference."); |
<<<<<<<
foreach (var value_6 in obj.Attachments)
=======
foreach (var value_9 in obj.ConversionProvenance)
>>>>>>>
foreach (var value_9 in obj.Attachments)
<<<<<<<
foreach (var value_7 in obj.ConversionProvenance)
=======
foreach (var value_10 in obj.Fixes)
>>>>>>>
foreach (var value_10 in obj.ConversionProvenance) |
<<<<<<<
ToolResultsLogKind SyntaxKind { get; }
=======
SarifGrammarKind Kind { get; }
>>>>>>>
SarifGrammarKind SyntaxKind { get; }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.AnnotatedCodeLocation; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.AnnotatedCodeLocation; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.AnnotatedCodeLocation; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.FileChange; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.FileChange; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.FileChange; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.FileReference; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.FileReference; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.FileReference; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.Fix; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.Fix; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.Fix; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.Hash; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.Hash; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.Hash; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.Location; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.Location; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.Location; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.LogicalLocationComponent; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.LogicalLocationComponent; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.LogicalLocationComponent; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.PhysicalLocationComponent; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.PhysicalLocationComponent; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.PhysicalLocationComponent; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.Region; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.Region; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.Region; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.Replacement; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.Replacement; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.Replacement; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.Result; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.Result; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.Result; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.ResultLog; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.ResultLog; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.ResultLog; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.RunInfo; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.RunInfo; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.RunInfo; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.RunLog; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.RunLog; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.RunLog; } }
<<<<<<<
public ToolResultsLogKind SyntaxKind { get { return ToolResultsLogKind.ToolInfo; } }
=======
public SarifGrammarKind Kind { get { return SarifGrammarKind.ToolInfo; } }
>>>>>>>
public SarifGrammarKind SyntaxKind { get { return SarifGrammarKind.ToolInfo; } } |
<<<<<<<
RuleKey = v2Result.RuleId,
=======
>>>>>>>
<<<<<<<
if (v2Result.AnalysisTarget != null)
{
// TODO: set Uri on result.Locations[0]
}
=======
if (_currentV2Run.Resources?.Rules != null)
{
IDictionary<string, Rule> rules = _currentV2Run.Resources.Rules;
Rule v2Rule;
if (v2Result.RuleId != null &&
rules.TryGetValue(v2Result.RuleId, out v2Rule) &&
v2Rule.Id != v2Result.RuleId)
{
result.RuleId = v2Rule.Id;
result.RuleKey = v2Result.RuleId;
}
else
{
result.RuleId = v2Result.RuleId;
}
}
else
{
result.RuleId = v2Result.RuleId;
}
>>>>>>>
if (v2Result.AnalysisTarget != null)
{
// TODO: set Uri on result.Locations[0]
}
if (_currentV2Run.Resources?.Rules != null)
{
IDictionary<string, Rule> rules = _currentV2Run.Resources.Rules;
Rule v2Rule;
if (v2Result.RuleId != null &&
rules.TryGetValue(v2Result.RuleId, out v2Rule) &&
v2Rule.Id != v2Result.RuleId)
{
result.RuleId = v2Rule.Id;
result.RuleKey = v2Result.RuleId;
}
else
{
result.RuleId = v2Result.RuleId;
}
}
else
{
result.RuleId = v2Result.RuleId;
} |
<<<<<<<
=======
public static Rule CreateRule(RuleVersionOne v1Rule)
{
Rule rule = null;
if (v1Rule != null)
{
rule = new Rule
{
Id = v1Rule.Id,
MessageStrings = v1Rule.MessageFormats,
Properties = v1Rule.Properties
};
RuleConfigurationDefaultLevel level = SarifTransformerUtilities.CreateRuleConfigurationDefaultLevel(v1Rule.DefaultLevel);
if (v1Rule.Configuration == RuleConfigurationVersionOne.Enabled ||
level != RuleConfigurationDefaultLevel.Warning)
{
rule.Configuration = new RuleConfiguration
{
DefaultLevel = level,
Enabled = v1Rule.Configuration == RuleConfigurationVersionOne.Enabled
};
}
if (!string.IsNullOrWhiteSpace(v1Rule.Name))
{
rule.Name = new Message
{
Text = v1Rule.Name
};
}
if (!string.IsNullOrWhiteSpace(v1Rule.FullDescription))
{
rule.FullDescription = new Message
{
Text = v1Rule.FullDescription
};
}
if (!string.IsNullOrWhiteSpace(v1Rule.ShortDescription))
{
rule.ShortDescription = new Message
{
Text = v1Rule.ShortDescription
};
}
if (v1Rule.HelpUri != null)
{
rule.HelpLocation = new FileLocation
{
Uri = v1Rule.HelpUri
};
}
if (v1Rule.Tags.Count > 0)
{
rule.Tags.UnionWith(v1Rule.Tags);
}
}
return rule;
}
private static IList<FileLocation> CreateResponseFilesList(IDictionary<string, string> responseFileToContentsDictionary, Run run)
{
List<FileLocation> fileLocations = null;
if (responseFileToContentsDictionary != null)
{
fileLocations = new List<FileLocation>();
foreach (string key in responseFileToContentsDictionary.Keys)
{
var fileLocation = new FileLocation
{
Uri = new Uri(key, UriKind.RelativeOrAbsolute)
};
fileLocations.Add(fileLocation);
if (run != null && !string.IsNullOrWhiteSpace(responseFileToContentsDictionary[key]))
{
// We have contents, so mention this file in run.files
if (run.Files == null)
{
run.Files = new Dictionary<string, FileData>();
}
if (!run.Files.ContainsKey(key))
{
run.Files.Add(key, new FileData());
}
FileData responseFile = run.Files[key];
responseFile.Contents = new FileContent
{
Text = responseFileToContentsDictionary[key]
};
responseFile.FileLocation = fileLocation;
}
}
}
return fileLocations;
}
>>>>>>> |
<<<<<<<
Init(other.RuleId, other.RuleKey, other.Level, other.Message, other.RichMessage, other.TemplatedMessage, other.Locations, other.Snippet, other.Id, other.ToolFingerprintContribution, other.Stacks, other.CodeFlows, other.RelatedLocations, other.SuppressionStates, other.Attachments, other.BaselineState, other.ConversionProvenance, other.Fixes, other.Properties);
=======
Init(other.RuleId, other.RuleKey, other.Level, other.Message, other.RichMessage, other.TemplatedMessage, other.Locations, other.Snippet, other.Id, other.ToolFingerprintContributions, other.Stacks, other.CodeFlows, other.RelatedLocations, other.SuppressionStates, other.BaselineState, other.ConversionProvenance, other.Fixes, other.Properties);
>>>>>>>
Init(other.RuleId, other.RuleKey, other.Level, other.Message, other.RichMessage, other.TemplatedMessage, other.Locations, other.Snippet, other.Id, other.ToolFingerprintContributions, other.Stacks, other.CodeFlows, other.RelatedLocations, other.SuppressionStates, other.Attachments, other.BaselineState, other.ConversionProvenance, other.Fixes, other.Properties);
<<<<<<<
private void Init(string ruleId, string ruleKey, ResultLevel level, string message, string richMessage, TemplatedMessage templatedMessage, IEnumerable<Location> locations, string snippet, string id, string toolFingerprintContribution, IEnumerable<Stack> stacks, IEnumerable<CodeFlow> codeFlows, IEnumerable<AnnotatedCodeLocation> relatedLocations, SuppressionStates suppressionStates, IEnumerable<Attachment> attachments, BaselineState baselineState, IEnumerable<AnalysisToolLogFileContents> conversionProvenance, IEnumerable<Fix> fixes, IDictionary<string, SerializedPropertyInfo> properties)
=======
private void Init(string ruleId, string ruleKey, ResultLevel level, string message, string richMessage, TemplatedMessage templatedMessage, IEnumerable<Location> locations, string snippet, string id, IDictionary<string, string> toolFingerprintContributions, IEnumerable<Stack> stacks, IEnumerable<CodeFlow> codeFlows, IEnumerable<AnnotatedCodeLocation> relatedLocations, SuppressionStates suppressionStates, BaselineState baselineState, IEnumerable<AnalysisToolLogFileContents> conversionProvenance, IEnumerable<Fix> fixes, IDictionary<string, SerializedPropertyInfo> properties)
>>>>>>>
private void Init(string ruleId, string ruleKey, ResultLevel level, string message, string richMessage, TemplatedMessage templatedMessage, IEnumerable<Location> locations, string snippet, string id, IDictionary<string, string> toolFingerprintContributions, IEnumerable<Stack> stacks, IEnumerable<CodeFlow> codeFlows, IEnumerable<AnnotatedCodeLocation> relatedLocations, SuppressionStates suppressionStates, IEnumerable<Attachment> attachments, BaselineState baselineState, IEnumerable<AnalysisToolLogFileContents> conversionProvenance, IEnumerable<Fix> fixes, IDictionary<string, SerializedPropertyInfo> properties) |
<<<<<<<
_run.Files[fileDataKey] = FileData.Create(new Uri(uri, UriKind.RelativeOrAbsolute), _loggingOptions, null, encoding);
=======
_run.Files[fileDataKey] = FileData.Create(uri, _dataToInsert, null, encoding);
>>>>>>>
_run.Files[fileDataKey] = FileData.Create(new Uri(uri, UriKind.RelativeOrAbsolute), _dataToInsert, null, encoding); |
<<<<<<<
Init(other.RuleId, other.RuleKey, other.Level, other.Message, other.RichMessage, other.TemplatedMessage, other.AnalysisTarget, other.Locations, other.Snippet, other.Id, other.ToolFingerprintContributions, other.Stacks, other.CodeFlows, other.RelatedLocations, other.SuppressionStates, other.BaselineState, other.ConversionProvenance, other.Fixes, other.Properties);
=======
Init(other.RuleId, other.RuleKey, other.Level, other.Message, other.RichMessage, other.TemplatedMessage, other.Locations, other.Snippet, other.Id, other.ToolFingerprintContributions, other.Stacks, other.CodeFlows, other.RelatedLocations, other.SuppressionStates, other.Attachments, other.BaselineState, other.ConversionProvenance, other.Fixes, other.Properties);
>>>>>>>
Init(other.RuleId, other.RuleKey, other.Level, other.Message, other.RichMessage, other.TemplatedMessage, other.AnalysisTarget, other.Locations, other.Snippet, other.Id, other.ToolFingerprintContributions, other.Stacks, other.CodeFlows, other.RelatedLocations, other.SuppressionStates, other.Attachments, other.BaselineState, other.ConversionProvenance, other.Fixes, other.Properties);
<<<<<<<
private void Init(string ruleId, string ruleKey, ResultLevel level, string message, string richMessage, TemplatedMessage templatedMessage, FileLocation analysisTarget, IEnumerable<Location> locations, string snippet, string id, IDictionary<string, string> toolFingerprintContributions, IEnumerable<Stack> stacks, IEnumerable<CodeFlow> codeFlows, IEnumerable<AnnotatedCodeLocation> relatedLocations, SuppressionStates suppressionStates, BaselineState baselineState, IEnumerable<AnalysisToolLogFileContents> conversionProvenance, IEnumerable<Fix> fixes, IDictionary<string, SerializedPropertyInfo> properties)
=======
private void Init(string ruleId, string ruleKey, ResultLevel level, string message, string richMessage, TemplatedMessage templatedMessage, IEnumerable<Location> locations, string snippet, string id, IDictionary<string, string> toolFingerprintContributions, IEnumerable<Stack> stacks, IEnumerable<CodeFlow> codeFlows, IEnumerable<AnnotatedCodeLocation> relatedLocations, SuppressionStates suppressionStates, IEnumerable<Attachment> attachments, BaselineState baselineState, IEnumerable<AnalysisToolLogFileContents> conversionProvenance, IEnumerable<Fix> fixes, IDictionary<string, SerializedPropertyInfo> properties)
>>>>>>>
private void Init(string ruleId, string ruleKey, ResultLevel level, string message, string richMessage, TemplatedMessage templatedMessage, FileLocation analysisTarget, IEnumerable<Location> locations, string snippet, string id, IDictionary<string, string> toolFingerprintContributions, IEnumerable<Stack> stacks, IEnumerable<CodeFlow> codeFlows, IEnumerable<AnnotatedCodeLocation> relatedLocations, SuppressionStates suppressionStates, IEnumerable<Attachment> attachments, BaselineState baselineState, IEnumerable<AnalysisToolLogFileContents> conversionProvenance, IEnumerable<Fix> fixes, IDictionary<string, SerializedPropertyInfo> properties) |
<<<<<<<
EnsureInitialized();
EnsureNoInProgressSerialization();
EnsureStateNotAlreadySet(Conditions.Disposed | Conditions.ToolInfoWritten);
=======
this.EnsureNotDisposed();
if (_writeState == State.WritingResults)
{
throw new InvalidOperationException(SarifResources.ToolInfoAlreadyWritten);
}
Debug.Assert(_writeState == State.Initial);
_jsonWriter.WriteStartObject(); // Begin: sarifLog
_jsonWriter.WritePropertyName("version");
_jsonWriter.WriteValue(SarifVersion.OneZeroZeroBetaTwo.ConvertToText());
_jsonWriter.WritePropertyName("runLogs");
_jsonWriter.WriteStartArray(); // Begin: runLogs
_jsonWriter.WriteStartObject(); // Begin: runLog
>>>>>>>
EnsureInitialized();
EnsureNoInProgressSerialization();
EnsureStateNotAlreadySet(Conditions.Disposed | Conditions.ToolInfoWritten);
_jsonWriter.WriteStartObject(); // Begin: sarifLog
_jsonWriter.WriteValue(SarifVersion.OneZeroZeroBetaTwo.ConvertToText());
<<<<<<<
public void OpenResults()
{
EnsureInitialized();
EnsureStateNotAlreadySet(Conditions.Disposed | Conditions.ResultsInitialized | Conditions.ResultsClosed);
_jsonWriter.WritePropertyName("results");
_jsonWriter.WriteStartArray(); // Begin: results
_writeConditions |= Conditions.ResultsInitialized;
}
/// <summary>Writes a result to the log. The log must have tool info written first by calling
/// <see cref="M:WriteToolInfo" />.</summary>
/// <remarks>This function makes a copy of the data stored in <paramref name="result"/>; if a
=======
/// <summary>
/// Writes a result to the log. The log must have tool and run info written first by calling
/// <see cref="M:WriteToolAndRunInfo" />.
/// </summary>
/// <remarks>
/// This function makes a copy of the data stored in <paramref name="result"/>; if a
>>>>>>>
/// <summary>
/// Writes a result to the log. The log must have tool and run info written first by calling
/// <see cref="M:WriteToolAndRunInfo" />.
/// </summary>
/// <remarks>
/// This function makes a copy of the data stored in <paramref name="result"/>; if a
_jsonWriter.WriteStartArray(); // Begin: results
_writeConditions |= Conditions.ResultsInitialized;
} |
<<<<<<<
public bool RenameRefactoringEnabled
{
get { return chbRenameRefactoring.Checked; }
set { chbRenameRefactoring.Checked = value; }
}
=======
public bool DepthColorizerEnabled
{
get { return chbDepthColorizer.Checked; }
set { chbDepthColorizer.Checked = value; }
}
>>>>>>>
public bool RenameRefactoringEnabled
{
get { return chbRenameRefactoring.Checked; }
set { chbRenameRefactoring.Checked = value; }
}
public bool DepthColorizerEnabled
{
get { return chbDepthColorizer.Checked; }
set { chbDepthColorizer.Checked = value; }
}
<<<<<<<
chbRenameRefactoring.Checked = OptionsPage.RenameRefactoringEnabled;
=======
chbDepthColorizer.Checked = OptionsPage.DepthColorizerEnabled;
>>>>>>>
chbRenameRefactoring.Checked = OptionsPage.RenameRefactoringEnabled;
chbDepthColorizer.Checked = OptionsPage.DepthColorizerEnabled; |
<<<<<<<
using Microsoft.VisualStudio.Text.Classification;
using Microsoft.VisualStudio.Text.Formatting;
=======
using EnvDTE;
using EnvDTE80;
using FSharpVSPowerTools.Folders;
>>>>>>>
using Microsoft.VisualStudio.Text.Classification;
using Microsoft.VisualStudio.Text.Formatting;
using EnvDTE;
using EnvDTE80;
using FSharpVSPowerTools.Folders;
<<<<<<<
private const uint WM_SYSCOLORCHANGE = 0x0015;
private IVsShell shellService;
private uint broadcastEventCookie;
private ClassificationColorManager classificationColorManager;
=======
internal static Lazy<DTE2> DTE
= new Lazy<DTE2>(() => ServiceProvider.GlobalProvider.GetService(typeof(DTE)) as DTE2);
>>>>>>>
private const uint WM_SYSCOLORCHANGE = 0x0015;
private IVsShell shellService;
private uint broadcastEventCookie;
internal static Lazy<DTE2> DTE
= new Lazy<DTE2>(() => ServiceProvider.GlobalProvider.GetService(typeof(DTE)) as DTE2);
private ClassificationColorManager classificationColorManager; |
<<<<<<<
bool TaskListCommentsEnabled { get; set; }
=======
bool GoToMetadataEnabled { get; set; }
>>>>>>>
bool TaskListCommentsEnabled { get; set; }
bool GoToMetadataEnabled { get; set; }
<<<<<<<
TaskListCommentsEnabled = true;
=======
GoToMetadataEnabled = true;
>>>>>>>
TaskListCommentsEnabled = true;
GoToMetadataEnabled = true;
<<<<<<<
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public bool TaskListCommentsEnabled { get; set; }
=======
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public bool GoToMetadataEnabled { get; set; }
>>>>>>>
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public bool TaskListCommentsEnabled { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public bool GoToMetadataEnabled { get; set; }
<<<<<<<
TaskListCommentsEnabled = _optionsControl.TaskListCommentsEnabled;
=======
GoToMetadataEnabled = _optionsControl.GoToMetadataEnabled;
>>>>>>>
TaskListCommentsEnabled = _optionsControl.TaskListCommentsEnabled;
GoToMetadataEnabled = _optionsControl.GoToMetadataEnabled; |
<<<<<<<
delegate { return GetDialogPage(typeof(FantomasOptionsPage)); }, promote:true);
=======
delegate { return GetDialogPage(typeof(FantomasOptionsPage)); }, true);
VSUtils.SolutionEvents.Initialize();
>>>>>>>
delegate { return GetDialogPage(typeof(FantomasOptionsPage)); }, promote:true);
VSUtils.SolutionEvents.Initialize(); |
<<<<<<<
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public bool RenameRefactoringEnabled { get; set; }
=======
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public bool DepthColorizerEnabled { get; set; }
>>>>>>>
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public bool RenameRefactoringEnabled { get; set; }
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public bool DepthColorizerEnabled { get; set; }
<<<<<<<
_optionsControl.RenameRefactoringEnabled = RenameRefactoringEnabled;
=======
_optionsControl.DepthColorizerEnabled = DepthColorizerEnabled;
>>>>>>>
_optionsControl.RenameRefactoringEnabled = RenameRefactoringEnabled;
_optionsControl.DepthColorizerEnabled = DepthColorizerEnabled;
<<<<<<<
RenameRefactoringEnabled = true;
=======
DepthColorizerEnabled = true;
>>>>>>>
RenameRefactoringEnabled = true;
DepthColorizerEnabled = true;
<<<<<<<
RenameRefactoringEnabled = _optionsControl.RenameRefactoringEnabled;
=======
DepthColorizerEnabled = _optionsControl.DepthColorizerEnabled;
>>>>>>>
RenameRefactoringEnabled = _optionsControl.RenameRefactoringEnabled;
DepthColorizerEnabled = _optionsControl.DepthColorizerEnabled; |
<<<<<<<
using FSharpVSPowerTools.Navigation;
=======
using Microsoft.VisualStudio.Text.Classification;
using Microsoft.VisualStudio.Text.Formatting;
using EnvDTE;
using EnvDTE80;
using FSharpVSPowerTools.Folders;
>>>>>>>
<<<<<<<
private uint objectManagerCookie;
private FSharpLibrary library;
=======
private const uint WM_SYSCOLORCHANGE = 0x0015;
private IVsShell shellService;
private FolderMenuCommands newFolderMenu;
private uint broadcastEventCookie;
private uint pctCookie;
internal static Lazy<DTE2> DTE
= new Lazy<DTE2>(() => ServiceProvider.GlobalProvider.GetService(typeof(DTE)) as DTE2);
private ClassificationColorManager classificationColorManager;
private void SetupMenu()
{
var mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
var shell = GetService(typeof(SVsUIShell)) as IVsUIShell;
if (mcs != null)
{
newFolderMenu = new FolderMenuCommands(DTE.Value, mcs, shell);
newFolderMenu.SetupCommands();
}
}
>>>>>>>
private const uint WM_SYSCOLORCHANGE = 0x0015;
private IVsShell shellService;
private FolderMenuCommands newFolderMenu;
private FSharpLibrary library;
private uint broadcastEventCookie;
private uint pctCookie;
private uint objectManagerCookie;
internal static Lazy<DTE2> DTE
= new Lazy<DTE2>(() => ServiceProvider.GlobalProvider.GetService(typeof(DTE)) as DTE2);
private ClassificationColorManager classificationColorManager;
private void SetupMenu()
{
var mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
var shell = GetService(typeof(SVsUIShell)) as IVsUIShell;
if (mcs != null)
{
newFolderMenu = new FolderMenuCommands(DTE.Value, mcs, shell);
newFolderMenu.SetupCommands();
}
}
<<<<<<<
delegate { return GetDialogPage(typeof(FantomasOptionsPage)); }, promote:true);
library = new FSharpLibrary(PkgCmdConst.guidSymbolLibrary);
library.LibraryCapabilities = (_LIB_FLAGS2)_LIB_FLAGS.LF_PROJECT;
RegisterLibrary();
}
private void RegisterLibrary()
{
if (0 == objectManagerCookie)
{
IVsObjectManager2 objManager = GetService(typeof(SVsObjectManager)) as IVsObjectManager2;
if (null == objManager)
{
return;
}
ErrorHandler.ThrowOnFailure(objManager.RegisterSimpleLibrary(library, out objectManagerCookie));
}
=======
delegate { return GetDialogPage(typeof(FantomasOptionsPage)); }, promote: true);
var generalOptions = GetService(typeof(GeneralOptionsPage)) as GeneralOptionsPage;
if (generalOptions.FolderOrganizationEnabled)
{
SetupMenu();
var rpct = (IVsRegisterPriorityCommandTarget)GetService(typeof(SVsRegisterPriorityCommandTarget));
rpct.RegisterPriorityCommandTarget(0, newFolderMenu, out pctCookie);
}
}
public int OnBroadcastMessage(uint msg, IntPtr wParam, IntPtr lParam)
{
if (msg == WM_SYSCOLORCHANGE)
{
classificationColorManager.UpdateColors();
}
return VSConstants.S_OK;
}
public void Dispose()
{
if (shellService != null && broadcastEventCookie != 0)
{
shellService.UnadviseBroadcastMessages(broadcastEventCookie);
broadcastEventCookie = 0;
}
if (pctCookie != 0)
{
var rpct = (IVsRegisterPriorityCommandTarget)GetService(typeof(SVsRegisterPriorityCommandTarget));
if (rpct != null)
{
rpct.UnregisterPriorityCommandTarget(pctCookie);
pctCookie = 0;
}
}
>>>>>>>
delegate { return GetDialogPage(typeof(FantomasOptionsPage)); }, promote:true);
var generalOptions = GetService(typeof(GeneralOptionsPage)) as GeneralOptionsPage;
if (generalOptions.FolderOrganizationEnabled)
{
SetupMenu();
var rpct = (IVsRegisterPriorityCommandTarget)GetService(typeof(SVsRegisterPriorityCommandTarget));
rpct.RegisterPriorityCommandTarget(0, newFolderMenu, out pctCookie);
}
library = new FSharpLibrary(Navigation.PkgCmdConst.guidSymbolLibrary);
library.LibraryCapabilities = (_LIB_FLAGS2)_LIB_FLAGS.LF_PROJECT;
RegisterLibrary();
}
private void RegisterLibrary()
{
if (objectManagerCookie == 0)
{
IVsObjectManager2 objManager = GetService(typeof(SVsObjectManager)) as IVsObjectManager2;
if (objManager == null) return;
ErrorHandler.ThrowOnFailure(objManager.RegisterSimpleLibrary(library, out objectManagerCookie));
}
}
public int OnBroadcastMessage(uint msg, IntPtr wParam, IntPtr lParam)
{
if (msg == WM_SYSCOLORCHANGE)
{
classificationColorManager.UpdateColors();
}
return VSConstants.S_OK;
}
public void Dispose()
{
if (shellService != null && broadcastEventCookie != 0)
{
shellService.UnadviseBroadcastMessages(broadcastEventCookie);
broadcastEventCookie = 0;
}
if (pctCookie != 0)
{
var rpct = (IVsRegisterPriorityCommandTarget)GetService(typeof(SVsRegisterPriorityCommandTarget));
if (rpct != null)
{
rpct.UnregisterPriorityCommandTarget(pctCookie);
pctCookie = 0;
}
}
if (objectManagerCookie != 0)
{
IVsObjectManager2 objManager = GetService(typeof(SVsObjectManager)) as IVsObjectManager2;
if (objManager != null)
objManager.UnregisterLibrary(objectManagerCookie);
} |
<<<<<<<
return Task.Run(() =>
{
var list = _dbRepository.Where<ApiResource>(a => a.Scopes.Any(s => scopeNames.Contains(s.Name)));
var t = list.ToList();
return list.AsEnumerable();
});
=======
var list = _dbRepository.Where<ApiResource>(a => scopeNames.Contains(a.Name));
>>>>>>>
var list = _dbRepository.Where<ApiResource>(a => a.Scopes.Any(s => scopeNames.Contains(s.Name))); |
<<<<<<<
[InputTemplate()]
=======
internal static class OculusSupport
{
internal static string FilterLayout(XRDeviceDescriptor deviceDescriptor)
{
if (deviceDescriptor.manufacturer == "__Oculus__" || deviceDescriptor.manufacturer == "Oculus")
{
if ((deviceDescriptor.deviceName == "Oculus Rift" || String.IsNullOrEmpty(deviceDescriptor.deviceName)) && deviceDescriptor.deviceRole == EDeviceRole.Generic)
{
return "OculusHMD";
}
else if (deviceDescriptor.deviceName.StartsWith("Oculus Touch Controller") && (deviceDescriptor.deviceRole == EDeviceRole.LeftHanded || deviceDescriptor.deviceRole == EDeviceRole.RightHanded))
{
return "OculusTouchController";
}
}
return null;
}
}
[StructLayout(LayoutKind.Explicit, Size = 309)]
public struct OculusHMDState : IInputStateTypeInfo
{
[InputControl(layout = "Integer")]
[FieldOffset(0)]
public int trackingState;
[InputControl(layout = "Button")]
[FieldOffset(4)]
public bool isTracked;
[InputControl(layout = "Vector3")]
[FieldOffset(5)]
public Vector3 devicePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(17)]
public Quaternion deviceRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(33)]
public Vector3 deviceVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(45)]
public Vector3 deviceAngularVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(57)]
public Vector3 deviceAcceleration;
[InputControl(layout = "Vector3")]
[FieldOffset(69)]
public Vector3 deviceAngularAcceleration;
[InputControl(layout = "Vector3")]
[FieldOffset(81)]
public Vector3 leftEyePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(93)]
public Quaternion leftEyeRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(109)]
public Vector3 leftEyeVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(121)]
public Vector3 leftEyeAngularVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(133)]
public Vector3 leftEyeAcceleration;
[InputControl(layout = "Vector3")]
[FieldOffset(145)]
public Vector3 leftEyeAngularAcceleration;
[InputControl(layout = "Vector3")]
[FieldOffset(157)]
public Vector3 rightEyePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(169)]
public Quaternion rightEyeRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(185)]
public Vector3 rightEyeVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(197)]
public Vector3 rightEyeAngularVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(209)]
public Vector3 rightEyeAcceleration;
[InputControl(layout = "Vector3")]
[FieldOffset(221)]
public Vector3 rightEyeAngularAcceleration;
[InputControl(layout = "Vector3")]
[FieldOffset(233)]
public Vector3 centerEyePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(245)]
public Quaternion centerEyeRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(261)]
public Vector3 centerEyeVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(273)]
public Vector3 centerEyeAngularVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(285)]
public Vector3 centerEyeAcceleration;
[InputControl(layout = "Vector3")]
[FieldOffset(297)]
public Vector3 centerEyeAngularAcceleration;
public FourCC GetFormat()
{
return new FourCC('X', 'R', 'S', '0');
}
}
[InputControlLayout(stateType = typeof(OculusHMDState))]
>>>>>>>
[InputControlLayout()]
<<<<<<<
base.FinishSetup(setup);
=======
base.FinishSetup(builder);
active = this;
>>>>>>>
base.FinishSetup(builder);
<<<<<<<
[InputTemplate(commonUsages = new[] { "LeftHand", "RightHand" })]
=======
[StructLayout(LayoutKind.Explicit, Size = 118)]
public struct OculusTouchControllerState : IInputStateTypeInfo
{
[InputControl(layout = "Analog")]
[FieldOffset(0)]
public float combinedTrigger;
[InputControl(layout = "Vector2")]
[FieldOffset(4)]
public Vector2 joystick;
[InputControl(layout = "Analog")]
[FieldOffset(12)]
public float trigger;
[InputControl(layout = "Analog")]
[FieldOffset(16)]
public float grip;
[InputControl(layout = "Analog")]
[FieldOffset(20)]
public float indexNearTouch;
[InputControl(layout = "Analog")]
[FieldOffset(24)]
public float thumbNearTouch;
[InputControl(layout = "Button", aliases = new[] { "a", "x"})]
[FieldOffset(28)]
public bool primaryButton;
[InputControl(layout = "Button", aliases = new[] { "b", "y" })]
[FieldOffset(29)]
public bool secondaryButton;
[InputControl(layout = "Button")]
[FieldOffset(30)]
public bool start;
[InputControl(layout = "Button")]
[FieldOffset(31)]
public bool thumbstickClick;
[InputControl(layout = "Button", aliases = new[] { "aTouch", "xTouch" })]
[FieldOffset(32)]
public bool primaryTouch;
[InputControl(layout = "Button", aliases = new[] { "bTouch", "yTouch" })]
[FieldOffset(33)]
public bool secondaryTouch;
[InputControl(layout = "Button")]
[FieldOffset(34)]
public bool indexTouch;
[InputControl(layout = "Button")]
[FieldOffset(35)]
public bool thumbstickTouch;
[InputControl(layout = "Button")]
[FieldOffset(36)]
public bool thumbrestTouch;
[InputControl(layout = "Integer")]
[FieldOffset(37)]
public int trackingState;
[InputControl(layout = "Button")]
[FieldOffset(41)]
public bool isTracked;
[InputControl(layout = "Vector3")]
[FieldOffset(42)]
public Vector3 devicePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(54)]
public Quaternion deviceRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(70)]
public Vector3 deviceVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(82)]
public Vector3 deviceAngularVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(94)]
public Vector3 deviceAcceleration;
[InputControl(layout = "Vector3")]
[FieldOffset(106)]
public Vector3 deviceAngularAcceleration;
public FourCC GetFormat()
{
return new FourCC('X', 'R', 'S', '0');
}
}
[InputControlLayout(stateType = typeof(OculusTouchControllerState), commonUsages = new[] { "LeftHand", "RightHand" })]
>>>>>>>
[InputControlLayout(commonUsages = new[] { "LeftHand", "RightHand" })] |
<<<<<<<
.WithInterface(XRUtilities.kXRInterfaceMatchingPattern)
=======
.WithInterface(XRUtilities.kXRInterface)
>>>>>>>
.WithInterface(XRUtilities.kXRInterfaceMatchingPattern)
<<<<<<<
.WithInterface(XRUtilities.kXRInterfaceMatchingPattern)
.WithProduct("Spatial Controller"));
=======
.WithInterface(XRUtilities.kXRInterface)
.WithProduct("^(Spatial Controller)"));
>>>>>>>
.WithInterface(XRUtilities.kXRInterfaceMatchingPattern)
.WithProduct("^(Spatial Controller)")); |
<<<<<<<
[NonSerialized] internal StateChangeMonitorsForDevice[] m_StateChangeMonitors;
=======
internal StateChangeMonitorsForDevice[] m_StateChangeMonitors;
>>>>>>>
internal StateChangeMonitorsForDevice[] m_StateChangeMonitors;
<<<<<<<
device.m_LastUpdateTime = hasSignificantControlChanges ? currentEventTime : device.m_LastUpdateTime;
=======
device.m_LastUpdateTimeInternal = currentEventTimeInternal;
>>>>>>>
device.m_LastUpdateTimeInternal = hasSignificantControlChanges ? currentEventTimeInternal : device.m_LastUpdateTimeInternal;
<<<<<<<
if (finalDeviceCount != deviceCount)
Array.Resize(ref devices, finalDeviceCount);
m_Devices = devices;
////TODO: retry to make sense of available devices that we couldn't make sense of before; maybe we have a layout now
// At the moment, there's no support for taking state across domain reloads
// as we don't have support ATM for taking state across format changes.
m_StateBuffers.FreeAll();
ReallocateStateBuffers();
// Re-initialize default states.
// Once we have support for migrating state across domain reloads, this will no
// longer be necessary for devices that have not changed format.
for (var i = 0; i < m_Devices.Length; ++i)
{
InitializeDefaultState(m_Devices[i]);
m_Devices[i].noiseFilter = NoiseFilter.CreateDefaultNoiseFilter(m_Devices[i]);
}
=======
>>>>>>> |
<<<<<<<
using UnityEngine.InputSystem.XR.Haptics;
using UnityEngine.InputSystem.Haptics;
using UnityEngine.InputSystem.Layouts;
using UnityEngine.XR;
namespace UnityEngine.InputSystem.XR
{
/// <summary>
/// The base type of all XR head mounted displays. This can help organize shared behaviour across all HMDs.
/// </summary>
[InputControlLayout(isGenericTypeOfDevice = true, displayName = "XR HMD")]
public class XRHMD : InputDevice
{
}
/// <summary>
/// The base type for all XR handed controllers.
/// </summary>
[InputControlLayout(commonUsages = new[] { "LeftHand", "RightHand" }, isGenericTypeOfDevice = true)]
public class XRController : InputDevice
{
/// <summary>
/// A quick accessor for the currently active left handed device.
/// </summary>
/// <remarks>If there is no left hand connected, this will be null. This also matches any currently tracked device that contains the 'LeftHand' device usage.</remarks>
public static XRController leftHand => InputSystem.GetDevice<XRController>(CommonUsages.LeftHand);
//// <summary>
/// A quick accessor for the currently active right handed device. This is also tracked via usages on the device.
/// </summary>
/// <remarks>If there is no left hand connected, this will be null. This also matches any currently tracked device that contains the 'RightHand' device usage.</remarks>
public static XRController rightHand => InputSystem.GetDevice<XRController>(CommonUsages.RightHand);
protected override void FinishSetup()
{
base.FinishSetup();
var capabilities = description.capabilities;
var deviceDescriptor = XRDeviceDescriptor.FromJson(capabilities);
if (deviceDescriptor != null)
{
#if UNITY_2019_3_OR_NEWER
if ((deviceDescriptor.characteristics & InputDeviceCharacteristics.Left) != 0)
InputSystem.SetDeviceUsage(this, CommonUsages.LeftHand);
else if ((deviceDescriptor.characteristics & InputDeviceCharacteristics.Right) != 0)
InputSystem.SetDeviceUsage(this, CommonUsages.RightHand);
#else
if (deviceDescriptor.deviceRole == InputDeviceRole.LeftHanded)
InputSystem.SetDeviceUsage(this, CommonUsages.LeftHand);
else if (deviceDescriptor.deviceRole == InputDeviceRole.RightHanded)
InputSystem.SetDeviceUsage(this, CommonUsages.RightHand);
#endif
}
}
}
/// <summary>
/// Identifies a controller that is capable of rumble or haptics.
/// </summary>
public class XRControllerWithRumble : XRController
{
public void SendImpulse(float amplitude, float duration)
{
var command = SendHapticImpulseCommand.Create(0, amplitude, duration);
ExecuteCommand(ref command);
}
}
}
=======
using UnityEngine.InputSystem.XR.Haptics;
using UnityEngine.InputSystem.Haptics;
using UnityEngine.InputSystem.Layouts;
namespace UnityEngine.InputSystem.XR
{
/// <summary>
/// The base type of all XR head mounted displays. This can help organize shared behaviour across all HMDs.
/// </summary>
[InputControlLayout(isGenericTypeOfDevice = true, displayName = "XR HMD")]
[Scripting.Preserve]
public class XRHMD : InputDevice
{
}
/// <summary>
/// The base type for all XR handed controllers.
/// </summary>
[InputControlLayout(commonUsages = new[] { "LeftHand", "RightHand" }, isGenericTypeOfDevice = true)]
[Scripting.Preserve]
public class XRController : InputDevice
{
/// <summary>
/// A quick accessor for the currently active left handed device.
/// </summary>
/// <remarks>If there is no left hand connected, this will be null. This also matches any currently tracked device that contains the 'LeftHand' device usage.</remarks>
public static XRController leftHand => InputSystem.GetDevice<XRController>(CommonUsages.LeftHand);
//// <summary>
/// A quick accessor for the currently active right handed device. This is also tracked via usages on the device.
/// </summary>
/// <remarks>If there is no left hand connected, this will be null. This also matches any currently tracked device that contains the 'RightHand' device usage.</remarks>
public static XRController rightHand => InputSystem.GetDevice<XRController>(CommonUsages.RightHand);
protected override void FinishSetup()
{
base.FinishSetup();
var capabilities = description.capabilities;
var deviceDescriptor = XRDeviceDescriptor.FromJson(capabilities);
if (deviceDescriptor != null)
{
if (deviceDescriptor.deviceRole == DeviceRole.LeftHanded)
{
InputSystem.SetDeviceUsage(this, CommonUsages.LeftHand);
}
else if (deviceDescriptor.deviceRole == DeviceRole.RightHanded)
{
InputSystem.SetDeviceUsage(this, CommonUsages.RightHand);
}
}
}
}
/// <summary>
/// Identifies a controller that is capable of rumble or haptics.
/// </summary>
[Scripting.Preserve]
public class XRControllerWithRumble : XRController
{
public void SendImpulse(float amplitude, float duration)
{
var command = SendHapticImpulseCommand.Create(0, amplitude, duration);
ExecuteCommand(ref command);
}
}
}
>>>>>>>
using UnityEngine.InputSystem.XR.Haptics;
using UnityEngine.InputSystem.Haptics;
using UnityEngine.InputSystem.Layouts;
using UnityEngine.XR;
namespace UnityEngine.InputSystem.XR
{
/// <summary>
/// The base type of all XR head mounted displays. This can help organize shared behaviour across all HMDs.
/// </summary>
[InputControlLayout(isGenericTypeOfDevice = true, displayName = "XR HMD")]
[Scripting.Preserve]
public class XRHMD : InputDevice
{
}
/// <summary>
/// The base type for all XR handed controllers.
/// </summary>
[InputControlLayout(commonUsages = new[] { "LeftHand", "RightHand" }, isGenericTypeOfDevice = true)]
[Scripting.Preserve]
public class XRController : InputDevice
{
/// <summary>
/// A quick accessor for the currently active left handed device.
/// </summary>
/// <remarks>If there is no left hand connected, this will be null. This also matches any currently tracked device that contains the 'LeftHand' device usage.</remarks>
public static XRController leftHand => InputSystem.GetDevice<XRController>(CommonUsages.LeftHand);
//// <summary>
/// A quick accessor for the currently active right handed device. This is also tracked via usages on the device.
/// </summary>
/// <remarks>If there is no left hand connected, this will be null. This also matches any currently tracked device that contains the 'RightHand' device usage.</remarks>
public static XRController rightHand => InputSystem.GetDevice<XRController>(CommonUsages.RightHand);
protected override void FinishSetup()
{
base.FinishSetup();
var capabilities = description.capabilities;
var deviceDescriptor = XRDeviceDescriptor.FromJson(capabilities);
if (deviceDescriptor != null)
{
#if UNITY_2019_3_OR_NEWER
if ((deviceDescriptor.characteristics & InputDeviceCharacteristics.Left) != 0)
InputSystem.SetDeviceUsage(this, CommonUsages.LeftHand);
else if ((deviceDescriptor.characteristics & InputDeviceCharacteristics.Right) != 0)
InputSystem.SetDeviceUsage(this, CommonUsages.RightHand);
#else
if (deviceDescriptor.deviceRole == InputDeviceRole.LeftHanded)
InputSystem.SetDeviceUsage(this, CommonUsages.LeftHand);
else if (deviceDescriptor.deviceRole == InputDeviceRole.RightHanded)
InputSystem.SetDeviceUsage(this, CommonUsages.RightHand);
#endif
}
}
}
/// <summary>
/// Identifies a controller that is capable of rumble or haptics.
/// </summary>
[Scripting.Preserve]
public class XRControllerWithRumble : XRController
{
public void SendImpulse(float amplitude, float duration)
{
var command = SendHapticImpulseCommand.Create(0, amplitude, duration);
ExecuteCommand(ref command);
}
}
} |
<<<<<<<
[InputTemplate()]
=======
internal static class DaydreamSupport
{
internal static string FilterLayout(XRDeviceDescriptor deviceDescriptor)
{
if (String.IsNullOrEmpty(deviceDescriptor.manufacturer))
{
if (deviceDescriptor.deviceName == "Daydream HMD" && deviceDescriptor.deviceRole == EDeviceRole.Generic)
{
return "DaydreamHMD";
}
else if (deviceDescriptor.deviceName == "Daydream Controller" && (deviceDescriptor.deviceRole == EDeviceRole.LeftHanded || deviceDescriptor.deviceRole == EDeviceRole.RightHanded))
{
return "DaydreamController";
}
}
return null;
}
}
[StructLayout(LayoutKind.Explicit, Size = 120)]
public struct DaydreamHMDState : IInputStateTypeInfo
{
[InputControl(layout = "Integer")]
[FieldOffset(0)]
public int trackingState;
[InputControl(layout = "Button")]
[FieldOffset(4)]
public bool isTracked;
[InputControl(layout = "Vector3")]
[FieldOffset(8)]
public Vector3 devicePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(20)]
public Quaternion deviceRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(36)]
public Vector3 leftEyePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(48)]
public Quaternion leftEyeRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(64)]
public Vector3 rightEyePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(76)]
public Quaternion rightEyeRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(92)]
public Vector3 centerEyePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(104)]
public Quaternion centerEyeRotation;
public FourCC GetFormat()
{
return new FourCC('X', 'R', 'S', '0');
}
}
[InputControlLayout(stateType = typeof(DaydreamHMDState))]
>>>>>>>
[InputControlLayout()]
<<<<<<<
base.FinishSetup(setup);
=======
base.FinishSetup(builder);
active = this;
>>>>>>>
base.FinishSetup(builder);
<<<<<<<
[InputTemplate(commonUsages = new[] { "LeftHand", "RightHand" })]
=======
[StructLayout(LayoutKind.Explicit, Size = 100)]
public struct DaydreamControllerState : IInputStateTypeInfo
{
[InputControl(layout = "Vector2")]
[FieldOffset(0)]
public Vector2 touchpad;
[InputControl(layout = "Button")]
[FieldOffset(8)]
public bool volumeUp;
[InputControl(layout = "Button")]
[FieldOffset(12)]
public bool recentered;
[InputControl(layout = "Button")]
[FieldOffset(16)]
public bool volumeDown;
[InputControl(layout = "Button")]
[FieldOffset(20)]
public bool recentering;
[InputControl(layout = "Button")]
[FieldOffset(24)]
public bool app;
[InputControl(layout = "Button")]
[FieldOffset(28)]
public bool home;
[InputControl(layout = "Button")]
[FieldOffset(32)]
public bool touchpadClick;
[InputControl(layout = "Button")]
[FieldOffset(36)]
public bool touchpadTouch;
[InputControl(layout = "Integer")]
[FieldOffset(40)]
public int trackingState;
[InputControl(layout = "Button")]
[FieldOffset(44)]
public bool isTracked;
[InputControl(layout = "Vector3")]
[FieldOffset(48)]
public Vector3 devicePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(60)]
public Quaternion deviceRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(76)]
public Vector3 deviceVelocity;
[InputControl(layout = "Vector3")]
[FieldOffset(88)]
public Vector3 deviceAcceleration;
public FourCC GetFormat()
{
return new FourCC('X', 'R', 'S', '0');
}
}
[InputControlLayout(stateType = typeof(DaydreamControllerState), commonUsages = new[] { "LeftHand", "RightHand" })]
>>>>>>>
[InputControlLayout(commonUsages = new[] { "LeftHand", "RightHand" })]
<<<<<<<
touchpad = setup.GetControl<Vector2Control>("touchpad");
volumeUp = setup.GetControl<ButtonControl>("volumeUp");
recentered = setup.GetControl<ButtonControl>("recentered");
volumeDown = setup.GetControl<ButtonControl>("volumeDown");
recentering = setup.GetControl<ButtonControl>("recentering");
app = setup.GetControl<ButtonControl>("app");
home = setup.GetControl<ButtonControl>("home");
touchpadClick = setup.GetControl<ButtonControl>("touchpadClick");
touchpadTouch = setup.GetControl<ButtonControl>("touchpadTouch");
trackingState = setup.GetControl<IntegerControl>("trackingState");
isTracked = setup.GetControl<ButtonControl>("isTracked");
devicePosition = setup.GetControl<Vector3Control>("devicePosition");
deviceRotation = setup.GetControl<QuaternionControl>("deviceRotation");
deviceVelocity = setup.GetControl<Vector3Control>("deviceVelocity");
deviceAcceleration = setup.GetControl<Vector3Control>("deviceAcceleration");
=======
try
{
XRDeviceDescriptor deviceDescriptor = XRDeviceDescriptor.FromJson(description.capabilities);
switch (deviceDescriptor.deviceRole)
{
case EDeviceRole.LeftHanded:
{
InputSystem.SetUsage(this, CommonUsages.LeftHand);
leftHand = this;
break;
}
case EDeviceRole.RightHanded:
{
InputSystem.SetUsage(this, CommonUsages.RightHand);
rightHand = this;
break;
}
default:
break;
}
}
catch (Exception)
{}
touchpad = builder.GetControl<Vector2Control>("touchpad");
volumeUp = builder.GetControl<ButtonControl>("volumeUp");
recentered = builder.GetControl<ButtonControl>("recentered");
volumeDown = builder.GetControl<ButtonControl>("volumeDown");
recentering = builder.GetControl<ButtonControl>("recentering");
app = builder.GetControl<ButtonControl>("app");
home = builder.GetControl<ButtonControl>("home");
touchpadClick = builder.GetControl<ButtonControl>("touchpadClick");
touchpadTouch = builder.GetControl<ButtonControl>("touchpadTouch");
trackingState = builder.GetControl<IntegerControl>("trackingState");
isTracked = builder.GetControl<ButtonControl>("isTracked");
devicePosition = builder.GetControl<Vector3Control>("devicePosition");
deviceRotation = builder.GetControl<QuaternionControl>("deviceRotation");
deviceVelocity = builder.GetControl<Vector3Control>("deviceVelocity");
deviceAcceleration = builder.GetControl<Vector3Control>("deviceAcceleration");
>>>>>>>
touchpad = builder.GetControl<Vector2Control>("touchpad");
volumeUp = builder.GetControl<ButtonControl>("volumeUp");
recentered = builder.GetControl<ButtonControl>("recentered");
volumeDown = builder.GetControl<ButtonControl>("volumeDown");
recentering = builder.GetControl<ButtonControl>("recentering");
app = builder.GetControl<ButtonControl>("app");
home = builder.GetControl<ButtonControl>("home");
touchpadClick = builder.GetControl<ButtonControl>("touchpadClick");
touchpadTouch = builder.GetControl<ButtonControl>("touchpadTouch");
trackingState = builder.GetControl<IntegerControl>("trackingState");
isTracked = builder.GetControl<ButtonControl>("isTracked");
devicePosition = builder.GetControl<Vector3Control>("devicePosition");
deviceRotation = builder.GetControl<QuaternionControl>("deviceRotation");
deviceVelocity = builder.GetControl<Vector3Control>("deviceVelocity");
deviceAcceleration = builder.GetControl<Vector3Control>("deviceAcceleration"); |
<<<<<<<
=======
static List<Func<XRDeviceDescriptor, string>> availableLayouts = new List<Func<XRDeviceDescriptor, string>>();
>>>>>>>
<<<<<<<
char letter = templateName[i];
if (char.IsUpper(letter) || char.IsLower(letter) || char.IsDigit(letter) || letter == ':')
=======
char letter = layoutName[i];
if (Char.IsUpper(letter) || Char.IsLower(letter) || Char.IsDigit(letter) || letter == ':')
>>>>>>>
char letter = layoutName[i];
if (char.IsUpper(letter) || char.IsLower(letter) || char.IsDigit(letter) || letter == ':')
<<<<<<<
=======
// If the system found a matching layout, there's nothing for us to do.
if (!string.IsNullOrEmpty(matchedLayout))
{
return null;
}
>>>>>>>
<<<<<<<
var builder = new InputTemplate.Builder
=======
Type deviceType = null;
switch (descriptor.deviceRole)
{
case EDeviceRole.LeftHanded:
case EDeviceRole.RightHanded:
{
deviceType = typeof(XRController);
}
break;
default:
{
deviceType = typeof(XRHMD);
}
break;
}
var builder = new InputControlLayout.Builder
>>>>>>>
var builder = new InputControlLayout.Builder |
<<<<<<<
private class TestHMD : UnityEngine.InputSystem.InputDevice
=======
[Preserve]
private class TestHMD : InputDevice
>>>>>>>
[Preserve]
private class TestHMD : UnityEngine.InputSystem.InputDevice |
<<<<<<<
[InputTemplate()]
=======
internal static class WMRSupport
{
internal static string FilterLayout(XRDeviceDescriptor deviceDescriptor)
{
if (deviceDescriptor.manufacturer == "Microsoft")
{
if (deviceDescriptor.deviceName == "Windows Mixed Reality HMD" && deviceDescriptor.deviceRole == EDeviceRole.Generic)
{
return "WMRHMD";
}
else if (deviceDescriptor.deviceName == "Spatial Controller" && (deviceDescriptor.deviceRole == EDeviceRole.LeftHanded || deviceDescriptor.deviceRole == EDeviceRole.RightHanded))
{
return "WMRSpatialController";
}
}
return null;
}
}
[StructLayout(LayoutKind.Explicit, Size = 117)]
public struct WMRHMDState : IInputStateTypeInfo
{
[InputControl(layout = "Integer")]
[FieldOffset(0)]
public int trackingState;
[InputControl(layout = "Button")]
[FieldOffset(4)]
public bool isTracked;
[InputControl(layout = "Vector3")]
[FieldOffset(5)]
public Vector3 devicePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(17)]
public Vector3 deviceRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(33)]
public Vector3 leftEyePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(45)]
public Vector3 leftEyeRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(61)]
public Vector3 rightEyePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(73)]
public Vector3 rightEyeRotation;
[InputControl(layout = "Vector3")]
[FieldOffset(89)]
public Vector3 centerEyePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(101)]
public Vector3 centerEyeRotation;
public FourCC GetFormat()
{
return new FourCC('X', 'R', 'S', '0');
}
}
[InputControlLayout(stateType = typeof(WMRHMDState))]
>>>>>>>
[InputControlLayout()]
<<<<<<<
base.FinishSetup(setup);
=======
base.FinishSetup(builder);
active = this;
>>>>>>>
base.FinishSetup(builder);
<<<<<<<
=======
[InputControl(layout = "Analog")]
[FieldOffset(0)]
public float combinedTrigger;
[InputControl(layout = "Vector2")]
[FieldOffset(4)]
public Vector2 joystick;
[InputControl(layout = "Analog")]
[FieldOffset(12)]
public float trigger;
[InputControl(layout = "Analog")]
[FieldOffset(16)]
public float grip;
[InputControl(layout = "Vector2")]
[FieldOffset(20)]
public Vector2 touchpad;
[InputControl(layout = "Button")]
[FieldOffset(28)]
public bool gripPressed;
[InputControl(layout = "Button")]
[FieldOffset(29)]
public bool menu;
[InputControl(layout = "Button")]
[FieldOffset(30)]
public bool joystickClick;
[InputControl(layout = "Button")]
[FieldOffset(31)]
public bool triggerPressed;
[InputControl(layout = "Button")]
[FieldOffset(32)]
public bool touchpadClick;
[InputControl(layout = "Button")]
[FieldOffset(33)]
public bool touchpadTouch;
[InputControl(layout = "Integer")]
[FieldOffset(34)]
public int trackingState;
[InputControl(layout = "Button")]
[FieldOffset(38)]
public bool isTracked;
[InputControl(layout = "Vector3")]
[FieldOffset(39)]
public Vector3 devicePosition;
[InputControl(layout = "Quaternion")]
[FieldOffset(51)]
public Quaternion deviceRotation;
public FourCC GetFormat()
{
return new FourCC('X', 'R', 'S', '0');
}
}
[InputControlLayout(stateType = typeof(WMRSpatialControllerState), commonUsages = new[] { "LeftHand", "RightHand" })]
public class WMRSpatialController : XRController
{
new public static WMRSpatialController leftHand { get; private set; }
new public static WMRSpatialController rightHand { get; private set; }
>>>>>>>
<<<<<<<
combinedTrigger = setup.GetControl<AxisControl>("combinedTrigger");
joystick = setup.GetControl<Vector2Control>("joystick");
trigger = setup.GetControl<AxisControl>("trigger");
grip = setup.GetControl<AxisControl>("grip");
touchpad = setup.GetControl<Vector2Control>("touchpad");
gripPressed = setup.GetControl<ButtonControl>("gripPressed");
menu = setup.GetControl<ButtonControl>("menu");
joystickClick = setup.GetControl<ButtonControl>("joystickClick");
triggerPressed = setup.GetControl<ButtonControl>("triggerPressed");
touchpadClicked = setup.GetControl<ButtonControl>("touchpadClicked");
touchPadTouched = setup.GetControl<ButtonControl>("touchPadTouched");
trackingState = setup.GetControl<IntegerControl>("trackingState");
isTracked = setup.GetControl<ButtonControl>("isTracked");
devicePosition = setup.GetControl<Vector3Control>("devicePosition");
deviceRotation = setup.GetControl<QuaternionControl>("deviceRotation");
=======
try
{
XRDeviceDescriptor deviceDescriptor = XRDeviceDescriptor.FromJson(description.capabilities);
switch (deviceDescriptor.deviceRole)
{
case EDeviceRole.LeftHanded:
{
InputSystem.SetUsage(this, CommonUsages.LeftHand);
leftHand = this;
break;
}
case EDeviceRole.RightHanded:
{
InputSystem.SetUsage(this, CommonUsages.RightHand);
rightHand = this;
break;
}
default:
break;
}
}
catch (Exception)
{}
combinedTrigger = builder.GetControl<AxisControl>("combinedTrigger");
joystick = builder.GetControl<Vector2Control>("joystick");
trigger = builder.GetControl<AxisControl>("trigger");
grip = builder.GetControl<AxisControl>("grip");
touchpad = builder.GetControl<Vector2Control>("touchpad");
gripPressed = builder.GetControl<ButtonControl>("gripPressed");
menu = builder.GetControl<ButtonControl>("menu");
joystickClick = builder.GetControl<ButtonControl>("joystickClick");
triggerPressed = builder.GetControl<ButtonControl>("triggerPressed");
touchpadClicked = builder.GetControl<ButtonControl>("touchpadClicked");
touchPadTouched = builder.GetControl<ButtonControl>("touchPadTouched");
trackingState = builder.GetControl<IntegerControl>("trackingState");
isTracked = builder.GetControl<ButtonControl>("isTracked");
devicePosition = builder.GetControl<Vector3Control>("devicePosition");
deviceRotation = builder.GetControl<QuaternionControl>("deviceRotation");
>>>>>>>
combinedTrigger = builder.GetControl<AxisControl>("combinedTrigger");
joystick = builder.GetControl<Vector2Control>("joystick");
trigger = builder.GetControl<AxisControl>("trigger");
grip = builder.GetControl<AxisControl>("grip");
touchpad = builder.GetControl<Vector2Control>("touchpad");
gripPressed = builder.GetControl<ButtonControl>("gripPressed");
menu = builder.GetControl<ButtonControl>("menu");
joystickClick = builder.GetControl<ButtonControl>("joystickClick");
triggerPressed = builder.GetControl<ButtonControl>("triggerPressed");
touchpadClicked = builder.GetControl<ButtonControl>("touchpadClicked");
touchPadTouched = builder.GetControl<ButtonControl>("touchPadTouched");
trackingState = builder.GetControl<IntegerControl>("trackingState");
isTracked = builder.GetControl<ButtonControl>("isTracked");
devicePosition = builder.GetControl<Vector3Control>("devicePosition");
deviceRotation = builder.GetControl<QuaternionControl>("deviceRotation"); |
<<<<<<<
[InputControl(aliases = new[] { "Primary2DAxis", "thumbstickaxes" })]
=======
[Scripting.Preserve]
[InputControl(aliases = new[] { "Primary2DAxis" })]
>>>>>>>
[Scripting.Preserve]
[InputControl(aliases = new[] { "Primary2DAxis", "thumbstickaxes" })]
<<<<<<<
[InputControl(aliases = new[] { "Secondary2DAxis", "touchpadaxes" })]
=======
[Scripting.Preserve]
[InputControl]
public AxisControl trigger { get; private set; }
[Scripting.Preserve]
[InputControl(aliases = new[] { "Secondary2DAxis" })]
>>>>>>>
[Scripting.Preserve]
[InputControl(aliases = new[] { "Secondary2DAxis", "touchpadaxes" })]
<<<<<<<
[InputControl(aliases = new[] { "gripaxis" })]
=======
[Scripting.Preserve]
[InputControl]
>>>>>>>
[Scripting.Preserve]
[InputControl(aliases = new[] { "gripaxis" })]
<<<<<<<
[InputControl(aliases = new[] { "gripbutton" })]
=======
[Scripting.Preserve]
[InputControl]
>>>>>>>
[Scripting.Preserve]
[InputControl(aliases = new[] { "gripbutton" })]
<<<<<<<
[InputControl(aliases = new[] { "Primary", "menubutton" })]
=======
[Scripting.Preserve]
[InputControl(aliases = new[] { "Primary" })]
>>>>>>>
[Scripting.Preserve]
[InputControl(aliases = new[] { "Primary", "menubutton" })]
<<<<<<<
[InputControl(aliases = new[] { "triggeraxis" })]
public AxisControl trigger { get; private set; }
[InputControl(aliases = new[] { "triggerbutton" })]
=======
[Scripting.Preserve]
[InputControl]
public ButtonControl joystickClicked { get; private set; }
[Scripting.Preserve]
[InputControl]
>>>>>>>
[Scripting.Preserve]
[InputControl(aliases = new[] { "triggeraxis" })]
public AxisControl trigger { get; private set; }
[Scripting.Preserve]
[InputControl(aliases = new[] { "triggerbutton" })]
<<<<<<<
[InputControl(aliases = new[] { "thumbstickpressed" })]
public ButtonControl joystickClicked { get; private set; }
[InputControl(aliases = new[] { "joystickorpadpressed", "touchpadpressed" })]
=======
[Scripting.Preserve]
[InputControl(aliases = new[] { "joystickorpadpressed" })]
>>>>>>>
[Scripting.Preserve]
[InputControl(aliases = new[] { "thumbstickpressed" })]
public ButtonControl joystickClicked { get; private set; }
[Scripting.Preserve]
[InputControl(aliases = new[] { "joystickorpadpressed", "touchpadpressed" })]
<<<<<<<
[InputControl(aliases = new[] { "joystickorpadtouched", "touchpadtouched" })]
=======
[Scripting.Preserve]
[InputControl(aliases = new[] { "joystickorpadtouched" })]
>>>>>>>
[Scripting.Preserve]
[InputControl(aliases = new[] { "joystickorpadtouched", "touchpadtouched" })] |
<<<<<<<
.WithInterface(XRUtilities.kXRInterfaceMatchingPattern)
.WithManufacturer("Microsoft")
=======
.WithInterface(XRUtilities.kXRInterface)
>>>>>>>
.WithInterface(XRUtilities.kXRInterfaceMatchingPattern)
<<<<<<<
.WithInterface(XRUtilities.kXRInterfaceMatchingPattern)
.WithManufacturer("Microsoft")
.WithProduct("Spatial Controller"));
=======
.WithInterface(XRUtilities.kXRInterface)
.WithProduct("^(Spatial Controller)"));
>>>>>>>
.WithInterface(XRUtilities.kXRInterfaceMatchingPattern)
.WithProduct("Spatial Controller")); |
<<<<<<<
using System.IO.Compression;
using System.Globalization;
using System.Linq;
using System.Drawing;
using Depressurizer.Lib;
=======
using Depressurizer.Properties;
>>>>>>>
using Depressurizer.Lib;
using Depressurizer.Properties; |
<<<<<<<
=======
public string GetUserIdForUsername(string username)
{
var user = _connection.UserNameCache.FirstOrDefault(x => x.Value.Equals(username, StringComparison.InvariantCultureIgnoreCase));
return string.IsNullOrEmpty(user.Key) ? string.Empty : user.Key;
}
public string GetChannelId(string channelName)
{
var channel = _connection.ConnectedChannels().FirstOrDefault(x => x.Name.Equals(channelName, StringComparison.InvariantCultureIgnoreCase));
return channel != null ? channel.Id : string.Empty;
}
public Dictionary<string, string> ListChannels()
{
return _connection.ConnectedHubs.Values.ToDictionary(channel => channel.Id, channel => channel.Name);
}
public void Disconnect()
{
if (_connection != null && _connection.IsConnected)
{
_connection.Disconnect();
}
}
>>>>>>> |
<<<<<<<
return this.client.HttpClient.RequestAsync(HttpMethod.Put, string.Format("push/installations/{0}", Uri.EscapeUriString(this.client.InstallationId)), this.client.CurrentUser, installation.ToString(), ensureResponseContent: false);
=======
return this.client.MobileAppHttpClient.RequestAsync(HttpMethod.Put, string.Format("push/installations/{0}", Uri.EscapeUriString(this.client.InstallationId)), this.client.CurrentUser, installation.ToString(), ensureResponseContent: false, cancellationToken: cancellationToken);
>>>>>>>
return this.client.HttpClient.RequestAsync(HttpMethod.Put, string.Format("push/installations/{0}", Uri.EscapeUriString(this.client.InstallationId)), this.client.CurrentUser, installation.ToString(), ensureResponseContent: false, cancellationToken: cancellationToken); |
<<<<<<<
protected TooltipButtons[] availableButtons;
protected VRTK_ObjectTooltip[] buttonTooltips;
protected bool[] tooltipStates;
protected bool overallState = true;
=======
protected TooltipButtons[] availableButtons = new TooltipButtons[0];
protected VRTK_ObjectTooltip[] buttonTooltips = new VRTK_ObjectTooltip[0];
protected bool[] tooltipStates = new bool[0];
>>>>>>>
protected bool overallState = true;
protected TooltipButtons[] availableButtons = new TooltipButtons[0];
protected VRTK_ObjectTooltip[] buttonTooltips = new VRTK_ObjectTooltip[0];
protected bool[] tooltipStates = new bool[0]; |
<<<<<<<
private void UpdateProjectName()
{
if (ProjectName.IsChecked == true && this.Topoligies.SelectedItem != null && this.Tags.SelectedItem != null)
{
this.envModel.ProjectName =
$"{this.defaultProjectName}-{((NameValueModel)this.Topoligies.SelectedItem).Name}-{this.Tags.SelectedItem}";
}
}
}
=======
public string CustomButtonText { get => "Advanced..."; }
public void CustomButtonClick()
{
WindowHelper.ShowDialog<ContainerVariablesEditor>(this.envModel.ToList(), this.owner);
this.UpdateTagsControl(this.envModel.SitecoreVersion);
}
private void UpdateTagsControl(string tag)
{
if (this.Topoligies.SelectedItem != null && !string.Equals((string)this.Tags.SelectedItem, tag, StringComparison.InvariantCultureIgnoreCase))
{
foreach (string item in this.Tags.ItemsSource)
{
if (string.Equals(item, tag, StringComparison.InvariantCultureIgnoreCase))
{
this.Tags.SelectedItem = item;
return;
}
}
List<string> tagsItems = new List<string>(this.Tags.ItemsSource as IEnumerable<string>)
{
tag
};
this.Tags.DataContext = tagsItems;
this.Tags.SelectedIndex = this.Tags.Items.Count - 1;
}
}
}
>>>>>>>
private void UpdateProjectName()
{
if (ProjectName.IsChecked == true && this.Topoligies.SelectedItem != null && this.Tags.SelectedItem != null)
{
this.envModel.ProjectName =
$"{this.defaultProjectName}-{((NameValueModel)this.Topoligies.SelectedItem).Name}-{this.Tags.SelectedItem}";
}
}
public string CustomButtonText { get => "Advanced..."; }
public void CustomButtonClick()
{
WindowHelper.ShowDialog<ContainerVariablesEditor>(this.envModel.ToList(), this.owner);
this.UpdateTagsControl(this.envModel.SitecoreVersion);
}
private void UpdateTagsControl(string tag)
{
if (this.Topoligies.SelectedItem != null && !string.Equals((string)this.Tags.SelectedItem, tag, StringComparison.InvariantCultureIgnoreCase))
{
foreach (string item in this.Tags.ItemsSource)
{
if (string.Equals(item, tag, StringComparison.InvariantCultureIgnoreCase))
{
this.Tags.SelectedItem = item;
return;
}
}
List<string> tagsItems = new List<string>(this.Tags.ItemsSource as IEnumerable<string>)
{
tag
};
this.Tags.DataContext = tagsItems;
this.Tags.SelectedIndex = this.Tags.Items.Count - 1;
}
}
} |
<<<<<<<
using SIM.ContainerInstaller.Repositories.TagRepository;
=======
using SIM.Tool.Windows.Dialogs;
using ContainerInstaller.Repositories.TagRepository;
using TaskDialogInterop;
>>>>>>>
using SIM.Tool.Windows.Dialogs;
using SIM.ContainerInstaller.Repositories.TagRepository;
using SIM.Tool.Base;
<<<<<<<
this.Topologies.DataContext = Directory.GetDirectories(topologiesFolder).Select(d => new NameValueModel(Path.GetFileName(d), d));
this.Topologies.SelectedIndex = 0;
=======
this.Topoligies.DataContext = Directory.GetDirectories(topologiesFolder).Select(d => new NameValueModel(Path.GetFileName(d), d));
this.Topoligies.SelectedIndex = 0;
this.defaultProjectName = args.InstanceName;
this.ProjectName.IsChecked = true;
>>>>>>>
this.Topologies.DataContext = Directory.GetDirectories(topologiesFolder).Select(d => new NameValueModel(Path.GetFileName(d), d));
this.Topologies.SelectedIndex = 0;
this.defaultProjectName = args.InstanceName;
this.ProjectName.IsChecked = true; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.