Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/fov ltcorrection #222

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Fix/fov ltcorrection #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5de4363
Fix FOV with LT correction
sylvain-guillet Oct 11, 2024
ebc6cd6
Update versions
sylvain-guillet Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IO.Astrodynamics.Net/IO.Astrodynamics.CLI/IO.Astrodynamics.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<FileVersion>0.0.1</FileVersion>
<PackAsTool>true</PackAsTool>
<ToolCommandName>astro</ToolCommandName>
<Version>0.6.0</Version>
<Version>0.6.1</Version>
<Title>Astrodynamics command line interface</Title>
<Authors>Sylvain Guillet</Authors>
<Description>This CLI allows end user to exploit IO.Astrodynamics framework </Description>
Expand Down
2 changes: 1 addition & 1 deletion IO.Astrodynamics.Net/IO.Astrodynamics.Tests/Body/InstrumentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public async Task FindWindowInFieldOfView()
var res = spacecraft.Instruments.First().FindWindowsInFieldOfViewConstraint(
new Window(TimeSystem.Time.Create(676555200.0, TimeFrame.TDBFrame), TimeSystem.Time.Create(676561646.0, TimeFrame.TDBFrame)), spacecraft,
TestHelpers.EarthAtJ2000, TestHelpers.EarthAtJ2000.Frame,
ShapeType.Ellipsoid, Aberration.None,
ShapeType.Ellipsoid, Aberration.LT,
TimeSpan.FromSeconds(360.0)).ToArray();

//Read results
Expand Down
1 change: 1 addition & 0 deletions IO.Astrodynamics.Net/IO.Astrodynamics.sln.DotSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FOV/@EntryIndexedValue">FOV</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GPS/@EntryIndexedValue">GPS</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ICRF/@EntryIndexedValue">ICRF</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ISP/@EntryIndexedValue">ISP</s:String>
Expand Down
5 changes: 2 additions & 3 deletions IO.Astrodynamics.Net/IO.Astrodynamics/Body/Spacecraft/Instrument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,10 @@ public virtual bool IsInFOV(Time date, ILocalizable target, Aberration aberratio

protected (double azimuth, double elevation, bool isInFov) PositionInFOV(Time date, ILocalizable target, Aberration aberration)
{
var cameraPostion = Spacecraft.GetEphemeris(date, Barycenters.SOLAR_SYSTEM_BARYCENTER, Frame.ICRF, aberration).ToStateVector();
var objectPosition = target.GetEphemeris(date, Barycenters.SOLAR_SYSTEM_BARYCENTER, Frame.ICRF, aberration).ToStateVector();
var objectPosition = target.GetEphemeris(date, Spacecraft, Frame.ICRF, aberration).ToStateVector();
// Calculate the vector from the camera to the object
// Compute the vector from the camera to the object
Vector3 toObject = objectPosition.Position - cameraPostion.Position;
Vector3 toObject = objectPosition.Position;

// Ensure boresight and refVector are normalized
var boresight = GetBoresightInICRFFrame(date).Normalize();
Expand Down
2 changes: 1 addition & 1 deletion IO.Astrodynamics.Net/IO.Astrodynamics/IO.Astrodynamics.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<id>IO.Astrodynamics</id>
<authors>Sylvain Guillet</authors>
<copyright>Sylvain Guillet</copyright>
<version>6.1.0</version>
<version>6.1.1</version>
<title>Astrodynamics framework</title>
<icon>images\dragonfly-dark-trans.png</icon>
<readme>docs\README.md</readme>
Expand Down
4 changes: 2 additions & 2 deletions IO.Astrodynamics.Net/IO.Astrodynamics/RelationnalOperator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ public enum RelationnalOperator
[Description("<")] Lower,
[Description("=")] Equal,
[Description("!")] NotEqual,
[Description("!")] GreaterOrEqual,
[Description("!")] LowerOrEqual,
[Description(">=")] GreaterOrEqual,
[Description("<=")] LowerOrEqual,
[Description("ABSMIN")] AbsoluteMin,
[Description("ABSMAX")] AbsoluteMax,
[Description("LOCMIN")] LocalMin,
Expand Down
Loading