Commit 00ad230e authored by langurmonkey's avatar langurmonkey

New data, fixed error in time

parent 04de364e
{
"name" : "DR2 int6 - 90%",
"description" : "Gaia DR2 int6 (90% relative error) run 2. 601M stars.",
"description" : "Gaia DR2 int6 (90% relative error). 601M stars.",
"data" : [
{
"loader": "gaia.cu9.ari.gaiaorbit.data.group.OctreeGroupLoader",
......
{
"name" : "DR2 int6 - 200%",
"description" : "Gaia DR2 int6 (200% relative error). 767M stars.",
"data" : [
{
"loader": "gaia.cu9.ari.gaiaorbit.data.group.OctreeGroupLoader",
"files": [ "/media/tsagrista/Daten/Gaia/data/GDR2/dr2int6/out/27-full-60000-10000-2.0/particles/", "/media/tsagrista/Daten/Gaia/data/GDR2/dr2int6/out/27-full-60000-10000-2.0/metadata.bin" ]
}
]}
name,raj2000,dej2000,dist,pmra,pmde,rv,rcluster,n_star
Hyades,67.16,15.87,48.4,108.42e-06,-26.74e-06,,2.1,150
RSG1,75.57,37.56,324.0,5.555398e-08,-3.422125168e-06,,0.1,15
RSG2,110.58,54.70,200.0,-8.388650979999999e-07,-7.799778792e-06,,0.1,50
RSG3,126.12,-08.81,437.0,-2.216603802e-06,1.202743667e-06,,0.1,19
......@@ -237,7 +238,7 @@ FSR 0634,55.095,59.43,2301.0,1.08333E-7,8.33333E-8,,0.1,8339
FSR 0691,55.335,34.655,1600.0,6.36111E-7,-1.38056E-6,,0.135,3296
IC 348,56.1525,32.15,480.0,1.20278E-6,-2.825E-6,16.03,0.26,4305
Juchert 11,56.835,53.902,3000.0,-9.02778E-7,-1.39444E-6,,0.09,6977
Pleiades,56.505,24.37,130.0,5.38889E-6,-1.27778E-5,5.51,6.2,473595
Pleiades,56.505,24.37,130.0,5.38889E-6,-1.27778E-5,5.51,3.2,473595
Tombaugh 5,57.015,59.07,1350.0,3.33333E-7,-3.94444E-7,-5.8,0.27,16543
Per OB2,57.7575,35.1,400.0,7.19444E-7,-1.19722E-6,23.05,3.2,242682
NGC 1444,57.3495,52.64,1300.0,-6.27778E-7,-1.16667E-6,2.0,0.1,7957
......
......@@ -2,6 +2,7 @@ package gaia.cu9.ari.gaiaorbit.interfce;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.temporal.ChronoField;
......@@ -46,12 +47,12 @@ public class DateDialog extends CollapsibleWindow {
float pad = 5 * GlobalConf.SCALE_FACTOR;
/** SET NOW **/
setNow = new OwnTextButton("Set current time", skin);
setNow = new OwnTextButton("Set current time (UTC)", skin);
setNow.addListener(new EventListener() {
@Override
public boolean handle(Event event) {
if (event instanceof ChangeEvent) {
updateTime(Instant.now());
updateTime(Instant.now(), ZoneOffset.UTC);
return true;
}
return false;
......@@ -269,8 +270,8 @@ public class DateDialog extends CollapsibleWindow {
}
/** Updates the time **/
public void updateTime(Instant instant) {
LocalDateTime date = LocalDateTime.ofInstant(instant, ZoneOffset.UTC);
public void updateTime(Instant instant, ZoneId zid) {
LocalDateTime date = LocalDateTime.ofInstant(instant, zid);
int year = date.get(ChronoField.YEAR_OF_ERA);
int month = date.getMonthValue();
int day = date.getDayOfMonth();
......
package gaia.cu9.ari.gaiaorbit.interfce.components;
import java.time.Instant;
import java.time.ZoneOffset;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.scenes.scene2d.Stage;
......@@ -71,7 +72,7 @@ public class TimeComponent extends GuiComponent implements IObserver {
if (dateDialog == null) {
dateDialog = new DateDialog(stage, skin);
}
dateDialog.updateTime(GaiaSky.instance.time.getTime());
dateDialog.updateTime(GaiaSky.instance.time.getTime(), ZoneOffset.UTC);
dateDialog.display();
}
return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment