X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vv%2FvvMeshReader.cxx;h=980e17d157346cc42e6f6e3e151a94b80a7a5277;hb=dfb1627eab468417ab2682a03a4a66cf6830b921;hp=7bae8117ca6b33816139a57e4714f5f54a83a081;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git
diff --git a/vv/vvMeshReader.cxx b/vv/vvMeshReader.cxx
index 7bae811..980e17d 100644
--- a/vv/vvMeshReader.cxx
+++ b/vv/vvMeshReader.cxx
@@ -1,26 +1,20 @@
/*=========================================================================
+ Program: vv http://www.creatis.insa-lyon.fr/rio/vv
- Program: vv
- Language: C++
- Author : Joel Schaerer (joel.schaerer@insa-lyon.fr)
+ Authors belong to:
+ - University of LYON http://www.universite-lyon.fr/
+ - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
+ - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr
-Copyright (C) 2008
-Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-CREATIS-LRMN http://www.creatis.insa-lyon.fr
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the copyright notices for more information.
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
+ It is distributed under dual licence
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-=========================================================================*/
+ - BSD See included LICENSE.txt file
+ - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
#include
#include
@@ -49,7 +43,7 @@ vvMeshReader::vvMeshReader() :
void vvMeshReader::Update()
{
//Show a progress bar only when opening a DC-struct (ie. multiple contours)
- vvProgressDialog progress("Opening " + filename,(not vtk_mode) and (selected_contours.size()>1));
+ vvProgressDialog progress("Opening " + filename,(!vtk_mode) && (selected_contours.size()>1));
this->start();
while (this->isRunning())
{
@@ -68,6 +62,7 @@ void vvMeshReader::run()
vvMesh::Pointer m=vvMesh::New();
m->ReadFromVTK(filename.c_str());
if (vf) m->propagateContour(vf);
+ m->ComputeMasks(image->GetVTKImages()[0],true);
result.push_back(m);
}
else //Read a Dicom-struct file