From 2bb5656a555490a654df8b44f62f2992ebbb6278 Mon Sep 17 00:00:00 2001 From: bmatthieu3 Date: Fri, 16 Sep 2022 13:57:08 +0200 Subject: [PATCH] bug frame --- src/core/src/renderable/moc.rs | 2 +- src/core/src/survey/view.rs | 6 +++--- src/js/MOC.js | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/core/src/renderable/moc.rs b/src/core/src/renderable/moc.rs index 5b34eee1..a7984893 100644 --- a/src/core/src/renderable/moc.rs +++ b/src/core/src/renderable/moc.rs @@ -111,7 +111,7 @@ fn rasterize_hpx_cell(cell: &HEALPixCell, n_segment_by_side: usiz .into_iter() .filter_map(|(lon, lat)| { let xyzw = crate::math::lonlat::radec_to_xyzw(Angle(*lon), Angle(*lat)); - let xyzw = crate::coosys::apply_coo_system(view_frame, camera.get_system(), &xyzw); + let xyzw = crate::coosys::apply_coo_system(&CooSystem::ICRSJ2000, camera.get_system(), &xyzw); P::model_to_ndc_space(&xyzw, camera) .and_then(|v| Some([v.x as f32, v.y as f32])) diff --git a/src/core/src/survey/view.rs b/src/core/src/survey/view.rs index 120569e0..9bd0e2ac 100644 --- a/src/core/src/survey/view.rs +++ b/src/core/src/survey/view.rs @@ -84,15 +84,15 @@ pub fn get_tile_cells_in_camera( if let Some(vertices) = camera.get_vertices() { // The vertices coming from the camera are in a specific coo sys // but cdshealpix accepts them to be given in ICRSJ2000 coo sys - let view_system = camera.get_system(); + let camera_system = camera.get_system(); let icrsj2000_fov_vertices_pos = vertices .iter() - .map(|v| coosys::apply_coo_system(view_system, &hips_frame, v)) + .map(|v| coosys::apply_coo_system(camera_system, &hips_frame, v)) .collect::>(); let vs_inside_pos = camera.get_center(); let icrsj2000_inside_pos = - coosys::apply_coo_system(view_system, &hips_frame, &vs_inside_pos); + coosys::apply_coo_system(camera_system, &hips_frame, &vs_inside_pos); // Prefer to query from_polygon with depth >= 2 healpix::coverage::HEALPixCoverage::new( diff --git a/src/js/MOC.js b/src/js/MOC.js index 3e51fe80..1e73a56d 100644 --- a/src/js/MOC.js +++ b/src/js/MOC.js @@ -264,7 +264,6 @@ export let MOC = (function() { this.view = view; console.log(this.color) this.mocParams = new Aladin.wasmLibs.webgl.MOC(this.uuid, this.opacity, this.lineWidth, this.adaptativeDisplay, this.isShowing, this.color); - console.log(this.color) if (this.dataURL) { view.aladin.webglAPI.addFITSMoc(this.mocParams, this.dataURL);