on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

#8636739 Визуализация траектории 3D

Browse Source
This commit is contained in:
ai.astrakhantsev 2023-02-13 12:39:45 +05:00
parent 7d94945c9f
commit 3f2febc022
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AsbCloudApp/Data/TrajectoryVisualizationDto.cs
View File

@ -4,7 +4,8 @@
/// Визуализация траектории 3D /// Визуализация траектории 3D
/// </summary> /// </summary>
public class TrajectoryVisualizationDto public class TrajectoryVisualizationDto
{/// <summary> {
/// <summary>
/// Координаты по оси X /// Координаты по оси X
/// </summary> /// </summary>
public double X { get; set; } public double X { get; set; }

5
AsbCloudInfrastructure/AsbCloudInfrastructure.csproj
View File

@ -71,9 +71,4 @@
<HintPath>CommonLibs\AsbWitsInfo.dll</HintPath> <HintPath>CommonLibs\AsbWitsInfo.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<EditorConfigFiles Remove="D:\Source\AsbCloudInfrastructure\Repository\.editorconfig" />
</ItemGroup>
</Project> </Project>

6
AsbCloudInfrastructure/Services/TrajectoryVisualizationService.cs
View File

@ -28,9 +28,9 @@ namespace AsbCloudInfrastructure.Services
for (var i = 1; i < dtos.Length; i++) for (var i = 1; i < dtos.Length; i++)
{ {
var data = dtos[i]; var data = dtos[i];
var flat = GetFlat(data.WellboreDepth, prevData.WellboreDepth, data.ZenithAngle); var flat = GetFlat(data.WellboreDepth, prevData.WellboreDepth, prevData.ZenithAngle);
var x = prevCoordinates.X = GetX(data.AzimuthGeo, flat, prevCoordinates.X); var x = prevCoordinates.X = GetX(data.AzimuthGeo, flat, prevCoordinates.X);
var y = prevCoordinates.Y = GetY(data.AzimuthGeo, flat, prevCoordinates.Y); var y = prevCoordinates.Y = GetY(data.AzimuthGeo, flat, prevCoordinates.X);
var z = prevCoordinates.Z = GetZ(data.WellboreDepth, prevData.WellboreDepth, data.ZenithAngle, prevCoordinates.Z); var z = prevCoordinates.Z = GetZ(data.WellboreDepth, prevData.WellboreDepth, data.ZenithAngle, prevCoordinates.Z);
prevData = data; prevData = data;
@ -51,7 +51,7 @@ namespace AsbCloudInfrastructure.Services
(depthEnd - depthStart) * Math.Sin(zenit * Math.PI / 180); (depthEnd - depthStart) * Math.Sin(zenit * Math.PI / 180);
private double GetX(double azimuth, double flat, double prev) => private double GetX(double azimuth, double flat, double prev) =>
(prev + flat) * Math.Sin(azimuth * Math.PI / 180); prev + flat * Math.Sin(azimuth * Math.PI / 180);
private double GetY(double azimuth, double flat, double prev) => private double GetY(double azimuth, double flat, double prev) =>
prev + flat * Math.Cos(azimuth * Math.PI / 180); prev + flat * Math.Cos(azimuth * Math.PI / 180);

4
AsbCloudWebApi/Controllers/PlannedTrajectoryController.cs
View File

@ -242,6 +242,10 @@ namespace AsbCloudWebApi.Controllers
[ProducesResponseType(typeof(IEnumerable<TrajectoryVisualizationDto>), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(IEnumerable<TrajectoryVisualizationDto>), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> GetTrajectoryAsync(int idWell, CancellationToken token) public async Task<IActionResult> GetTrajectoryAsync(int idWell, CancellationToken token)
{ {
if (!await CanUserAccessToWellAsync(idWell,
token).ConfigureAwait(false))
return Forbid();
var result = await trajectoryVisualizationService.GetTrajectoryAsync(idWell, token); var result = await trajectoryVisualizationService.GetTrajectoryAsync(idWell, token);
return Ok(result); return Ok(result);
} }