Mercurial > hg > orthanc-stone
comparison Framework/dev.h @ 121:e66b2c757790 wasm
displaying rt-struct
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 04 Oct 2017 17:53:47 +0200 |
parents | 063f7f3d9f14 |
children | e2fe9352f240 |
comparison
equal
deleted
inserted
replaced
120:063f7f3d9f14 | 121:e66b2c757790 |
---|---|
613 | 613 |
614 std::auto_ptr<Slice> slice(geometry.GetSlice(closest)); | 614 std::auto_ptr<Slice> slice(geometry.GetSlice(closest)); |
615 LayerSourceBase::NotifyLayerReady( | 615 LayerSourceBase::NotifyLayerReady( |
616 FrameRenderer::CreateRenderer(frame.release(), *slice, isFullQuality), | 616 FrameRenderer::CreateRenderer(frame.release(), *slice, isFullQuality), |
617 //new SliceOutlineRenderer(slice), | 617 //new SliceOutlineRenderer(slice), |
618 *slice, false); | 618 slice->GetGeometry(), false); |
619 return; | 619 return; |
620 } | 620 } |
621 } | 621 } |
622 | 622 |
623 // Error | 623 // Error |
624 Slice slice; | 624 CoordinateSystem3D slice; |
625 LayerSourceBase::NotifyLayerReady(NULL, slice, true); | 625 LayerSourceBase::NotifyLayerReady(NULL, slice, true); |
626 } | 626 } |
627 }; | 627 }; |
628 | 628 |
629 | 629 |
817 if (!GeometryToolbox::IntersectTwoPlanes(p, d, | 817 if (!GeometryToolbox::IntersectTwoPlanes(p, d, |
818 slice.GetOrigin(), slice.GetNormal(), | 818 slice.GetOrigin(), slice.GetNormal(), |
819 viewportSlice.GetOrigin(), viewportSlice.GetNormal())) | 819 viewportSlice.GetOrigin(), viewportSlice.GetNormal())) |
820 { | 820 { |
821 // The two slice are parallel, don't try and display the intersection | 821 // The two slice are parallel, don't try and display the intersection |
822 NotifyLayerReady(NULL, reference, false); | 822 NotifyLayerReady(NULL, reference.GetGeometry(), false); |
823 } | 823 } |
824 else | 824 else |
825 { | 825 { |
826 double x1, y1, x2, y2; | 826 double x1, y1, x2, y2; |
827 viewportSlice.ProjectPoint(x1, y1, p); | 827 viewportSlice.ProjectPoint(x1, y1, p); |
832 if (GeometryToolbox::ClipLineToRectangle(x1, y1, x2, y2, | 832 if (GeometryToolbox::ClipLineToRectangle(x1, y1, x2, y2, |
833 x1, y1, x2, y2, | 833 x1, y1, x2, y2, |
834 extent.GetX1(), extent.GetY1(), | 834 extent.GetX1(), extent.GetY1(), |
835 extent.GetX2(), extent.GetY2())) | 835 extent.GetX2(), extent.GetY2())) |
836 { | 836 { |
837 NotifyLayerReady(new LineLayerRenderer(x1, y1, x2, y2, slice), reference, false); | 837 NotifyLayerReady(new LineLayerRenderer(x1, y1, x2, y2, slice), reference.GetGeometry(), false); |
838 } | 838 } |
839 else | 839 else |
840 { | 840 { |
841 // Parallel slices | 841 // Parallel slices |
842 NotifyLayerReady(NULL, reference, false); | 842 NotifyLayerReady(NULL, reference.GetGeometry(), false); |
843 } | 843 } |
844 } | 844 } |
845 } | 845 } |
846 }; | 846 }; |
847 } | 847 } |