Program: gdcm
Module: $RCSfile: vtkgdcmSerieViewer2.cxx,v $
Language: C++
- Date: $Date: 2006/01/26 16:01:06 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2007/06/08 12:41:07 $
+ Version: $Revision: 1.9 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// SerieHelper::SetOrderToReverse,
// SerieHelper::SetUserLessThanFunction
// SerieHelper::SetLoadMode
+// SerieHelper::SetDropDuplicatePositions
// vtkGdcmReader::SetUserFunction
// vtkGdcmReader::SetCoherentFileList
// Usage:
#endif
void userSuppliedMirrorFunction (uint8_t *im, gdcm::File *f);
-void userSuppliedTopDownFunction(uint8_t *im, gdcm::File *f);
+void userSuppliedUpsideDownFunction(uint8_t *im, gdcm::File *f);
bool userSuppliedLessThanFunction(gdcm::File *f1, gdcm::File *f2);
bool userSuppliedLessThanFunction2(gdcm::File *f1, gdcm::File *f2);
{
if ( event == vtkCommand::CharEvent )
{
+#if (VTK_MAJOR_VERSION >= 5)
+ int max = ImageViewer->GetSliceMax();
+ int slice = (ImageViewer->GetSlice() + 1 ) % ++max;
+ ImageViewer->SetSlice( slice );
+#else
int max = ImageViewer->GetWholeZMax();
int slice = (ImageViewer->GetZSlice() + 1 ) % ++max;
ImageViewer->SetZSlice( slice );
+#endif
+#if !( (VTK_MAJOR_VERSION >= 5) || ( VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION >= 5 ) )
+ // This used to be a bug in version VTK 4.4 and earlier
ImageViewer->GetRenderer()->ResetCameraClippingRange();
+#endif
ImageViewer->Render();
}
}
" usage: vtkgdcmSerieViewer dirname=sourcedirectory ",
" [noshadowseq][noshadow][noseq] ",
" [reverse] [{[mirror]|[topdown]|[rotate]}] ",
- " [order=] [check][debug] ",
+ " [order=] [nodup][check][debug] ",
" sourcedirectory : name of the directory holding the images ",
" if it holds more than one serie, ",
- " only the first one id displayed. ",
+ " only the first one is displayed. ",
" noshadowseq: user doesn't want to load Private Sequences ",
" noshadow : user doesn't want to load Private groups (odd number) ",
" noseq : user doesn't want to load Sequences ",
" reverse : user wants to sort the images reverse order ",
- " mirror : user wants to 'mirror' the images | just some simple ",
- " topdown : user wants to 'topdown' the images| examples of user ",
- " rotate : NOT YET MADE (useless?) | supplied functions ",
+ " mirror : user wants to 'mirror' the images | just some simple",
+ " upsidedown : user wants to 'upsidedown' the images| examples of user",
+ " | suppliedfunction",
" check : user wants to force more coherence checking ",
" order= : group1-elem1,group2-elem2,... (in hexa, no space) ",
" if we want to use them as a sort criterium ",
" Right now : ValEntries only -just an example- ",
" or ",
" order= : order=name if we want to sort on file name (why not ?) ",
- " debug : user wants to run the program in 'debug mode' ",
+ " nodup : user wants to drop duplicate positions ",
+ " debug : developper wants to run the program in 'debug mode' ",
FINISH_USAGE
}
int reverse = am->ArgMgrDefined("reverse");
+ int nodup = am->ArgMgrDefined("nodup");
+ int mirror = am->ArgMgrDefined("mirror");
+ int upsidedown = am->ArgMgrDefined("upsidedown");
- int mirror = am->ArgMgrDefined("mirror");
- int topdown = am->ArgMgrDefined("topdown");
- int rotate = am->ArgMgrDefined("rotate");
-
- if ( mirror && topdown )
+ if ( mirror && upsidedown )
{
- std::cout << "mirror *OR* topDown !"
+ std::cout << "*EITHER* mirror *OR* upsidedown !"
<< std::endl;
delete am;
return 0;
}
- if ( rotate )
- {
- std::cout << "'rotate' undealt with -> ignored !"
- << std::endl;
- }
int check = am->ArgMgrDefined("check");
else if (orderNb != 0)
sh->SetUserLessThanFunction(userSuppliedLessThanFunction);
+ if (nodup)
+ sh->SetDropDuplicatePositions(true);
+
while (l)
{
nbFiles = l->size() ;
if ( l->size() > 1 )
{
std::cout << "Sort list : " << nbFiles << " long" << std::endl;
- sh->OrderFileList(l); // sort the list
+
+ //---------------------------------------------------------
+ sh->OrderFileList(l); // sort the list (and compute ZSpacing !)
+ //---------------------------------------------------------
+
+ double zsp = sh->GetZSpacing();
+ std::cout << "List sorted, ZSpacing = " << zsp << std::endl;
break; // The first one is OK. user will have to check
}
else
if (mirror)
reader->SetUserFunction (userSuppliedMirrorFunction);
- else if (topdown)
- reader->SetUserFunction (userSuppliedTopDownFunction);
+ else if (upsidedown)
+ reader->SetUserFunction (userSuppliedUpsideDownFunction);
// Only the first FileList is dealt with (just an example)
// (The files will not be parsed twice by the reader)
// --------------------------------------------------------
// This is just a *very* simple example of user supplied function
-// to topdown (why not ?) the image
+// to upsidedown (why not ?) the image
// It's *not* part of gdcm.
// --------------------------------------------------------
} \
}
-void userSuppliedTopDownFunction(uint8_t *im, gdcm::File *f)
+void userSuppliedUpsideDownFunction(uint8_t *im, gdcm::File *f)
{
if (f->GetZSize() != 1)
{
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff