orthanc-stone: OrthancStone/Sources/Toolbox/DicomStructureSet.cpp annotate

annotate OrthancStone/Sources/Toolbox/DicomStructureSet.cpp @ 1898:a5e54bd87b25

try to use UnionOfRectangles in DicomStructureSet

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 26 Jan 2022 19:42:04 +0100
parents	144f8f82c15a
children	738814c24574

rev	line source
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Stone of Orthanc
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
1871 7053b8a0aaec upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1870 diff changeset	5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
7053b8a0aaec upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1870 diff changeset	6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * This program is free software: you can redistribute it and/or
1598 8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	9 * modify it under the terms of the GNU Lesser General Public License
47 28956ed68280 agpl license Sebastien Jodogne <s.jodogne@gmail.com> parents: 40 diff changeset	10 * as published by the Free Software Foundation, either version 3 of
28956ed68280 agpl license Sebastien Jodogne <s.jodogne@gmail.com> parents: 40 diff changeset	11 * the License, or (at your option) any later version.
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 *
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * This program is distributed in the hope that it will be useful, but
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
1598 8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	16 * Lesser General Public License for more details.
1596 4fb8fdf03314 removed annoying whitespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 1571 diff changeset	17 *
1598 8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	18 * You should have received a copy of the GNU Lesser General Public
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	19 * License along with this program. If not, see
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	20 * <http://www.gnu.org/licenses/>.
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
1898 a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	24 #define USE_BOOST_UNION_FOR_POLYGONS 0
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	25
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 #include "DicomStructureSet.h"
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	28 #include "BucketAccumulator2D.h"
1895 14c8f339d480 removed redundant definitions Point2D, Point3D and Vector3D from DicomStructureSetUtils.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	29 #include "GenericToolbox.h"
14c8f339d480 removed redundant definitions Point2D, Point3D and Vector3D from DicomStructureSetUtils.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	30 #include "GeometryToolbox.h"
14c8f339d480 removed redundant definitions Point2D, Point3D and Vector3D from DicomStructureSetUtils.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	31 #include "OrthancDatasets/DicomDatasetReader.h"
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	32
1455 30deba7bc8e2 simplifying include_directories Sebastien Jodogne <s.jodogne@gmail.com> parents: 1279 diff changeset	33 #include <Logging.h>
30deba7bc8e2 simplifying include_directories Sebastien Jodogne <s.jodogne@gmail.com> parents: 1279 diff changeset	34 #include <OrthancException.h>
30deba7bc8e2 simplifying include_directories Sebastien Jodogne <s.jodogne@gmail.com> parents: 1279 diff changeset	35 #include <Toolbox.h>
113 2eca030792aa using the Orthanc Framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 110 diff changeset	36
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	37 #if defined(_MSC_VER)
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	38 # pragma warning(push)
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	39 # pragma warning(disable:4244)
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	40 #endif
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	41
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	42 #if STONE_TIME_BLOCKING_OPS
1895 14c8f339d480 removed redundant definitions Point2D, Point3D and Vector3D from DicomStructureSetUtils.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	43 # include <boost/date_time/posix_time/posix_time.hpp>
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	44 #endif
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	45
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	46 #if !defined(USE_BOOST_UNION_FOR_POLYGONS)
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	47 # error Macro USE_BOOST_UNION_FOR_POLYGONS must be defined
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	48 #endif
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	49
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	50 #include <limits>
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 #include <stdio.h>
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	52 #include <boost/math/constants/constants.hpp>
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	53
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	54 #if USE_BOOST_UNION_FOR_POLYGONS == 1
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	55 # include <boost/geometry.hpp>
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	56 # include <boost/geometry/geometries/point_xy.hpp>
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	57 # include <boost/geometry/geometries/polygon.hpp>
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	58 # include <boost/geometry/multi/geometries/multi_polygon.hpp>
1898 a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	59 #else
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	60 # include "DicomStructureSetUtils.h" // TODO REMOVE
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	61 # include "UnionOfRectangles.h"
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	62 #endif
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	63
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	64 #if defined(_MSC_VER)
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	65 # pragma warning(pop)
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	66 #endif
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	67
1180 9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	68 #if ORTHANC_ENABLE_DCMTK == 1
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	69 # include "ParsedDicomDataset.h"
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	70 #endif
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	71
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	72
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	73 #if USE_BOOST_UNION_FOR_POLYGONS == 1
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	74
1895 14c8f339d480 removed redundant definitions Point2D, Point3D and Vector3D from DicomStructureSetUtils.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	75 typedef boost::geometry::model::d2::point_xy<double> BoostPoint;
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	76 typedef boost::geometry::model::polygon<BoostPoint> BoostPolygon;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	77 typedef boost::geometry::model::multi_polygon<BoostPolygon> BoostMultiPolygon;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	78
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	79 static void Union(BoostMultiPolygon& output,
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	80 std::vector<BoostPolygon>& input)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	81 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	82 for (size_t i = 0; i < input.size(); i++)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	83 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	84 boost::geometry::correct(input[i]);
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	85 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	86
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	87 if (input.size() == 0)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	88 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	89 output.clear();
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	90 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	91 else if (input.size() == 1)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	92 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	93 output.resize(1);
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	94 output[0] = input[0];
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	95 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	96 else
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	97 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	98 boost::geometry::union_(input[0], input[1], output);
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	99
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	100 for (size_t i = 0; i < input.size(); i++)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	101 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	102 BoostMultiPolygon tmp;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	103 boost::geometry::union_(output, input[i], tmp);
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	104 output = tmp;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	105 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	106 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	107 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	108
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	109 static BoostPolygon CreateRectangle(float x1, float y1,
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	110 float x2, float y2)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	111 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	112 BoostPolygon r;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	113 boost::geometry::append(r, BoostPoint(x1, y1));
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	114 boost::geometry::append(r, BoostPoint(x1, y2));
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	115 boost::geometry::append(r, BoostPoint(x2, y2));
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	116 boost::geometry::append(r, BoostPoint(x2, y1));
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	117 return r;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	118 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	119
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	120 #else
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	121
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	122 namespace OrthancStone
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	123 {
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	124 static RtStructRectangleInSlab CreateRectangle(float x1, float y1,
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	125 float x2, float y2)
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	126 {
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	127 RtStructRectangleInSlab rect;
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	128 rect.xmin = std::min(x1, x2);
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	129 rect.xmax = std::max(x1, x2);
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	130 rect.ymin = std::min(y1, y2);
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	131 rect.ymax = std::max(y1, y2);
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	132 return rect;
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	133 }
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	134
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	135 bool CompareRectanglesForProjection(const std::pair<RtStructRectangleInSlab,double>& r1,
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	136 const std::pair<RtStructRectangleInSlab, double>& r2)
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	137 {
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	138 return r1.second < r2.second;
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	139 }
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	140
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	141 bool CompareSlabsY(const RtStructRectanglesInSlab& r1,
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	142 const RtStructRectanglesInSlab& r2)
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	143 {
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	144 if ((r1.size() == 0) \|\| (r2.size() == 0))
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	145 return false;
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	146
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	147 return r1[0].ymax < r2[0].ymax;
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	148 }
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	149 }
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	150
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	151 #endif
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 namespace OrthancStone
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 {
1504 d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	155 static const Orthanc::DicomTag DICOM_TAG_CONTOUR_GEOMETRIC_TYPE(0x3006, 0x0042);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	156 static const Orthanc::DicomTag DICOM_TAG_CONTOUR_IMAGE_SEQUENCE(0x3006, 0x0016);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	157 static const Orthanc::DicomTag DICOM_TAG_CONTOUR_SEQUENCE(0x3006, 0x0040);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	158 static const Orthanc::DicomTag DICOM_TAG_CONTOUR_DATA(0x3006, 0x0050);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	159 static const Orthanc::DicomTag DICOM_TAG_NUMBER_OF_CONTOUR_POINTS(0x3006, 0x0046);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	160 static const Orthanc::DicomTag DICOM_TAG_REFERENCED_SOP_INSTANCE_UID(0x0008, 0x1155);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	161 static const Orthanc::DicomTag DICOM_TAG_ROI_CONTOUR_SEQUENCE(0x3006, 0x0039);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	162 static const Orthanc::DicomTag DICOM_TAG_ROI_DISPLAY_COLOR(0x3006, 0x002a);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	163 static const Orthanc::DicomTag DICOM_TAG_ROI_NAME(0x3006, 0x0026);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	164 static const Orthanc::DicomTag DICOM_TAG_RT_ROI_INTERPRETED_TYPE(0x3006, 0x00a4);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	165 static const Orthanc::DicomTag DICOM_TAG_RT_ROI_OBSERVATIONS_SEQUENCE(0x3006, 0x0080);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	166 static const Orthanc::DicomTag DICOM_TAG_STRUCTURE_SET_ROI_SEQUENCE(0x3006, 0x0020);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169 static uint8_t ConvertColor(double v)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 if (v < 0)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 return 0;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 else if (v >= 255)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 return 255;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179 else
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181 return static_cast<uint8_t>(v);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	185
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	186 static bool FastParseVector(Vector& target,
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	187 const IDicomDataset& dataset,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	188 const Orthanc::DicomPath& tag)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 {
118 a4d0b6c82b29 using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	190 std::string value;
a4d0b6c82b29 using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	191 return (dataset.GetStringValue(value, tag) &&
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	192 GenericToolbox::FastParseVector(target, value));
118 a4d0b6c82b29 using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	193 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194
988 4c9b4c4de814 Fixed bug in DicomStructureSet that prevented points from being added to polygons Benjamin Golinvaux <bgo@osimis.io> parents: 981 diff changeset	195 bool DicomStructureSet::Polygon::IsPointOnSliceIfAny(const Vector& v) const
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	196 {
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	197 if (hasSlice_)
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	198 {
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	199 double magnitude =
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	200 GeometryToolbox::ProjectAlongNormal(v, geometry_.GetNormal());
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	201 bool onSlice = LinearAlgebra::IsNear(
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	202 magnitude,
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	203 projectionAlongNormal_,
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	204 sliceThickness_ / 2.0 /* in mm */);
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	205 if (!onSlice)
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	206 {
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	207 LOG(WARNING) << "This RT-STRUCT contains a point that is off the "
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	208 << "slice of its instance \| "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	209 << "magnitude = " << magnitude << " \| "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	210 << "projectionAlongNormal_ = " << projectionAlongNormal_ << " \| "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	211 << "tolerance (sliceThickness_ / 2.0) = " << (sliceThickness_ / 2.0);
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	212 }
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	213 return onSlice;
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	214 }
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	215 else
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	216 {
988 4c9b4c4de814 Fixed bug in DicomStructureSet that prevented points from being added to polygons Benjamin Golinvaux <bgo@osimis.io> parents: 981 diff changeset	217 return true;
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	218 }
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	219 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	221 void DicomStructureSet::Polygon::AddPoint(const Vector& v)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	222 {
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	223 #if 1
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	224 // BGO 2019-09-03
988 4c9b4c4de814 Fixed bug in DicomStructureSet that prevented points from being added to polygons Benjamin Golinvaux <bgo@osimis.io> parents: 981 diff changeset	225 if (IsPointOnSliceIfAny(v))
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	226 {
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	227 points_.push_back(v);
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	228 }
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	229 #else
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	230 CheckPoint(v);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	231 points_.push_back(v);
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	232 #endif
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	233 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	234
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	235
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	236 bool DicomStructureSet::Polygon::UpdateReferencedSlice(const ReferencedSlices& slices)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	237 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	238 if (hasSlice_)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	240 return true;
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	241 }
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	242 else
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	243 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	244 ReferencedSlices::const_iterator it = slices.find(sopInstanceUid_);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	245
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	246 if (it == slices.end())
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	247 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	248 return false;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	249 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	250 else
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	251 {
1898 a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	252 // return true; // TODO - TEST
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	253
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	254 const CoordinateSystem3D& geometry = it->second.geometry_;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	255
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	256 hasSlice_ = true;
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	257 geometry_ = geometry;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	258 projectionAlongNormal_ = GeometryToolbox::ProjectAlongNormal(geometry.GetOrigin(), geometry.GetNormal());
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	259 sliceThickness_ = it->second.thickness_;
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260
1610 b7630b1a0253 ISceneLayer::GetBoundingBox() returns void Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	261 extent_.Clear();
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	262
1571 85e117739eca cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1512 diff changeset	263 for (Points::const_iterator it2 = points_.begin(); it2 != points_.end(); ++it2)
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	264 {
1571 85e117739eca cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1512 diff changeset	265 if (IsPointOnSliceIfAny(*it2))
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	266 {
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	267 double x, y;
1571 85e117739eca cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1512 diff changeset	268 geometry.ProjectPoint2(x, y, *it2);
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	269 extent_.AddPoint(x, y);
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	270 }
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	271 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	272 return true;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	273 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	277 bool DicomStructureSet::Polygon::IsOnSlice(const CoordinateSystem3D& slice) const
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	278 {
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	279 bool isOpposite = false;
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	280
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	281 if (points_.empty() \|\|
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	282 !hasSlice_ \|\|
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	283 !GeometryToolbox::IsParallelOrOpposite(isOpposite, slice.GetNormal(), geometry_.GetNormal()))
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	284 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	285 return false;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	286 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	287
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	288 double d = GeometryToolbox::ProjectAlongNormal(slice.GetOrigin(), geometry_.GetNormal());
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	289
158 a053ca7fa5c6 LinearAlgebra toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	290 return (LinearAlgebra::IsNear(d, projectionAlongNormal_,
a053ca7fa5c6 LinearAlgebra toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	291 sliceThickness_ / 2.0));
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	292 }
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	293
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	294 bool DicomStructureSet::Polygon::Project(double& x1,
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	295 double& y1,
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	296 double& x2,
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	297 double& y2,
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	298 const CoordinateSystem3D& slice) const
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	299 {
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	300 if (!hasSlice_ \|\|
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	301 points_.size() <= 1)
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	302 {
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	303 return false;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	304 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	305
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	306 double x, y;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	307 geometry_.ProjectPoint2(x, y, slice.GetOrigin());
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	308
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	309 bool isOpposite;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	310 if (GeometryToolbox::IsParallelOrOpposite
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	311 (isOpposite, slice.GetNormal(), geometry_.GetAxisY()))
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	312 {
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	313 // plane is constant Y
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	314
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	315 if (y < extent_.GetY1() \|\|
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	316 y > extent_.GetY2())
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	317 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	318 // The polygon does not intersect the input slice
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	319 return false;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	320 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	321
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	322 bool isFirst = true;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	323 double xmin = std::numeric_limits<double>::infinity();
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	324 double xmax = -std::numeric_limits<double>::infinity();
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	325
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	326 double prevX, prevY;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	327 geometry_.ProjectPoint2(prevX, prevY, points_[points_.size() - 1]);
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	328
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	329 for (size_t i = 0; i < points_.size(); i++)
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	330 {
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	331 // Reference: ../../Resources/Computations/IntersectSegmentAndHorizontalLine.py
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	332 double curX, curY;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	333 geometry_.ProjectPoint2(curX, curY, points_[i]);
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	334
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	335 // if prev* and cur* are on opposite sides of y, this means that the
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	336 // segment intersects the plane.
1838 80e029f8ec91 fix wrong display of RTStruct when an RTStruct point has exactly the same X or Y coordinates as the origin Alain Mazy <alain@mazy.be> parents: 1834 diff changeset	337 if ((prevY <= y && curY >= y) \|\|
80e029f8ec91 fix wrong display of RTStruct when an RTStruct point has exactly the same X or Y coordinates as the origin Alain Mazy <alain@mazy.be> parents: 1834 diff changeset	338 (prevY >= y && curY <= y))
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	339 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	340 double p = (curX * prevY - curY * prevX + y * (prevX - curX)) / (prevY - curY);
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	341 xmin = std::min(xmin, p);
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	342 xmax = std::max(xmax, p);
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	343 isFirst = false;
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	344
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	345 // xmin and xmax represent the extent of the rectangle along the
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	346 // intersection between the plane and the polygon geometry
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	347
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	348 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	349
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	350 prevX = curX;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	351 prevY = curY;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	352 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	353
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	354 // if NO segment intersects the plane
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	355 if (isFirst)
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	356 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	357 return false;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	358 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	359 else
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	360 {
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	361 // y is the plane y coord in the polygon geometry
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	362 // xmin and xmax are ALSO expressed in the polygon geometry
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	363
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	364 // let's convert them to 3D world geometry...
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	365 Vector p1 = (geometry_.MapSliceToWorldCoordinates(xmin, y) +
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	366 sliceThickness_ / 2.0 * geometry_.GetNormal());
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	367 Vector p2 = (geometry_.MapSliceToWorldCoordinates(xmax, y) -
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	368 sliceThickness_ / 2.0 * geometry_.GetNormal());
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	369
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	370 // then to the cutting plane geometry...
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	371 slice.ProjectPoint2(x1, y1, p1);
53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	372 slice.ProjectPoint2(x2, y2, p2);
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	373 return true;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	374 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	375 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	376 else if (GeometryToolbox::IsParallelOrOpposite
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	377 (isOpposite, slice.GetNormal(), geometry_.GetAxisX()))
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	378 {
1170 1644de437a7b fixes related to swapped normal in sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	379 // plane is constant X => Sagittal view (remember that in the
1644de437a7b fixes related to swapped normal in sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	380 // sagittal projection, the normal must be swapped)
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	381
1170 1644de437a7b fixes related to swapped normal in sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	382
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	383 /*
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	384 Please read the comments in the section above, by taking into account
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	385 the fact that, in this case, the plane has a constant X, not Y (in
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	386 polygon geometry_ coordinates)
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	387 */
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	388
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	389 if (x < extent_.GetX1() \|\|
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	390 x > extent_.GetX2())
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	391 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	392 return false;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	393 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	394
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	395 bool isFirst = true;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	396 double ymin = std::numeric_limits<double>::infinity();
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	397 double ymax = -std::numeric_limits<double>::infinity();
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	398
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	399 double prevX, prevY;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	400 geometry_.ProjectPoint2(prevX, prevY, points_[points_.size() - 1]);
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	401
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	402 for (size_t i = 0; i < points_.size(); i++)
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	403 {
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	404 // Reference: ../../Resources/Computations/IntersectSegmentAndVerticalLine.py
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	405 double curX, curY;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	406 geometry_.ProjectPoint2(curX, curY, points_[i]);
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	407
1838 80e029f8ec91 fix wrong display of RTStruct when an RTStruct point has exactly the same X or Y coordinates as the origin Alain Mazy <alain@mazy.be> parents: 1834 diff changeset	408 if ((prevX <= x && curX >= x) \|\|
80e029f8ec91 fix wrong display of RTStruct when an RTStruct point has exactly the same X or Y coordinates as the origin Alain Mazy <alain@mazy.be> parents: 1834 diff changeset	409 (prevX >= x && curX <= x))
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	410 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	411 double p = (curX * prevY - curY * prevX + x * (curY - prevY)) / (curX - prevX);
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	412 ymin = std::min(ymin, p);
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	413 ymax = std::max(ymax, p);
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	414 isFirst = false;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	415 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	416
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	417 prevX = curX;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	418 prevY = curY;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	419 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	420
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	421 if (isFirst)
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	422 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	423 return false;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	424 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	425 else
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	426 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	427 Vector p1 = (geometry_.MapSliceToWorldCoordinates(x, ymin) +
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	428 sliceThickness_ / 2.0 * geometry_.GetNormal());
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	429 Vector p2 = (geometry_.MapSliceToWorldCoordinates(x, ymax) -
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	430 sliceThickness_ / 2.0 * geometry_.GetNormal());
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	431
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	432 slice.ProjectPoint2(x1, y1, p1);
53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	433 slice.ProjectPoint2(x2, y2, p2);
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	434
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	435 return true;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	436 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	437 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	438 else
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	439 {
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	440 // Should not happen
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	441 return false;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	442 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	443 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	444
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	445
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 const DicomStructureSet::Structure& DicomStructureSet::GetStructure(size_t index) const
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448 if (index >= structures_.size())
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 {
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	450 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 return structures_[index];
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	455
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	457 DicomStructureSet::Structure& DicomStructureSet::GetStructure(size_t index)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458 {
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	459 if (index >= structures_.size())
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	460 {
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	461 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 return structures_[index];
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466
1504 d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	467 void DicomStructureSet::Setup(const IDicomDataset& tags)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468 {
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	469 #if STONE_TIME_BLOCKING_OPS
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	470 boost::posix_time::ptime timerStart = boost::posix_time::microsec_clock::universal_time();
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	471 #endif
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	472
1504 d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	473 DicomDatasetReader reader(tags);
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	474
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	475 size_t count, tmp;
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	476 if (!tags.GetSequenceSize(count, Orthanc::DicomPath(DICOM_TAG_RT_ROI_OBSERVATIONS_SEQUENCE)) \|\|
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	477 !tags.GetSequenceSize(tmp, Orthanc::DicomPath(DICOM_TAG_ROI_CONTOUR_SEQUENCE)) \|\|
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	478 tmp != count \|\|
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	479 !tags.GetSequenceSize(tmp, Orthanc::DicomPath(DICOM_TAG_STRUCTURE_SET_ROI_SEQUENCE)) \|\|
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	480 tmp != count)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	485 structures_.resize(count);
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	486 for (size_t i = 0; i < count; i++)
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	487 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	488 structures_[i].interpretation_ = reader.GetStringValue
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	489 (Orthanc::DicomPath(DICOM_TAG_RT_ROI_OBSERVATIONS_SEQUENCE, i,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	490 DICOM_TAG_RT_ROI_INTERPRETED_TYPE),
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	491 "No interpretation");
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	492
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	493 structures_[i].name_ = reader.GetStringValue
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	494 (Orthanc::DicomPath(DICOM_TAG_STRUCTURE_SET_ROI_SEQUENCE, i,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	495 DICOM_TAG_ROI_NAME),
949 32eaf4929b08 OrthancMultiframeVolumeLoader and OrthancSeriesVolumeProgressiveLoader now implement IGeometryProvider so that the geometry reference can be switched (CT or DOSE, for instance) + VolumeImageGeometry::SetSize renamed to VolumeImageGeometry::SetSizeInVoxels + prevent text layer update if text or properties do not change + a few stream operator<< for debug (Vector, Matrix,...) + fixed memory access aligment issues in ImageBuffer3D::ExtractSagittalSlice + fix for wrong screen Y offset of mpr slices in DicomVolumeImageMPRSlicer. Benjamin Golinvaux <bgo@osimis.io> parents: 841 diff changeset	496 "No name");
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 Vector color;
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	499 if (FastParseVector(color, tags, Orthanc::DicomPath(DICOM_TAG_ROI_CONTOUR_SEQUENCE, i,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	500 DICOM_TAG_ROI_DISPLAY_COLOR)) &&
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	501 color.size() == 3)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502 {
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	503 structures_[i].red_ = ConvertColor(color[0]);
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	504 structures_[i].green_ = ConvertColor(color[1]);
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	505 structures_[i].blue_ = ConvertColor(color[2]);
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	506 }
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	507 else
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	508 {
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	509 structures_[i].red_ = 255;
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	510 structures_[i].green_ = 0;
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	511 structures_[i].blue_ = 0;
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	512 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	514 size_t countSlices;
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	515 if (!tags.GetSequenceSize(countSlices, Orthanc::DicomPath(DICOM_TAG_ROI_CONTOUR_SEQUENCE, i,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	516 DICOM_TAG_CONTOUR_SEQUENCE)))
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	517 {
121 e66b2c757790 displaying rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	518 countSlices = 0;
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	519 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520
841 266e2b0b9abc better error reporting in DicomStructureSetLoader + fixed POST request logic Benjamin Golinvaux <bgo@osimis.io> parents: 804 diff changeset	521 LOG(INFO) << "New RT structure: \"" << structures_[i].name_
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	522 << "\" with interpretation \"" << structures_[i].interpretation_
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	523 << "\" containing " << countSlices << " slices (color: "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	524 << static_cast<int>(structures_[i].red_) << ","
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	525 << static_cast<int>(structures_[i].green_) << ","
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	526 << static_cast<int>(structures_[i].blue_) << ")";
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	527
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	528 /**
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	529 * These temporary variables avoid allocating many vectors in
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	530 * the loop below (indeed, "Orthanc::DicomPath" handles a
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	531 * "std::vector<PrefixItem>")
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	532 **/
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	533 Orthanc::DicomPath countPointsPath(DICOM_TAG_ROI_CONTOUR_SEQUENCE, i,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	534 DICOM_TAG_CONTOUR_SEQUENCE, 0,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	535 DICOM_TAG_NUMBER_OF_CONTOUR_POINTS);
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	536
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	537 Orthanc::DicomPath geometricTypePath(DICOM_TAG_ROI_CONTOUR_SEQUENCE, i,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	538 DICOM_TAG_CONTOUR_SEQUENCE, 0,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	539 DICOM_TAG_CONTOUR_GEOMETRIC_TYPE);
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	540
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	541 Orthanc::DicomPath imageSequencePath(DICOM_TAG_ROI_CONTOUR_SEQUENCE, i,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	542 DICOM_TAG_CONTOUR_SEQUENCE, 0,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	543 DICOM_TAG_CONTOUR_IMAGE_SEQUENCE);
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	544
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	545 // (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	546 Orthanc::DicomPath referencedInstancePath(DICOM_TAG_ROI_CONTOUR_SEQUENCE, i,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	547 DICOM_TAG_CONTOUR_SEQUENCE, 0,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	548 DICOM_TAG_CONTOUR_IMAGE_SEQUENCE, 0,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	549 DICOM_TAG_REFERENCED_SOP_INSTANCE_UID);
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	550
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	551 Orthanc::DicomPath contourDataPath(DICOM_TAG_ROI_CONTOUR_SEQUENCE, i,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	552 DICOM_TAG_CONTOUR_SEQUENCE, 0,
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	553 DICOM_TAG_CONTOUR_DATA);
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	554
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	555 for (size_t j = 0; j < countSlices; j++)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556 {
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	557 unsigned int countPoints;
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	559 countPointsPath.SetPrefixIndex(1, j);
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	560 if (!reader.GetUnsignedIntegerValue(countPoints, countPointsPath))
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	561 {
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	562 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	563 }
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	564
121 e66b2c757790 displaying rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	565 //LOG(INFO) << "Parsing slice containing " << countPoints << " vertices";
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	567 geometricTypePath.SetPrefixIndex(1, j);
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	568 std::string type = reader.GetMandatoryStringValue(geometricTypePath);
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	569 if (type != "CLOSED_PLANAR")
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	570 {
173 6b0411ac843a fix captain rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 159 diff changeset	571 LOG(WARNING) << "Ignoring contour with geometry type: " << type;
6b0411ac843a fix captain rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 159 diff changeset	572 continue;
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	575 size_t size;
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	576
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	577 imageSequencePath.SetPrefixIndex(1, j);
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	578 if (!tags.GetSequenceSize(size, imageSequencePath) \|\| size != 1)
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	579 {
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	580 LOG(ERROR) << "The ContourImageSequence sequence (tag 3006,0016) must be present and contain one entry.";
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	584 referencedInstancePath.SetPrefixIndex(1, j);
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	585 std::string sopInstanceUid = reader.GetMandatoryStringValue(referencedInstancePath);
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	586
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	587 contourDataPath.SetPrefixIndex(1, j);
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	588 std::string slicesData = reader.GetMandatoryStringValue(contourDataPath);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590 Vector points;
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	591
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	592 if (!GenericToolbox::FastParseVector(points, slicesData) \|\|
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	593 points.size() != 3 * countPoints)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	598 // seen in real world
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	599 if(Orthanc::Toolbox::StripSpaces(sopInstanceUid) == "")
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	600 {
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	601 LOG(ERROR) << "WARNING. The following Dicom tag (Referenced SOP Instance UID) contains an empty value : // (3006,0039)[" << i << "] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)";
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	602 }
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	603
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	604 Polygon polygon(sopInstanceUid);
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	605 polygon.Reserve(countPoints);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	606
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	607 for (size_t k = 0; k < countPoints; k++)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	608 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	609 Vector v(3);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610 v[0] = points[3 * k];
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611 v[1] = points[3 * k + 1];
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 v[2] = points[3 * k + 2];
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	613 polygon.AddPoint(v);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	614 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616 structures_[i].polygons_.push_back(polygon);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618 }
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	619
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	620 EstimateGeometry();
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	621
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	622 #if STONE_TIME_BLOCKING_OPS
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	623 boost::posix_time::ptime timerEnd = boost::posix_time::microsec_clock::universal_time();
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	624 boost::posix_time::time_duration duration = timerEnd - timerStart;
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	625 int64_t durationMs = duration.total_milliseconds();
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	626 LOG(WARNING) << "DicomStructureSet::Setup took " << durationMs << " ms";
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	627 #endif
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	629
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	630
1180 9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	631 #if ORTHANC_ENABLE_DCMTK == 1
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	632 DicomStructureSet::DicomStructureSet(Orthanc::ParsedDicomFile& instance)
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	633 {
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	634 ParsedDicomDataset dataset(instance);
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	635 Setup(dataset);
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	636 }
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	637 #endif
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	638
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	639
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640 Vector DicomStructureSet::GetStructureCenter(size_t index) const
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	641 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	642 const Structure& structure = GetStructure(index);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	643
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	644 Vector center;
158 a053ca7fa5c6 LinearAlgebra toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	645 LinearAlgebra::AssignVector(center, 0, 0, 0);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	646 if (structure.polygons_.empty())
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 return center;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651 double n = static_cast<double>(structure.polygons_.size());
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	652
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653 for (Polygons::const_iterator polygon = structure.polygons_.begin();
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654 polygon != structure.polygons_.end(); ++polygon)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	656 if (!polygon->GetPoints().empty())
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	657 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	658 center += polygon->GetPoints().front() / n;
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	659 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	660 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	661
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662 return center;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	665
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	666 const std::string& DicomStructureSet::GetStructureName(size_t index) const
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	667 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668 return GetStructure(index).name_;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	669 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	670
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	671
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	672 const std::string& DicomStructureSet::GetStructureInterpretation(size_t index) const
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	673 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674 return GetStructure(index).interpretation_;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	675 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	676
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677
804 61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	678 Color DicomStructureSet::GetStructureColor(size_t index) const
61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	679 {
61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	680 const Structure& s = GetStructure(index);
61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	681 return Color(s.red_, s.green_, s.blue_);
61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	682 }
61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	683
61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	684
1885 ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	685 void DicomStructureSet::GetReferencedInstances(std::set<std::string>& instances) const
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	687 for (Structures::const_iterator structure = structures_.begin();
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688 structure != structures_.end(); ++structure)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	689 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	690 for (Polygons::const_iterator polygon = structure->polygons_.begin();
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 polygon != structure->polygons_.end(); ++polygon)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	693 instances.insert(polygon->GetSopInstanceUid());
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	694 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	695 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	696 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	697
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	698
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	699 void DicomStructureSet::AddReferencedSlice(const std::string& sopInstanceUid,
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	700 const std::string& seriesInstanceUid,
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	701 const CoordinateSystem3D& geometry,
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	702 double thickness)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	703 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	704 if (referencedSlices_.find(sopInstanceUid) != referencedSlices_.end())
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	705 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	706 // This geometry is already known
956 a7351ad54960 Made IsContextLost automatically set the flag by checking with the emscripten Benjamin Golinvaux <bgo@osimis.io> parents: 949 diff changeset	707 LOG(ERROR) << "DicomStructureSet::AddReferencedSlice(): (referencedSlices_.find(sopInstanceUid) != referencedSlices_.end()). sopInstanceUid = " << sopInstanceUid;
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	708
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	709 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	710 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	711 else
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	712 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	713 if (thickness < 0)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	714 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	715 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	716 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	717
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	718 if (!referencedSlices_.empty())
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	719 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	720 const ReferencedSlice& reference = referencedSlices_.begin()->second;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	721
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	722 if (reference.seriesInstanceUid_ != seriesInstanceUid)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	723 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	724 LOG(ERROR) << "This RT-STRUCT refers to several different series";
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	725 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	726 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	728 if (!GeometryToolbox::IsParallel(reference.geometry_.GetNormal(), geometry.GetNormal()))
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	729 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	730 LOG(ERROR) << "The slices in this RT-STRUCT are not parallel";
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	731 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	732 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	733 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	734
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	735 referencedSlices_[sopInstanceUid] = ReferencedSlice(seriesInstanceUid, geometry, thickness);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	737 for (Structures::iterator structure = structures_.begin();
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	738 structure != structures_.end(); ++structure)
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	739 {
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	740 for (Polygons::iterator polygon = structure->polygons_.begin();
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	741 polygon != structure->polygons_.end(); ++polygon)
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	742 {
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	743 polygon->UpdateReferencedSlice(referencedSlices_);
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	744 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	745 }
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	746 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	747 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	748
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	749
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	750 void DicomStructureSet::AddReferencedSlice(const Orthanc::DicomMap& dataset)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	751 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	752 CoordinateSystem3D slice(dataset);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	753
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	754 double thickness = 1; // 1 mm by default
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	755
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	756 std::string s;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	757 Vector v;
994 1f74bc3459ba fix build due to rename in Orthanc::DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 988 diff changeset	758 if (dataset.LookupStringValue(s, Orthanc::DICOM_TAG_SLICE_THICKNESS, false) &&
158 a053ca7fa5c6 LinearAlgebra toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	759 LinearAlgebra::ParseVector(v, s) &&
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	760 v.size() > 0)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	761 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	762 thickness = v[0];
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	763 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	764
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	765 std::string instance, series;
994 1f74bc3459ba fix build due to rename in Orthanc::DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 988 diff changeset	766 if (dataset.LookupStringValue(instance, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false) &&
1f74bc3459ba fix build due to rename in Orthanc::DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 988 diff changeset	767 dataset.LookupStringValue(series, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, false))
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	768 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	769 AddReferencedSlice(instance, series, slice, thickness);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	770 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	771 else
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	772 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	773 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	774 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	775 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	776
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	777
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	778 void DicomStructureSet::CheckReferencedSlices()
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	779 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	780 for (Structures::iterator structure = structures_.begin();
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	781 structure != structures_.end(); ++structure)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	782 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	783 for (Polygons::iterator polygon = structure->polygons_.begin();
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	784 polygon != structure->polygons_.end(); ++polygon)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	785 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	786 if (!polygon->UpdateReferencedSlice(referencedSlices_))
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	787 {
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	788 std::string sopInstanceUid = polygon->GetSopInstanceUid();
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	789 if (Orthanc::Toolbox::StripSpaces(sopInstanceUid) == "")
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	790 {
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	791 LOG(ERROR) << "DicomStructureSet::CheckReferencedSlices(): "
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	792 << " missing information about referenced instance "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	793 << "(sopInstanceUid is empty!)";
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	794 }
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	795 else
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	796 {
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	797 LOG(ERROR) << "DicomStructureSet::CheckReferencedSlices(): "
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	798 << " missing information about referenced instance "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	799 << "(sopInstanceUid = " << sopInstanceUid << ")";
981 c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	800 }
c20dbaab360c Ability to cope with empty "Referenced SOP Instance UID" (dicom path (3006,0039)[i] / (0x3006, 0x0040)[0] / (0x3006, 0x0016)[0] / (0x0008, 0x1155)) + better logs + code formating Benjamin Golinvaux <bgo@osimis.io> parents: 959 diff changeset	801 //throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	802 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	803 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804 }
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	805 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	806
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	807
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	808 Vector DicomStructureSet::GetNormal() const
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	809 {
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	810 if (referencedSlices_.empty())
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	811 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	812 Vector v;
158 a053ca7fa5c6 LinearAlgebra toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	813 LinearAlgebra::AssignVector(v, 0, 0, 1);
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	814 return v;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	815 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	816 else
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	817 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	818 return referencedSlices_.begin()->second.geometry_.GetNormal();
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	819 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	820 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	821
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	822 bool DicomStructureSet::ProjectStructure(std::vector< std::vector<ScenePoint2D> >& chains,
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	823 const Structure& structure,
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	824 const CoordinateSystem3D& sourceSlice) const
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	825 {
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	826 const CoordinateSystem3D slice = CoordinateSystem3D::NormalizeCuttingPlane(sourceSlice);
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	827
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	828 chains.clear();
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	829
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	830 Vector normal = GetNormal();
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	831
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	832 bool isOpposite;
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	833 if (GeometryToolbox::IsParallelOrOpposite(isOpposite, normal, slice.GetNormal()))
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	834 {
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	835 // This is an axial projection
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	836
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	837 chains.reserve(structure.polygons_.size());
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	838
794 04f518ebd132 LoaderStateMachine Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	839 for (Polygons::const_iterator polygon = structure.polygons_.begin();
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	840 polygon != structure.polygons_.end(); ++polygon)
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	841 {
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	842 const Points& points = polygon->GetPoints();
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	843
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	844 if (polygon->IsOnSlice(slice) &&
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	845 !points.empty())
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	846 {
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	847 chains.push_back(std::vector<ScenePoint2D>());
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	848 chains.back().reserve(points.size() + 1);
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	849
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	850 for (Points::const_iterator p = points.begin();
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	851 p != points.end(); ++p)
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	852 {
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	853 double x, y;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	854 slice.ProjectPoint2(x, y, *p);
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	855 chains.back().push_back(ScenePoint2D(x, y));
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	856 }
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	857
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	858 double x0, y0;
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	859 slice.ProjectPoint2(x0, y0, points.front());
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	860 chains.back().push_back(ScenePoint2D(x0, y0));
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	861 }
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	862 }
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	863
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	864 return true;
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	865 }
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	866 else if (GeometryToolbox::IsParallelOrOpposite(isOpposite, normal, slice.GetAxisX()) \|\|
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	867 GeometryToolbox::IsParallelOrOpposite(isOpposite, normal, slice.GetAxisY()))
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	868 {
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	869 // Sagittal or coronal projection
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	870
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	871 #if USE_BOOST_UNION_FOR_POLYGONS == 1
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	872 std::vector<BoostPolygon> projected;
1162 709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	873
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	874 for (Polygons::const_iterator polygon = structure.polygons_.begin();
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	875 polygon != structure.polygons_.end(); ++polygon)
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	876 {
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	877 double x1, y1, x2, y2;
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	878
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	879 if (polygon->Project(x1, y1, x2, y2, slice))
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	880 {
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	881 projected.push_back(CreateRectangle(x1, y1, x2, y2));
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	882 }
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	883 }
1897 144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	884
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	885 BoostMultiPolygon merged;
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	886 Union(merged, projected);
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	887
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	888 chains.resize(merged.size());
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	889 for (size_t i = 0; i < merged.size(); i++)
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	890 {
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	891 const std::vector<BoostPoint>& outer = merged[i].outer();
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	892
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	893 chains[i].resize(outer.size());
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	894 for (size_t j = 0; j < outer.size(); j++)
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	895 {
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	896 chains[i][j] = ScenePoint2D(outer[j].x(), outer[j].y());
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	897 }
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	898 }
1898 a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	899
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	900 #elif 0
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	901
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	902 // TODO - Fix possible infinite loop in UnionOfRectangles
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	903
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	904 std::list<Extent2D> rectangles;
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	905
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	906 for (Polygons::const_iterator polygon = structure.polygons_.begin();
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	907 polygon != structure.polygons_.end(); ++polygon)
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	908 {
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	909 double x1, y1, x2, y2;
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	910
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	911 if (polygon->Project(x1, y1, x2, y2, slice))
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	912 {
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	913 rectangles.push_back(Extent2D(x1, y1, x2, y2));
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	914 }
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	915 }
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	916
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	917 typedef std::list< std::vector<ScenePoint2D> > Contours;
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	918
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	919 Contours contours;
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	920 UnionOfRectangles::Apply(contours, rectangles);
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	921
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	922 chains.reserve(contours.size());
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	923
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	924 for (Contours::const_iterator it = contours.begin(); it != contours.end(); ++it)
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	925 {
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	926 chains.push_back(*it);
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	927 }
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	928
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	929 #else
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	930 // this will contain the intersection of the polygon slab with
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	931 // the cutting plane, projected on the cutting plane coord system
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	932 // (that yields a rectangle) + the Z coordinate of the polygon
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	933 // (this is required to group polygons with the same Z later)
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	934 std::vector<std::pair<RtStructRectangleInSlab, double> > projected;
1162 709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	935
794 04f518ebd132 LoaderStateMachine Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	936 for (Polygons::const_iterator polygon = structure.polygons_.begin();
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	937 polygon != structure.polygons_.end(); ++polygon)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	938 {
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	939 double x1, y1, x2, y2;
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	940
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	941 if (polygon->Project(x1, y1, x2, y2, slice))
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	942 {
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	943 double curZ = polygon->GetGeometryOrigin()[2];
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	944
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	945 // x1,y1 and x2,y2 are in "slice" coordinates (the cutting plane
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	946 // geometry)
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	947 projected.push_back(std::make_pair(CreateRectangle(
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	948 static_cast<float>(x1),
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	949 static_cast<float>(y1),
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	950 static_cast<float>(x2),
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	951 static_cast<float>(y2)),curZ));
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	952 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	953 }
1162 709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	954
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	955 // projected contains a set of rectangles specified by two opposite
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	956 // corners (x1,y1,x2,y2)
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	957 // we need to merge them
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	958 // each slab yields ONE polygon!
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	959
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	960 // we need to sorted all the rectangles that originate from the same Z
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	961 // into lanes. To make sure they are grouped together in the array, we
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	962 // sort it.
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	963 std::sort(projected.begin(), projected.end(), CompareRectanglesForProjection);
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	964
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	965 std::vector<RtStructRectanglesInSlab> rectanglesForEachSlab;
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	966 rectanglesForEachSlab.reserve(projected.size());
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	967
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	968 double curZ = 0;
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	969 for (size_t i = 0; i < projected.size(); ++i)
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	970 {
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	971 #if 0
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	972 rectanglesForEachSlab.push_back(RtStructRectanglesInSlab());
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	973 #else
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	974 if (i == 0)
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	975 {
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	976 curZ = projected[i].second;
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	977 rectanglesForEachSlab.push_back(RtStructRectanglesInSlab());
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	978 }
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	979 else
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	980 {
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	981 // this check is needed to prevent creating a new slab if
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	982 // the new polygon is at the same Z coord than last one
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	983 if (!LinearAlgebra::IsNear(curZ, projected[i].second))
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	984 {
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	985 rectanglesForEachSlab.push_back(RtStructRectanglesInSlab());
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	986 curZ = projected[i].second;
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	987 }
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	988 }
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	989 #endif
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	990
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	991 rectanglesForEachSlab.back().push_back(projected[i].first);
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	992
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	993 // as long as they have the same y, we should put them into the same lane
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	994 // BUT in Sebastien's code, there is only one polygon per lane.
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	995
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	996 //std::cout << "rect: xmin = " << rect.xmin << " xmax = " << rect.xmax << " ymin = " << rect.ymin << " ymax = " << rect.ymax << std::endl;
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	997 }
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	998
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	999 // now we need to sort the slabs in increasing Y order (see ConvertListOfSlabsToSegments)
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	1000 std::sort(rectanglesForEachSlab.begin(), rectanglesForEachSlab.end(), CompareSlabsY);
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	1001
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1002 std::vector< std::pair<ScenePoint2D, ScenePoint2D> > segments;
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	1003 ConvertListOfSlabsToSegments(segments, rectanglesForEachSlab, projected.size());
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1004
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1005 chains.resize(segments.size());
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1006 for (size_t i = 0; i < segments.size(); i++)
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1007 {
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1008 chains[i].resize(2);
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1009 chains[i][0] = segments[i].first;
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1010 chains[i][1] = segments[i].second;
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1011 }
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	1012 #endif
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	1013
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	1014 return true;
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	1015 }
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	1016 else
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	1017 {
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	1018 return false;
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	1019 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1020 }
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1021
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1022
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1023 void DicomStructureSet::ProjectOntoLayer(PolylineSceneLayer& layer,
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1024 const CoordinateSystem3D& plane,
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1025 size_t structureIndex,
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1026 const Color& color) const
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1027 {
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1028 std::vector< std::vector<ScenePoint2D> > chains;
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1029
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1030 if (ProjectStructure(chains, structureIndex, plane))
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1031 {
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1032 for (size_t j = 0; j < chains.size(); j++)
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1033 {
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	1034 layer.AddChain(chains[j], false, color.GetRed(), color.GetGreen(), color.GetBlue());
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1035 }
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1036 }
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	1037 }
1885 ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1038
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1039
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1040 void DicomStructureSet::GetStructurePoints(std::list< std::vector<Vector> >& target,
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1041 size_t structureIndex,
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1042 const std::string& sopInstanceUid) const
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1043 {
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1044 target.clear();
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1045
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1046 const Structure& structure = GetStructure(structureIndex);
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1047
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1048 // TODO - Could be optimized by adding a multimap on "Structure", mapping
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1049 // from SOP Instance UID to polygons
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1050
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1051 for (Polygons::const_iterator it = structure.polygons_.begin();
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1052 it != structure.polygons_.end(); ++it)
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1053 {
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1054 if (it->GetSopInstanceUid() == sopInstanceUid)
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1055 {
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1056 target.push_back(it->GetPoints());
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1057 }
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1058 }
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	1059 }
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1060
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1061
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1062 void DicomStructureSet::EstimateGeometry()
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1063 {
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1064 static const double PI = boost::math::constants::pi<double>();
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1065
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1066 BucketAccumulator2D accumulator(0, PI, 9, /* for acos() */
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1067 -PI, PI, 9, /* for atan() */
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1068 true /* store values */);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1069
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1070 unsigned int countPolygons = 0;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1071 for (size_t i = 0; i < structures_.size(); i++)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1072 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1073 const Polygons& polygons = structures_[i].polygons_;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1074
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1075 for (Polygons::const_iterator it = polygons.begin(); it != polygons.end(); ++it)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1076 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1077 countPolygons++;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1078
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1079 const Points& points = it->GetPoints();
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1080
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1081 if (points.size() >= 3)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1082 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1083 // Compute the normal of the polygon using 3 successive points
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1084 Vector normal;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1085 bool valid = false;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1086
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1087 for (size_t i = 0; i + 2 < points.size(); i++)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1088 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1089 const Vector& a = points[i];
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1090 const Vector& b = points[i + 1];
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1091 const Vector& c = points[i + 2];
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1092 LinearAlgebra::CrossProduct(normal, b - a, c - a); // (*)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1093 LinearAlgebra::NormalizeVector(normal);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1094
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1095 if (LinearAlgebra::IsNear(boost::numeric::ublas::norm_2(normal), 1.0)) // (**)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1096 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1097 valid = true;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1098 break;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1099 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1100 }
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1101
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1102 if (valid)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1103 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1104 // Check that all the points of the polygon lie in the plane defined by the normal
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1105 double d1 = GeometryToolbox::ProjectAlongNormal(points[0], normal);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1106
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1107 for (size_t i = 1; i < points.size(); i++)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1108 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1109 double d2 = GeometryToolbox::ProjectAlongNormal(points[i], normal);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1110
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1111 if (!LinearAlgebra::IsNear(d1, d2))
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1112 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1113 valid = false;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1114 break;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1115 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1116 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1117 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1118
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1119 if (valid)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1120 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1121 if (normal[2] < 0)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1122 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1123 normal = -normal;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1124 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1125
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1126 // The normal is a non-zero unit vector because of () and (*), so "r == 1"
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1127 // https://en.wikipedia.org/wiki/Vector_fields_in_cylindrical_and_spherical_coordinates#Vector_fields_2
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1128
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1129 const double theta = acos(normal[2]);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1130 const double phi = atan(normal[1]);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1131 accumulator.AddValue(theta, phi);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1132 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1133 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1134 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1135 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1136
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1137 size_t bestX, bestY;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1138 accumulator.FindBestBucket(bestX, bestY);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1139
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1140 if (accumulator.GetBucketContentSize(bestX, bestY) > 0)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1141 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1142 double normalTheta, normalPhi;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1143 accumulator.ComputeBestMedian(normalTheta, normalPhi);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1144
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1145 // Back to (x,y,z) normal, taking "r == 1"
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1146 // https://en.wikipedia.org/wiki/Vector_fields_in_cylindrical_and_spherical_coordinates#Vector_fields_2
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1147 double sinTheta = sin(normalTheta);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1148 estimatedNormal_ = LinearAlgebra::CreateVector(sinTheta * cos(normalPhi), sinTheta * sin(normalPhi), cos(normalTheta));
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1149 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1150
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1151 std::vector<double> polygonsProjection;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1152 polygonsProjection.reserve(countPolygons);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1153
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1154 for (size_t i = 0; i < structures_.size(); i++)
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1155 {
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1156 const Polygons& polygons = structures_[i].polygons_;
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1157
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1158 for (Polygons::const_iterator it = polygons.begin(); it != polygons.end(); ++it)
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1159 {
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1160 const Points& points = it->GetPoints();
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1161 polygonsProjection.push_back(GeometryToolbox::ProjectAlongNormal(points[0], estimatedNormal_));
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1162 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1163 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1164
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1165 std::sort(polygonsProjection.begin(), polygonsProjection.end());
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1166
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1167 std::vector<double> deltas;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1168 deltas.reserve(polygonsProjection.size());
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1169
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1170 for (size_t i = 0; i + 1 < polygonsProjection.size(); i++)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1171 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1172 if (!LinearAlgebra::IsNear(polygonsProjection[i], polygonsProjection[i + 1]))
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1173 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1174 assert(polygonsProjection[i + 1] > polygonsProjection[i]);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1175 deltas.push_back(polygonsProjection[i + 1] - polygonsProjection[i]);
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1176 }
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1177 }
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1178
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1179 if (deltas.empty())
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1180 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1181 estimatedSliceThickness_ = 1;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1182 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1183 else
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1184 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1185 estimatedSliceThickness_ = LinearAlgebra::ComputeMedian(deltas);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1186 }
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1187 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1188 }

Mercurial > hg > orthanc-stone

annotate OrthancStone/Sources/Toolbox/DicomStructureSet.cpp @ 1898:a5e54bd87b25