Mercurial > hg > orthanc-stone
annotate Framework/Volumes/VolumeSceneLayerSource.cpp @ 1344:00c8322bbe69 broker
Ability to force a re-slice of the structure set volume.
This is a fix for the fact that the structure set does not
increase the slice revision when new polygons are added.
This should be fixed in the slicer but this is a temporary
fix until this is done properly.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Mon, 06 Apr 2020 08:44:10 +0200 |
| parents | 4d8d642f7036 |
| children | 0d6a01ffa1dd |
| rev | line source |
|---|---|
| 815 | 1 /** |
| 2 * Stone of Orthanc | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
1270
2d8ab34c8c91
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 815 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "VolumeSceneLayerSource.h" | |
| 23 | |
|
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
24 #include "../Scene2D/NullLayer.h" |
|
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
25 #include "../StoneException.h" |
|
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
26 |
| 815 | 27 #include <Core/OrthancException.h> |
| 28 | |
| 29 namespace OrthancStone | |
| 30 { | |
| 31 static bool IsSameCuttingPlane(const CoordinateSystem3D& a, | |
| 32 const CoordinateSystem3D& b) | |
| 33 { | |
| 34 // TODO - What if the normal is reversed? | |
| 35 double distance; | |
| 36 return (CoordinateSystem3D::ComputeDistance(distance, a, b) && | |
| 37 LinearAlgebra::IsCloseToZero(distance)); | |
| 38 } | |
| 39 | |
| 40 | |
| 41 void VolumeSceneLayerSource::ClearLayer() | |
| 42 { | |
| 43 scene_.DeleteLayer(layerDepth_); | |
| 44 lastPlane_.reset(NULL); | |
| 45 } | |
| 46 | |
| 47 | |
|
1322
0da659f8579c
Object reference 1st commit + indent change
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
48 VolumeSceneLayerSource::VolumeSceneLayerSource( |
|
0da659f8579c
Object reference 1st commit + indent change
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
49 Scene2D& scene, |
|
0da659f8579c
Object reference 1st commit + indent change
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
50 int layerDepth, |
|
0da659f8579c
Object reference 1st commit + indent change
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
51 const boost::shared_ptr<IVolumeSlicer>& slicer) |
|
0da659f8579c
Object reference 1st commit + indent change
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
52 : scene_(scene) |
|
0da659f8579c
Object reference 1st commit + indent change
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
53 , layerDepth_(layerDepth) |
|
0da659f8579c
Object reference 1st commit + indent change
Benjamin Golinvaux <bgo@osimis.io>
parents:
1298
diff
changeset
|
54 , slicer_(slicer) |
| 815 | 55 { |
| 56 if (slicer == NULL) | |
| 57 { | |
| 58 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 59 } | |
|
1324
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
60 ORTHANC_ASSERT(!scene_.HasLayer(layerDepth_)); |
|
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
61 |
|
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
62 // we need to book the scene layer depth by adding a dummy layer |
|
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
63 std::unique_ptr<NullLayer> nullLayer(new NullLayer); |
|
4d8d642f7036
Added a NullLayer scene layer type that allows
Benjamin Golinvaux <bgo@osimis.io>
parents:
1322
diff
changeset
|
64 scene_.SetLayer(layerDepth_,nullLayer.release()); |
| 815 | 65 } |
| 66 | |
|
934
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
67 VolumeSceneLayerSource::~VolumeSceneLayerSource() |
|
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
68 { |
|
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
69 ClearLayer(); |
|
094d10ed7ec2
VolumeSceneLayerSource dtor now clears the layer
Benjamin Golinvaux <bgo@osimis.io>
parents:
921
diff
changeset
|
70 } |
| 815 | 71 |
| 72 void VolumeSceneLayerSource::RemoveConfigurator() | |
| 73 { | |
| 74 configurator_.reset(); | |
| 75 lastPlane_.reset(); | |
| 76 } | |
| 77 | |
| 78 | |
| 79 void VolumeSceneLayerSource::SetConfigurator(ILayerStyleConfigurator* configurator) // Takes ownership | |
| 80 { | |
| 81 if (configurator == NULL) | |
| 82 { | |
| 83 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 84 } | |
| 85 | |
| 86 configurator_.reset(configurator); | |
| 87 | |
| 88 // Invalidate the layer | |
| 89 lastPlane_.reset(NULL); | |
| 90 } | |
| 91 | |
| 92 | |
| 93 ILayerStyleConfigurator& VolumeSceneLayerSource::GetConfigurator() const | |
| 94 { | |
| 95 if (configurator_.get() == NULL) | |
| 96 { | |
|
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
934
diff
changeset
|
97 LOG(ERROR) << "VolumeSceneLayerSource::GetConfigurator(): (configurator_.get() == NULL)"; |
| 815 | 98 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
| 99 } | |
| 100 | |
| 101 return *configurator_; | |
| 102 } | |
| 103 | |
| 104 | |
|
1344
00c8322bbe69
Ability to force a re-slice of the structure set volume.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1324
diff
changeset
|
105 void VolumeSceneLayerSource::Update(const CoordinateSystem3D& plane, bool forceLayerRecreation) |
| 815 | 106 { |
| 107 assert(slicer_.get() != NULL); | |
|
1298
8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1270
diff
changeset
|
108 std::unique_ptr<IVolumeSlicer::IExtractedSlice> slice(slicer_->ExtractSlice(plane)); |
| 815 | 109 |
| 110 if (slice.get() == NULL) | |
| 111 { | |
| 112 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 113 } | |
| 114 | |
| 115 if (!slice->IsValid()) | |
| 116 { | |
| 117 // The slicer cannot handle this cutting plane: Clear the layer | |
| 118 ClearLayer(); | |
| 119 } | |
|
1344
00c8322bbe69
Ability to force a re-slice of the structure set volume.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1324
diff
changeset
|
120 else if (!forceLayerRecreation && |
|
00c8322bbe69
Ability to force a re-slice of the structure set volume.
Benjamin Golinvaux <bgo@osimis.io>
parents:
1324
diff
changeset
|
121 lastPlane_.get() != NULL && |
| 815 | 122 IsSameCuttingPlane(*lastPlane_, plane) && |
| 123 lastRevision_ == slice->GetRevision()) | |
| 124 { | |
| 125 // The content of the slice has not changed: Don't update the | |
| 126 // layer content, but possibly update its style | |
| 127 | |
| 128 if (configurator_.get() != NULL && | |
| 129 configurator_->GetRevision() != lastConfiguratorRevision_ && | |
| 130 scene_.HasLayer(layerDepth_)) | |
| 131 { | |
| 132 configurator_->ApplyStyle(scene_.GetLayer(layerDepth_)); | |
| 133 } | |
| 134 } | |
| 135 else | |
| 136 { | |
|
921
81d30cd93b65
Ability to ask the loader for the geometry in PULL mode (when subscribing to the messages is not possible) + small changes (removed const/ref qualifiers for boost::shared_ptr param, added traces, doc change)
Benjamin Golinvaux <bgo@osimis.io>
parents:
815
diff
changeset
|
137 LOG(TRACE) << "VolumeSceneLayerSource::Update -- Content has changed: An update is needed"; |
| 815 | 138 // Content has changed: An update is needed |
| 139 lastPlane_.reset(new CoordinateSystem3D(plane)); | |
| 140 lastRevision_ = slice->GetRevision(); | |
| 141 | |
|
1298
8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1270
diff
changeset
|
142 std::unique_ptr<ISceneLayer> layer(slice->CreateSceneLayer(configurator_.get(), plane)); |
| 815 | 143 if (layer.get() == NULL) |
| 144 { | |
|
921
81d30cd93b65
Ability to ask the loader for the geometry in PULL mode (when subscribing to the messages is not possible) + small changes (removed const/ref qualifiers for boost::shared_ptr param, added traces, doc change)
Benjamin Golinvaux <bgo@osimis.io>
parents:
815
diff
changeset
|
145 LOG(TRACE) << "VolumeSceneLayerSource::Update -- (layer.get() == NULL)"; |
| 815 | 146 ClearLayer(); |
| 147 } | |
| 148 else | |
| 149 { | |
|
921
81d30cd93b65
Ability to ask the loader for the geometry in PULL mode (when subscribing to the messages is not possible) + small changes (removed const/ref qualifiers for boost::shared_ptr param, added traces, doc change)
Benjamin Golinvaux <bgo@osimis.io>
parents:
815
diff
changeset
|
150 LOG(TRACE) << "VolumeSceneLayerSource::Update -- (layer.get() != NULL)"; |
| 815 | 151 if (configurator_.get() != NULL) |
| 152 { | |
| 153 lastConfiguratorRevision_ = configurator_->GetRevision(); | |
| 154 configurator_->ApplyStyle(*layer); | |
| 155 } | |
| 156 | |
| 157 scene_.SetLayer(layerDepth_, layer.release()); | |
| 158 } | |
| 159 } | |
| 160 } | |
| 161 } |