Mercurial > hg > orthanc-stone
comparison Framework/Radiography/RadiographySceneReader.cpp @ 488:aede9b042cb7 am-touch-events
now using ImageProcessing::FillPolygon
author | am@osimis.io |
---|---|
date | Tue, 19 Feb 2019 11:40:14 +0100 |
parents | 159a465e27bd |
children | 92305ee35b1c |
comparison
equal
deleted
inserted
replaced
487:e4febcef669e | 488:aede9b042cb7 |
---|---|
53 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // we always assumed the dicom layer was read before the mask | 53 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); // we always assumed the dicom layer was read before the mask |
54 } | 54 } |
55 ReadLayerGeometry(geometry, jsonLayer); | 55 ReadLayerGeometry(geometry, jsonLayer); |
56 | 56 |
57 float foreground = jsonLayer["foreground"].asFloat(); | 57 float foreground = jsonLayer["foreground"].asFloat(); |
58 std::vector<MaskPoint> corners; | 58 std::vector<Orthanc::ImageProcessing::ImagePoint> corners; |
59 for (size_t i = 0; i < jsonLayer["corners"].size(); i++) | 59 for (size_t i = 0; i < jsonLayer["corners"].size(); i++) |
60 { | 60 { |
61 MaskPoint corner(jsonLayer["corners"][(int)i]["x"].asUInt(), | 61 Orthanc::ImageProcessing::ImagePoint corner(jsonLayer["corners"][(int)i]["x"].asInt(), |
62 jsonLayer["corners"][(int)i]["y"].asUInt()); | 62 jsonLayer["corners"][(int)i]["y"].asInt()); |
63 corners.push_back(corner); | 63 corners.push_back(corner); |
64 } | 64 } |
65 | 65 |
66 scene_.LoadMask(corners, *dicomLayer, foreground, &geometry); | 66 scene_.LoadMask(corners, *dicomLayer, foreground, &geometry); |
67 } | 67 } |