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

annotate OrthancStone/Sources/Toolbox/DicomStructureSet.cpp @ 1908:affde38b84de

moved tentative bgo reimplementation of rt-struct into graveyard

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 01 Feb 2022 08:38:32 +0100
parents	e318b524ad3f
children	782ba9eb6f22

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 "UnionOfRectangles.h"
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	61 #endif
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	62
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	63 #if defined(_MSC_VER)
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	64 # pragma warning(pop)
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	65 #endif
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	66
1180 9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	67 #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	68 # 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	69 #endif
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	70
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	71
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	72 #if USE_BOOST_UNION_FOR_POLYGONS == 1
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	73
1895 14c8f339d480 removed redundant definitions Point2D, Point3D and Vector3D from DicomStructureSetUtils.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	74 typedef boost::geometry::model::d2::point_xy<double> BoostPoint;
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	75 typedef boost::geometry::model::polygon<BoostPoint> BoostPolygon;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	76 typedef boost::geometry::model::multi_polygon<BoostPolygon> BoostMultiPolygon;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	77
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	78 static void Union(BoostMultiPolygon& output,
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	79 std::vector<BoostPolygon>& input)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	80 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	81 for (size_t i = 0; i < input.size(); i++)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	82 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	83 boost::geometry::correct(input[i]);
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	84 }
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 if (input.size() == 0)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	87 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	88 output.clear();
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	89 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	90 else if (input.size() == 1)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	91 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	92 output.resize(1);
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	93 output[0] = input[0];
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	94 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	95 else
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	96 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	97 boost::geometry::union_(input[0], input[1], output);
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	98
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	99 for (size_t i = 0; i < input.size(); i++)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	100 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	101 BoostMultiPolygon tmp;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	102 boost::geometry::union_(output, input[i], tmp);
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	103 output = tmp;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	104 }
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 static BoostPolygon CreateRectangle(float x1, float y1,
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	109 float x2, float y2)
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	110 {
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	111 BoostPolygon r;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	112 boost::geometry::append(r, BoostPoint(x1, y1));
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	113 boost::geometry::append(r, BoostPoint(x1, y2));
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	114 boost::geometry::append(r, BoostPoint(x2, y2));
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	115 boost::geometry::append(r, BoostPoint(x2, y1));
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	116 return r;
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	117 }
c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	118
1908 affde38b84de moved tentative bgo reimplementation of rt-struct into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	119 #endif
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	120
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 namespace OrthancStone
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 {
1504 d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	124 static const Orthanc::DicomTag DICOM_TAG_CONTOUR_GEOMETRIC_TYPE(0x3006, 0x0042);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	125 static const Orthanc::DicomTag DICOM_TAG_CONTOUR_IMAGE_SEQUENCE(0x3006, 0x0016);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	126 static const Orthanc::DicomTag DICOM_TAG_CONTOUR_SEQUENCE(0x3006, 0x0040);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	127 static const Orthanc::DicomTag DICOM_TAG_CONTOUR_DATA(0x3006, 0x0050);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	128 static const Orthanc::DicomTag DICOM_TAG_NUMBER_OF_CONTOUR_POINTS(0x3006, 0x0046);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	129 static const Orthanc::DicomTag DICOM_TAG_REFERENCED_SOP_INSTANCE_UID(0x0008, 0x1155);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	130 static const Orthanc::DicomTag DICOM_TAG_ROI_CONTOUR_SEQUENCE(0x3006, 0x0039);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	131 static const Orthanc::DicomTag DICOM_TAG_ROI_DISPLAY_COLOR(0x3006, 0x002a);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	132 static const Orthanc::DicomTag DICOM_TAG_ROI_NAME(0x3006, 0x0026);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	133 static const Orthanc::DicomTag DICOM_TAG_RT_ROI_INTERPRETED_TYPE(0x3006, 0x00a4);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	134 static const Orthanc::DicomTag DICOM_TAG_RT_ROI_OBSERVATIONS_SEQUENCE(0x3006, 0x0080);
d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	135 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	136
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 static uint8_t ConvertColor(double v)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 if (v < 0)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 return 0;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 else if (v >= 255)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 return 255;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 else
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 return static_cast<uint8_t>(v);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151 }
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
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	155 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	156 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	157 const Orthanc::DicomPath& tag)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 {
118 a4d0b6c82b29 using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	159 std::string value;
a4d0b6c82b29 using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	160 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	161 GenericToolbox::FastParseVector(target, value));
118 a4d0b6c82b29 using Orthanc::DicomMap instead of OrthancPlugins::DicomDatasetReader Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	162 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163
988 4c9b4c4de814 Fixed bug in DicomStructureSet that prevented points from being added to polygons Benjamin Golinvaux <bgo@osimis.io> parents: 981 diff changeset	164 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	165 {
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	166 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	167 {
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	168 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	169 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	170 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	171 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	172 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	173 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	174 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	175 {
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	176 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	177 << "slice of its instance \| "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	178 << "magnitude = " << magnitude << " \| "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	179 << "projectionAlongNormal_ = " << projectionAlongNormal_ << " \| "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	180 << "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	181 }
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	182 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	183 }
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	184 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	185 {
988 4c9b4c4de814 Fixed bug in DicomStructureSet that prevented points from being added to polygons Benjamin Golinvaux <bgo@osimis.io> parents: 981 diff changeset	186 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	187 }
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	188 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	190 void DicomStructureSet::Polygon::AddPoint(const Vector& v)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	191 {
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	192 #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	193 // 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	194 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	195 {
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 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	197 }
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 #else
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	199 CheckPoint(v);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	200 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	201 #endif
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	202 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	203
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	204
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	205 bool DicomStructureSet::Polygon::UpdateReferencedSlice(const ReferencedSlices& slices)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	206 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	207 if (hasSlice_)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	209 return true;
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	210 }
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	211 else
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	212 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	213 ReferencedSlices::const_iterator it = slices.find(sopInstanceUid_);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	214
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	215 if (it == slices.end())
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	216 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	217 return false;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	218 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	219 else
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	220 {
1898 a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	221 // return true; // TODO - TEST
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	222
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	223 const CoordinateSystem3D& geometry = it->second.geometry_;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	224
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	225 hasSlice_ = true;
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	226 geometry_ = geometry;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	227 projectionAlongNormal_ = GeometryToolbox::ProjectAlongNormal(geometry.GetOrigin(), geometry.GetNormal());
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	228 sliceThickness_ = it->second.thickness_;
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229
1610 b7630b1a0253 ISceneLayer::GetBoundingBox() returns void Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	230 extent_.Clear();
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	231
1571 85e117739eca cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1512 diff changeset	232 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	233 {
1571 85e117739eca cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1512 diff changeset	234 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	235 {
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	236 double x, y;
1571 85e117739eca cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1512 diff changeset	237 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	238 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	239 }
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	240 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	241 return true;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	242 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245
1904 738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	246 bool DicomStructureSet::Polygon::IsOnSlice(const CoordinateSystem3D& slice,
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	247 const Vector& estimatedNormal,
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	248 double estimatedSliceThickness) const
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	249 {
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	250 bool isOpposite = false;
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	251
1904 738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	252 if (points_.empty())
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	253 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	254 return false;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	255 }
1904 738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	256 else if (hasSlice_)
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	257 {
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	258 // Use the actual geometry of this specific slice
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	259 if (!GeometryToolbox::IsParallelOrOpposite(isOpposite, slice.GetNormal(), geometry_.GetNormal()))
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	260 {
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	261 return false;
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	262 }
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	263 else
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	264 {
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	265 double d = GeometryToolbox::ProjectAlongNormal(slice.GetOrigin(), geometry_.GetNormal());
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	266 return (LinearAlgebra::IsNear(d, projectionAlongNormal_, sliceThickness_ / 2.0));
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	267 }
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	268 }
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	269 else
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	270 {
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	271 // Use the estimated geometry for the global RT-STRUCT volume
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	272 if (!GeometryToolbox::IsParallelOrOpposite(isOpposite, slice.GetNormal(), estimatedNormal))
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	273 {
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	274 return false;
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	275 }
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	276 else
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	277 {
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	278 double d1 = GeometryToolbox::ProjectAlongNormal(slice.GetOrigin(), estimatedNormal);
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	279 double d2 = GeometryToolbox::ProjectAlongNormal(points_.front(), estimatedNormal);
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	280 return (LinearAlgebra::IsNear(d1, d2, estimatedSliceThickness / 2.0));
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	281 }
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	282 }
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	283 }
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	284
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	285 bool DicomStructureSet::Polygon::Project(double& x1,
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	286 double& y1,
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	287 double& x2,
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	288 double& y2,
1904 738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	289 const CoordinateSystem3D& slice,
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	290 const Vector& estimatedNormal,
738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	291 double estimatedSliceThickness) const
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	292 {
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	293 if (!hasSlice_ \|\|
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	294 points_.size() <= 1)
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	295 {
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	296 return false;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	297 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	298
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	299 double x, y;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	300 geometry_.ProjectPoint2(x, y, slice.GetOrigin());
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	301
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	302 bool isOpposite;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	303 if (GeometryToolbox::IsParallelOrOpposite
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	304 (isOpposite, slice.GetNormal(), geometry_.GetAxisY()))
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	305 {
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	306 // plane is constant Y
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	307
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	308 if (y < extent_.GetY1() \|\|
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	309 y > extent_.GetY2())
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	310 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	311 // The polygon does not intersect the input slice
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	312 return false;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	313 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	314
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	315 bool isFirst = true;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	316 double xmin = std::numeric_limits<double>::infinity();
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	317 double xmax = -std::numeric_limits<double>::infinity();
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	318
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	319 double prevX, prevY;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	320 geometry_.ProjectPoint2(prevX, prevY, points_[points_.size() - 1]);
132 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 for (size_t i = 0; i < points_.size(); i++)
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	323 {
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	324 // Reference: ../../Resources/Computations/IntersectSegmentAndHorizontalLine.py
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	325 double curX, curY;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	326 geometry_.ProjectPoint2(curX, curY, points_[i]);
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	327
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	328 // 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	329 // 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	330 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	331 (prevY >= y && curY <= y))
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	332 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	333 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	334 xmin = std::min(xmin, p);
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	335 xmax = std::max(xmax, p);
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	336 isFirst = false;
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	337
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	338 // 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	339 // 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	340
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	341 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	342
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	343 prevX = curX;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	344 prevY = curY;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	345 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	346
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	347 // if NO segment intersects the plane
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	348 if (isFirst)
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 return false;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	351 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	352 else
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 // 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	355 // 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	356
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	357 // let's convert them to 3D world geometry...
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	358 Vector p1 = (geometry_.MapSliceToWorldCoordinates(xmin, y) +
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	359 sliceThickness_ / 2.0 * geometry_.GetNormal());
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	360 Vector p2 = (geometry_.MapSliceToWorldCoordinates(xmax, y) -
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	361 sliceThickness_ / 2.0 * geometry_.GetNormal());
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	362
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	363 // 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	364 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	365 slice.ProjectPoint2(x2, y2, p2);
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	366 return true;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	367 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	368 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	369 else if (GeometryToolbox::IsParallelOrOpposite
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	370 (isOpposite, slice.GetNormal(), geometry_.GetAxisX()))
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	371 {
1170 1644de437a7b fixes related to swapped normal in sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	372 // 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	373 // 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	374
1170 1644de437a7b fixes related to swapped normal in sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	375
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	376 /*
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	377 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	378 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	379 polygon geometry_ coordinates)
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	380 */
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	381
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	382 if (x < extent_.GetX1() \|\|
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	383 x > extent_.GetX2())
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	384 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	385 return false;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	386 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	387
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	388 bool isFirst = true;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	389 double ymin = std::numeric_limits<double>::infinity();
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	390 double ymax = -std::numeric_limits<double>::infinity();
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 double prevX, prevY;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	393 geometry_.ProjectPoint2(prevX, prevY, points_[points_.size() - 1]);
132 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 for (size_t i = 0; i < points_.size(); i++)
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	396 {
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	397 // Reference: ../../Resources/Computations/IntersectSegmentAndVerticalLine.py
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	398 double curX, curY;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	399 geometry_.ProjectPoint2(curX, curY, points_[i]);
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	400
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	401 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	402 (prevX >= x && curX <= x))
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	403 {
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	404 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	405 ymin = std::min(ymin, p);
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	406 ymax = std::max(ymax, p);
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	407 isFirst = false;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	408 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	409
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	410 prevX = curX;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	411 prevY = curY;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	412 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	413
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	414 if (isFirst)
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 return false;
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	417 }
35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	418 else
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 Vector p1 = (geometry_.MapSliceToWorldCoordinates(x, ymin) +
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	421 sliceThickness_ / 2.0 * geometry_.GetNormal());
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	422 Vector p2 = (geometry_.MapSliceToWorldCoordinates(x, ymax) -
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	423 sliceThickness_ / 2.0 * geometry_.GetNormal());
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	424
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	425 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	426 slice.ProjectPoint2(x2, y2, p2);
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	427
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	428 return true;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	429 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	430 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	431 else
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	432 {
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	433 // Should not happen
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	434 return false;
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	435 }
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
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439 const DicomStructureSet::Structure& DicomStructureSet::GetStructure(size_t index) const
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 if (index >= structures_.size())
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442 {
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	443 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 return structures_[index];
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
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 DicomStructureSet::Structure& DicomStructureSet::GetStructure(size_t index)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 {
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	452 if (index >= structures_.size())
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	453 {
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	454 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
0 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
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 return structures_[index];
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459
1504 d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	460 void DicomStructureSet::Setup(const IDicomDataset& tags)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461 {
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	462 #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	463 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	464 #endif
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	465
1504 d8af188ab545 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	466 DicomDatasetReader reader(tags);
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	467
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	468 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	469 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	470 !tags.GetSequenceSize(tmp, Orthanc::DicomPath(DICOM_TAG_ROI_CONTOUR_SEQUENCE)) \|\|
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	471 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	472 !tags.GetSequenceSize(tmp, Orthanc::DicomPath(DICOM_TAG_STRUCTURE_SET_ROI_SEQUENCE)) \|\|
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	473 tmp != count)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	474 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	476 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	478 structures_.resize(count);
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	479 for (size_t i = 0; i < count; i++)
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	480 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	481 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	482 (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	483 DICOM_TAG_RT_ROI_INTERPRETED_TYPE),
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	484 "No interpretation");
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	485
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	486 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	487 (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	488 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	489 "No name");
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	491 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	492 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	493 DICOM_TAG_ROI_DISPLAY_COLOR)) &&
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	494 color.size() == 3)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495 {
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	496 structures_[i].red_ = ConvertColor(color[0]);
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	497 structures_[i].green_ = ConvertColor(color[1]);
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	498 structures_[i].blue_ = ConvertColor(color[2]);
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	499 }
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	500 else
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	501 {
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	502 structures_[i].red_ = 255;
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	503 structures_[i].green_ = 0;
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	504 structures_[i].blue_ = 0;
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	507 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	508 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	509 DICOM_TAG_CONTOUR_SEQUENCE)))
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	510 {
121 e66b2c757790 displaying rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	511 countSlices = 0;
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	512 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513
841 266e2b0b9abc better error reporting in DicomStructureSetLoader + fixed POST request logic Benjamin Golinvaux <bgo@osimis.io> parents: 804 diff changeset	514 LOG(INFO) << "New RT structure: \"" << structures_[i].name_
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	515 << "\" with interpretation \"" << structures_[i].interpretation_
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	516 << "\" containing " << countSlices << " slices (color: "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	517 << static_cast<int>(structures_[i].red_) << ","
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	518 << static_cast<int>(structures_[i].green_) << ","
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	519 << static_cast<int>(structures_[i].blue_) << ")";
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	521 /**
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	522 * 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	523 * 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	524 * "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	525 **/
126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	526 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	527 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	528 DICOM_TAG_NUMBER_OF_CONTOUR_POINTS);
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	529
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	530 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	531 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	532 DICOM_TAG_CONTOUR_GEOMETRIC_TYPE);
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	533
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	534 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	535 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	536 DICOM_TAG_CONTOUR_IMAGE_SEQUENCE);
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	537
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	538 // (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	539 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	540 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	541 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	542 DICOM_TAG_REFERENCED_SOP_INSTANCE_UID);
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	543
1834 126522623e20 replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 1754 diff changeset	544 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	545 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	546 DICOM_TAG_CONTOUR_DATA);
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	547
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	548 for (size_t j = 0; j < countSlices; j++)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	549 {
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	550 unsigned int countPoints;
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	552 countPointsPath.SetPrefixIndex(1, j);
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	553 if (!reader.GetUnsignedIntegerValue(countPoints, countPointsPath))
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	554 {
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	555 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	556 }
517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	557
121 e66b2c757790 displaying rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	558 //LOG(INFO) << "Parsing slice containing " << countPoints << " vertices";
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	560 geometricTypePath.SetPrefixIndex(1, j);
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	561 std::string type = reader.GetMandatoryStringValue(geometricTypePath);
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	562 if (type != "CLOSED_PLANAR")
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	563 {
173 6b0411ac843a fix captain rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 159 diff changeset	564 LOG(WARNING) << "Ignoring contour with geometry type: " << type;
6b0411ac843a fix captain rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 159 diff changeset	565 continue;
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	567
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	568 size_t size;
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	569
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	570 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	571 if (!tags.GetSequenceSize(size, imageSequencePath) \|\| size != 1)
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	572 {
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	573 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	574 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576
786 5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	577 referencedInstancePath.SetPrefixIndex(1, j);
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	578 std::string sopInstanceUid = reader.GetMandatoryStringValue(referencedInstancePath);
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	579
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	580 contourDataPath.SetPrefixIndex(1, j);
5aa728500586 optimizing constructor of DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 738 diff changeset	581 std::string slicesData = reader.GetMandatoryStringValue(contourDataPath);
0 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 Vector points;
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	584
946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	585 if (!GenericToolbox::FastParseVector(points, slicesData) \|\|
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	586 points.size() != 3 * countPoints)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
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
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	591 // 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	592 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	593 {
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	594 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	595 }
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	596
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	597 Polygon polygon(sopInstanceUid);
132 35c2b85836ce fix rtstruct projections Sebastien Jodogne <s.jodogne@gmail.com> parents: 131 diff changeset	598 polygon.Reserve(countPoints);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599
32 517c46f527cd sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 31 diff changeset	600 for (size_t k = 0; k < countPoints; k++)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602 Vector v(3);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 v[0] = points[3 * k];
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604 v[1] = points[3 * k + 1];
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	605 v[2] = points[3 * k + 2];
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	606 polygon.AddPoint(v);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607 }
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 structures_[i].polygons_.push_back(polygon);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611 }
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	612
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	613 EstimateGeometry();
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	614
1751 946eb7200b82 FastParseVector usage + timing instrumentation guarded by STONE_TIME_BLOCKING_OPS Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	615 #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	616 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	617 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	618 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	619 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	620 #endif
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	621 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	623
1180 9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	624 #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	625 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	626 {
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	627 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	628 Setup(dataset);
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	629 }
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	630 #endif
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	631
9c8f557ea799 ParsedDicomDataset to speed up loading RT-STRUCT from parsed DICOM files Sebastien Jodogne <s.jodogne@gmail.com> parents: 1178 diff changeset	632
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 Vector DicomStructureSet::GetStructureCenter(size_t index) const
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	634 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635 const Structure& structure = GetStructure(index);
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	636
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 Vector center;
158 a053ca7fa5c6 LinearAlgebra toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	638 LinearAlgebra::AssignVector(center, 0, 0, 0);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639 if (structure.polygons_.empty())
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	641 return center;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	642 }
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 double n = static_cast<double>(structure.polygons_.size());
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	645
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	646 for (Polygons::const_iterator polygon = structure.polygons_.begin();
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 polygon != structure.polygons_.end(); ++polygon)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	649 if (!polygon->GetPoints().empty())
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	651 center += polygon->GetPoints().front() / n;
0 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 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 return center;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	657
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	658
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	659 const std::string& DicomStructureSet::GetStructureName(size_t index) const
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 return GetStructure(index).name_;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662 }
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 const std::string& DicomStructureSet::GetStructureInterpretation(size_t index) const
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	666 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	667 return GetStructure(index).interpretation_;
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668 }
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
804 61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	671 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	672 {
61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	673 const Structure& s = GetStructure(index);
61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	674 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	675 }
61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	676
61ba4b504e9a PolylineSceneLayer now has one color per chain Sebastien Jodogne <s.jodogne@gmail.com> parents: 794 diff changeset	677
1885 ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	678 void DicomStructureSet::GetReferencedInstances(std::set<std::string>& instances) const
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	679 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	680 for (Structures::const_iterator structure = structures_.begin();
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	681 structure != structures_.end(); ++structure)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	682 {
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	683 for (Polygons::const_iterator polygon = structure->polygons_.begin();
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 polygon != structure->polygons_.end(); ++polygon)
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	686 instances.insert(polygon->GetSopInstanceUid());
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	687 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	688 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	689 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	690
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	691
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	692 void DicomStructureSet::AddReferencedSlice(const std::string& sopInstanceUid,
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	693 const std::string& seriesInstanceUid,
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	694 const CoordinateSystem3D& geometry,
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	695 double thickness)
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 if (referencedSlices_.find(sopInstanceUid) != referencedSlices_.end())
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 // 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	700 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	701
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	702 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
122 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 else
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 if (thickness < 0)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	707 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	708 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	709 }
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 if (!referencedSlices_.empty())
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 const ReferencedSlice& reference = referencedSlices_.begin()->second;
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 if (reference.seriesInstanceUid_ != seriesInstanceUid)
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	716 {
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	717 LOG(ERROR) << "This RT-STRUCT refers to several different series";
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	718 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	719 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	720
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	721 if (!GeometryToolbox::IsParallel(reference.geometry_.GetNormal(), geometry.GetNormal()))
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	722 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	723 LOG(ERROR) << "The slices in this RT-STRUCT are not parallel";
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	724 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	725 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	726 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	727
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	728 referencedSlices_[sopInstanceUid] = ReferencedSlice(seriesInstanceUid, geometry, thickness);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	729
131 3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	730 for (Structures::iterator structure = structures_.begin();
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	731 structure != structures_.end(); ++structure)
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	732 {
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	733 for (Polygons::iterator polygon = structure->polygons_.begin();
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	734 polygon != structure->polygons_.end(); ++polygon)
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	735 {
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	736 polygon->UpdateReferencedSlice(referencedSlices_);
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	737 }
3e6163a53b16 optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	738 }
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	739 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	740 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	741
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	742
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	743 void DicomStructureSet::AddReferencedSlice(const Orthanc::DicomMap& dataset)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	744 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	745 CoordinateSystem3D slice(dataset);
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 double thickness = 1; // 1 mm by default
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	749 std::string s;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	750 Vector v;
994 1f74bc3459ba fix build due to rename in Orthanc::DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 988 diff changeset	751 if (dataset.LookupStringValue(s, Orthanc::DICOM_TAG_SLICE_THICKNESS, false) &&
158 a053ca7fa5c6 LinearAlgebra toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	752 LinearAlgebra::ParseVector(v, s) &&
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	753 v.size() > 0)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	754 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	755 thickness = v[0];
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	756 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	757
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	758 std::string instance, series;
994 1f74bc3459ba fix build due to rename in Orthanc::DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 988 diff changeset	759 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	760 dataset.LookupStringValue(series, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, false))
122 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 AddReferencedSlice(instance, series, slice, thickness);
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 else
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	765 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	766 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	767 }
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
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 void DicomStructureSet::CheckReferencedSlices()
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 for (Structures::iterator structure = structures_.begin();
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	774 structure != structures_.end(); ++structure)
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 for (Polygons::iterator polygon = structure->polygons_.begin();
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	777 polygon != structure->polygons_.end(); ++polygon)
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	778 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	779 if (!polygon->UpdateReferencedSlice(referencedSlices_))
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	780 {
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	781 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	782 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	783 {
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	784 LOG(ERROR) << "DicomStructureSet::CheckReferencedSlices(): "
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	785 << " missing information about referenced instance "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	786 << "(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	787 }
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 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	789 {
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 LOG(ERROR) << "DicomStructureSet::CheckReferencedSlices(): "
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	791 << " missing information about referenced instance "
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	792 << "(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	793 }
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 //throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	795 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796 }
351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	797 }
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	798 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	799
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	800
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	801 Vector DicomStructureSet::GetNormal() const
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	802 {
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	803 if (referencedSlices_.empty())
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	804 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	805 Vector v;
158 a053ca7fa5c6 LinearAlgebra toolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	806 LinearAlgebra::AssignVector(v, 0, 0, 1);
122 e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	807 return v;
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	808 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	809 else
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	810 {
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	811 return referencedSlices_.begin()->second.geometry_.GetNormal();
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	812 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	813 }
e3433dabfb8d refactoring DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 121 diff changeset	814
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	815 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	816 const Structure& structure,
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	817 const CoordinateSystem3D& sourceSlice) const
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	818 {
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	819 const CoordinateSystem3D slice = CoordinateSystem3D::NormalizeCuttingPlane(sourceSlice);
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	820
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	821 chains.clear();
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	822
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	823 Vector normal = GetNormal();
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	824
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	825 bool isOpposite;
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	826 if (GeometryToolbox::IsParallelOrOpposite(isOpposite, normal, slice.GetNormal()))
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	827 {
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	828 // This is an axial projection
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	829
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	830 chains.reserve(structure.polygons_.size());
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	831
794 04f518ebd132 LoaderStateMachine Sebastien Jodogne <s.jodogne@gmail.com> parents: 792 diff changeset	832 for (Polygons::const_iterator polygon = structure.polygons_.begin();
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	833 polygon != structure.polygons_.end(); ++polygon)
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	834 {
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	835 const Points& points = polygon->GetPoints();
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	836
1904 738814c24574 speed up rendering of axial slices of RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	837 if (polygon->IsOnSlice(slice, GetEstimatedNormal(), GetEstimatedSliceThickness()) &&
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	838 !points.empty())
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	839 {
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	840 chains.push_back(std::vector<ScenePoint2D>());
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	841 chains.back().reserve(points.size() + 1);
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	842
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	843 for (Points::const_iterator p = points.begin();
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	844 p != points.end(); ++p)
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	845 {
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	846 double x, y;
1013 53cc787bd7bc - Added an optimized ProjectPoint2 to CoordinateSystem3D. It has not replaced Benjamin Golinvaux <bgo@osimis.io> parents: 1006 diff changeset	847 slice.ProjectPoint2(x, y, *p);
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	848 chains.back().push_back(ScenePoint2D(x, y));
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	849 }
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	850
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	851 double x0, y0;
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	852 slice.ProjectPoint2(x0, y0, points.front());
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	853 chains.back().push_back(ScenePoint2D(x0, y0));
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	854 }
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	855 }
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	856
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	857 return true;
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	858 }
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	859 else if (GeometryToolbox::IsParallelOrOpposite(isOpposite, normal, slice.GetAxisX()) \|\|
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	860 GeometryToolbox::IsParallelOrOpposite(isOpposite, normal, slice.GetAxisY()))
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	861 {
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	862 // Sagittal or coronal projection
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	863
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	864 #if USE_BOOST_UNION_FOR_POLYGONS == 1
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	865 std::vector<BoostPolygon> projected;
1162 709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	866
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	867 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	868 polygon != structure.polygons_.end(); ++polygon)
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	869 {
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	870 double x1, y1, x2, y2;
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	871
1905 e318b524ad3f use UnionOfRectangles algorithm to render RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	872 if (polygon->Project(x1, y1, x2, y2, slice, GetEstimatedNormal(), GetEstimatedSliceThickness()))
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 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	875 }
709aa65aca17 recovery of USE_BOOST_UNION_FOR_POLYGONS Sebastien Jodogne <s.jodogne@gmail.com> parents: 1013 diff changeset	876 }
1897 144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	877
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	878 BoostMultiPolygon merged;
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	879 Union(merged, projected);
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	880
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	881 chains.resize(merged.size());
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	882 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	883 {
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	884 const std::vector<BoostPoint>& outer = merged[i].outer();
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	885
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	886 chains[i].resize(outer.size());
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	887 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	888 {
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	889 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	890 }
144f8f82c15a added ctrl key in RtViewerWasm Sebastien Jodogne <s.jodogne@gmail.com> parents: 1896 diff changeset	891 }
1898 a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	892
1908 affde38b84de moved tentative bgo reimplementation of rt-struct into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 1905 diff changeset	893 #else
1898 a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	894
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	895 std::list<Extent2D> rectangles;
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	896
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	897 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	898 polygon != structure.polygons_.end(); ++polygon)
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 double x1, y1, x2, y2;
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	901
1905 e318b524ad3f use UnionOfRectangles algorithm to render RT-STRUCT Sebastien Jodogne <s.jodogne@gmail.com> parents: 1904 diff changeset	902 if (polygon->Project(x1, y1, x2, y2, slice, GetEstimatedNormal(), GetEstimatedSliceThickness()))
1898 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 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	905 }
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	906 }
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	907
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	908 typedef std::list< std::vector<ScenePoint2D> > Contours;
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	909
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	910 Contours contours;
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	911 UnionOfRectangles::Apply(contours, rectangles);
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 chains.reserve(contours.size());
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 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	916 {
a5e54bd87b25 try to use UnionOfRectangles in DicomStructureSet Sebastien Jodogne <s.jodogne@gmail.com> parents: 1897 diff changeset	917 chains.push_back(*it);
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
1000 50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	920 #endif
50e5acf5553b changed RTSTRUCT rendering from polygons to segments Benjamin Golinvaux <bgo@osimis.io> parents: 994 diff changeset	921
126 c9e88e7935a4 rt-struct projection Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	922 return true;
125 44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	923 }
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	924 else
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	925 {
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	926 return false;
44fc253d4876 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	927 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	928 }
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	929
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	930
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	931 void DicomStructureSet::ProjectOntoLayer(PolylineSceneLayer& layer,
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	932 const CoordinateSystem3D& plane,
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	933 size_t structureIndex,
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	934 const Color& color) const
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	935 {
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	936 std::vector< std::vector<ScenePoint2D> > chains;
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	937
b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	938 if (ProjectStructure(chains, structureIndex, plane))
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	939 {
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	940 for (size_t j = 0; j < chains.size(); j++)
1178 3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	941 {
1896 b3c08e607d9f simplified signature of DicomStructureSet::ProjectStructure() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1895 diff changeset	942 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	943 }
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	944 }
3c7cdbf32e2a DicomStructureSet::ProjectOntoLayer() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1170 diff changeset	945 }
1885 ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	946
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	947
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	948 void DicomStructureSet::GetStructurePoints(std::list< std::vector<Vector> >& target,
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	949 size_t structureIndex,
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	950 const std::string& sopInstanceUid) const
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	951 {
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	952 target.clear();
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	953
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	954 const Structure& structure = GetStructure(structureIndex);
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	955
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	956 // 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	957 // from SOP Instance UID to polygons
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	958
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	959 for (Polygons::const_iterator it = structure.polygons_.begin();
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	960 it != structure.polygons_.end(); ++it)
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	961 {
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	962 if (it->GetSopInstanceUid() == sopInstanceUid)
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	963 {
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	964 target.push_back(it->GetPoints());
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	965 }
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	966 }
ddaee6b96501 retrieving rt-struct info Sebastien Jodogne <s.jodogne@gmail.com> parents: 1871 diff changeset	967 }
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	968
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	969
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	970 void DicomStructureSet::EstimateGeometry()
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	971 {
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	972 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	973
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	974 BucketAccumulator2D accumulator(0, PI, 9, /* for acos() */
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	975 -PI, PI, 9, /* for atan() */
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	976 true /* store values */);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	977
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	978 unsigned int countPolygons = 0;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	979 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	980 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	981 const Polygons& polygons = structures_[i].polygons_;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	982
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	983 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	984 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	985 countPolygons++;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	986
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	987 const Points& points = it->GetPoints();
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	988
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	989 if (points.size() >= 3)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	990 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	991 // 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	992 Vector normal;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	993 bool valid = false;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	994
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	995 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	996 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	997 const Vector& a = points[i];
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	998 const Vector& b = points[i + 1];
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	999 const Vector& c = points[i + 2];
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1000 LinearAlgebra::CrossProduct(normal, b - a, c - a); // (*)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1001 LinearAlgebra::NormalizeVector(normal);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1002
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1003 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	1004 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1005 valid = true;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1006 break;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1007 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1008 }
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1009
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1010 if (valid)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1011 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1012 // 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	1013 double d1 = GeometryToolbox::ProjectAlongNormal(points[0], normal);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1014
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1015 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	1016 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1017 double d2 = GeometryToolbox::ProjectAlongNormal(points[i], normal);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1018
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1019 if (!LinearAlgebra::IsNear(d1, d2))
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1020 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1021 valid = false;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1022 break;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1023 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1024 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1025 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1026
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1027 if (valid)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1028 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1029 if (normal[2] < 0)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1030 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1031 normal = -normal;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1032 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1033
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1034 // 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	1035 // 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	1036
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1037 const double theta = acos(normal[2]);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1038 const double phi = atan(normal[1]);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1039 accumulator.AddValue(theta, phi);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1040 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1041 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1042 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1043 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1044
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1045 size_t bestX, bestY;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1046 accumulator.FindBestBucket(bestX, bestY);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1047
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1048 if (accumulator.GetBucketContentSize(bestX, bestY) > 0)
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1049 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1050 double normalTheta, normalPhi;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1051 accumulator.ComputeBestMedian(normalTheta, normalPhi);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1052
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1053 // 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	1054 // 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	1055 double sinTheta = sin(normalTheta);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1056 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	1057 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1058
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1059 std::vector<double> polygonsProjection;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1060 polygonsProjection.reserve(countPolygons);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1061
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1062 for (size_t i = 0; i < structures_.size(); i++)
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1063 {
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1064 const Polygons& polygons = structures_[i].polygons_;
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1065
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1066 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	1067 {
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1068 const Points& points = it->GetPoints();
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1069 polygonsProjection.push_back(GeometryToolbox::ProjectAlongNormal(points[0], estimatedNormal_));
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1070 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1071 }
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 std::sort(polygonsProjection.begin(), polygonsProjection.end());
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 std::vector<double> deltas;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1076 deltas.reserve(polygonsProjection.size());
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1077
1892 cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1078 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	1079 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1080 if (!LinearAlgebra::IsNear(polygonsProjection[i], polygonsProjection[i + 1]))
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1081 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1082 assert(polygonsProjection[i + 1] > polygonsProjection[i]);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1083 deltas.push_back(polygonsProjection[i + 1] - polygonsProjection[i]);
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1084 }
6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1085 }
1892 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 if (deltas.empty())
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 estimatedSliceThickness_ = 1;
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1090 }
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1091 else
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1092 {
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1093 estimatedSliceThickness_ = LinearAlgebra::ComputeMedian(deltas);
cdf91ad891a5 estimated geometry of rt-struct Sebastien Jodogne <s.jodogne@gmail.com> parents: 1890 diff changeset	1094 }
1890 6ce81914f7e4 added classes BucketAccumulator1D/2D Sebastien Jodogne <s.jodogne@gmail.com> parents: 1885 diff changeset	1095 }
0 351ab0da0150 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1096 }

Mercurial > hg > orthanc-stone

annotate OrthancStone/Sources/Toolbox/DicomStructureSet.cpp @ 1908:affde38b84de