From: frog Date: Fri, 30 Apr 2004 14:50:35 +0000 (+0000) Subject: * Doc/CMakeLists.txt: the main page is now properly differentiated X-Git-Tag: Version0.5.bp~214 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4c497616c365096ee0cba3add6b36cac7277e9cb;p=gdcm.git * Doc/CMakeLists.txt: the main page is now properly differentiated between the developper and user version. * Doc/doxygen.config.in: dropped search related obsolete flags * src/gdcmParser.h: doxygenation --- diff --git a/.cvsignore b/.cvsignore index f2988cb1..55f3c305 100644 --- a/.cvsignore +++ b/.cvsignore @@ -23,4 +23,15 @@ gdcm.spec *.opt *Python.cxx *lib* - +CMakeCCompiler.cmake +CMakeCXXCompiler.cmake +CMakeCache.txt +CMakeOutput.log +CMakeSystem.cmake +CMakeTmp +DartConfiguration.tcl +DartTestfile.txt +cmake.check_cache +cmake.check_depends +cmake.depends +gdcmConfigure.h diff --git a/ChangeLog b/ChangeLog index cb5d546f..dd6c8778 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-04-30 Eric Boix * Doc/gdcmUML.xmi added raw UML class view (umbrello format) + * Doc/CMakeLists.txt: the main page is now properly differentiated + between the developper and user version. + * Doc/doxygen.config.in: dropped search related obsolete flags + * src/gdcmParser.h, gdcmHeader.h: doxygenation 2004-04-29 Eric Boix * DEVELOPPER: added some helpfull comments for compile/test/install diff --git a/DEVELOPPER b/DEVELOPPER index 1cf346e6..f70ac33a 100644 --- a/DEVELOPPER +++ b/DEVELOPPER @@ -60,7 +60,7 @@ The following comments are intended for core gdcm developpers. followed the above instructions). * Python related section. - Depending on the automake/autoconf/autogen.sh flags you used gdcm could + Depending on the cmake flags you used in order to compile gdcm could be wrapped in two ways: - the first python wrappers of gdcm uses Swig (http://www.swig.org). These are the one generated when using autogen.sh --enable-python. diff --git a/Dicts/.cvsignore b/Dicts/.cvsignore index 282522db..ed951f5c 100644 --- a/Dicts/.cvsignore +++ b/Dicts/.cvsignore @@ -1,2 +1,5 @@ Makefile Makefile.in +DartTestfile.txt +cmake.check_depends +cmake.depends diff --git a/Doc/.cvsignore b/Doc/.cvsignore index 02d7429b..5c950243 100644 --- a/Doc/.cvsignore +++ b/Doc/.cvsignore @@ -2,4 +2,6 @@ Makefile Makefile.in html.developper html.user - +DartTestfile.txt +cmake.check_depends +cmake.depends diff --git a/Doc/CMakeLists.txt b/Doc/CMakeLists.txt index 25076fcd..a4fceaf7 100644 --- a/Doc/CMakeLists.txt +++ b/Doc/CMakeLists.txt @@ -23,7 +23,7 @@ IF(GDCM_DOXYGEN) # http://www.cmake.org/pipermail/cmake/2003-April/003673.html # Too bad CMake doesn't support multiline "" SET(GDCM_DOXYGEN_INPUT_COMMON - "${GDCM_SOURCE_DIR}/src ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt ${GDCM_SOURCE_DIR}/Doc/DoxyMainPage.txt ${GDCM_SOURCE_DIR}/Doc/DoxyInstallation.txt ${GDCM_SOURCE_DIR}/Doc/DoxyIntroduction.txt" + "${GDCM_SOURCE_DIR}/src ${GDCM_SOURCE_DIR}/Doc/DoxyPython.txt ${GDCM_SOURCE_DIR}/Doc/DoxyInstallation.txt ${GDCM_SOURCE_DIR}/Doc/DoxyIntroduction.txt" ) SET(GDCM_DOXYGEN_EXCLUDE_COMMON ) @@ -36,7 +36,7 @@ IF(GDCM_DOXYGEN) html.developper ) SET(GDCM_DOXYGEN_INPUT - "${GDCM_DOXYGEN_INPUT_COMMON} ${GDCM_SOURCE_DIR}/Doc/DoxyDevelInstal.txt" + "${GDCM_DOXYGEN_INPUT_COMMON} ${GDCM_SOURCE_DIR}/Doc/DoxyDevelInstal.txt ${GDCM_SOURCE_DIR}/Doc/DoxyMainPage.txt" ) SET(GDCM_DOXYGEN_EXCLUDE "${GDCM_DOXYGEN_EXCLUDE_COMMON} ${GDCM_SOURCE_DIR@/src/iddcmjpeg.h ${GDCM_SOURCE_DIR@/src/src/gdcmJpeg.cxx" @@ -59,7 +59,7 @@ IF(GDCM_DOXYGEN) html.user ) SET(GDCM_DOXYGEN_INPUT - "${GDCM_DOXYGEN_INPUT_COMMON}" + "${GDCM_DOXYGEN_INPUT_COMMON} ${GDCM_SOURCE_DIR}/Doc/DoxyMainPageUser.txt" ) SET(GDCM_DOXYGEN_EXCLUDE "${GDCM_DOXYGEN_EXCLUDE_COMMON}" diff --git a/Doc/doxygen.config.in b/Doc/doxygen.config.in index 9b925f8f..07677910 100644 --- a/Doc/doxygen.config.in +++ b/Doc/doxygen.config.in @@ -423,7 +423,7 @@ COLS_IN_ALPHA_INDEX = 5 # The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = gdcm #--------------------------------------------------------------------------- # configuration options related to the HTML output @@ -884,38 +884,3 @@ DOT_CLEANUP = YES # used. If set to NO the values of all tags below this one will be ignored. SEARCHENGINE = NO - -# The CGI_NAME tag should be the name of the CGI script that -# starts the search engine (doxysearch) with the correct parameters. -# A script with this name will be generated by doxygen. - -CGI_NAME = search.cgi - -# The CGI_URL tag should be the absolute URL to the directory where the -# cgi binaries are located. See the documentation of your http daemon for -# details. - -CGI_URL = - -# The DOC_URL tag should be the absolute URL to the directory where the -# documentation is located. If left blank the absolute path to the -# documentation, with file:// prepended to it, will be used. - -DOC_URL = - -# The DOC_ABSPATH tag should be the absolute path to the directory where the -# documentation is located. If left blank the directory on the local machine -# will be used. - -DOC_ABSPATH = - -# The BIN_ABSPATH tag must point to the directory where the doxysearch binary -# is installed. - -BIN_ABSPATH = /usr/local/bin/ - -# The EXT_DOC_PATHS tag can be used to specify one or more paths to -# documentation generated for other projects. This allows doxysearch to search -# the documentation for these projects as well. - -EXT_DOC_PATHS = diff --git a/Testing/.cvsignore b/Testing/.cvsignore index a15dc1a8..4d4b287b 100644 --- a/Testing/.cvsignore +++ b/Testing/.cvsignore @@ -12,6 +12,7 @@ testChangeEntete PrintDicomDir makeDicomDir testDicomDir +gdcmCxxTests bug1 image.dcm image.raw @@ -24,3 +25,6 @@ test3.acr.raw *.dll *Debug* *Release* +DartTestfile.txt +cmake.check_depends +cmake.depends diff --git a/gdcmPython/.cvsignore b/gdcmPython/.cvsignore index 6548f658..225fadc5 100644 --- a/gdcmPython/.cvsignore +++ b/gdcmPython/.cvsignore @@ -4,6 +4,7 @@ gdcm.py gdcm_wrap.cpp gdcm_wrap.cxx gdcm_wrap.doc +vtkgdcmPythonInit.cxx vtkGdcmReaderPython.cxx vtkWrapPythonInit vtkGdcmInit.cxx @@ -15,3 +16,6 @@ Makefile.in .libs .deps _gdcm.so +DartTestfile.txt +cmake.check_depends +cmake.depends diff --git a/setup.py b/setup.py index 668b16ff..12cb72d4 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ if(os.name=='posix'): libraries=["stdc++"] macros =[('__STDC_LIMIT_MACROS', '1')] - VTKPATH="/home/malaterre" + VTKPATH="/usr" vtkWrapper="vtkWrapPython" else: targetDir=os.path.join('lib','site-packages') @@ -34,7 +34,7 @@ else: err=str(e) print "Environment variable",err[err.rfind(':')+1:],'not defined, '\ 'please fix it!' - VTKPATH="/home/malaterre" + VTKPATH="/usr" vtkWrapper=os.path.join(VTKPATH,"bin","vtkWrapPython") targetDir=os.path.join(targetDir, ThisModule) diff --git a/src/.cvsignore b/src/.cvsignore index e216a7c2..30a9615f 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -13,3 +13,6 @@ config.h.in stamp-h stamp-h1 stamp-h.in +DartTestfile.txt +cmake.check_depends +cmake.depends diff --git a/src/gdcmParser.h b/src/gdcmParser.h index ef75bced..2cbea85d 100644 --- a/src/gdcmParser.h +++ b/src/gdcmParser.h @@ -40,25 +40,25 @@ private: /// Public dictionary used to parse this header gdcmDict *RefPubDict; - /// Optional "shadow dictionary" (private elements) used to parse + /// \brief Optional "shadow dictionary" (private elements) used to parse /// this header gdcmDict *RefShaDict; /// Equals 1 if a gdcmHeaderEntry was added post parsing int wasUpdated; - /// Equals =1 if user wants to skip shadow groups while parsing + /// \brief Equals =1 if user wants to skip shadow groups while parsing /// (to save space) int ignoreShadow; - /// Size threshold above which an element value will NOT be loaded in - /// memory (to avoid loading the image/volume itself). By default, + /// \brief Size threshold above which an element value will NOT be loaded + /// in memory (to avoid loading the image/volume itself). By default, /// this upper bound is fixed to 1024 bytes (which might look reasonable /// when one considers the definition of the various VR contents). guint32 MaxSizeLoadEntry; - /// Size threshold above which an element value will NOT be *printed* in - /// order no to polute the screen output. By default, this upper bound + /// \brief Size threshold above which an element value will NOT be *printed* + /// in order no to polute the screen output. By default, this upper bound /// is fixed to 64 bytes. guint32 MaxSizePrintEntry; @@ -66,7 +66,7 @@ protected: /// Refering underlying filename. std::string filename; - /// SWap code (e.g. Big Endian, Little Endian, Bad Big Endian, + /// \brief SWap code (e.g. Big Endian, Little Endian, Bad Big Endian, /// Bad Little Endian) according to the processor Endianity and /// what is written on disc. int sw; @@ -80,11 +80,11 @@ protected: /// After opening the file, we read HEADER_LENGTH_TO_READ bytes. static const unsigned int HEADER_LENGTH_TO_READ; - /// Elements whose value is longer than MAX_SIZE_LOAD_ELEMENT_VALUE + /// \brief Elements whose value is longer than MAX_SIZE_LOAD_ELEMENT_VALUE /// are NOT loaded. static const unsigned int MAX_SIZE_LOAD_ELEMENT_VALUE; - /// Elements whose value is longer than MAX_SIZE_PRINT_ELEMENT_VALUE + /// \brief Elements whose value is longer than MAX_SIZE_PRINT_ELEMENT_VALUE /// are NOT printed. static const unsigned int MAX_SIZE_PRINT_ELEMENT_VALUE; @@ -94,10 +94,10 @@ protected: /// Chained list, to keep the 'spacial' ordering ListTag listEntries; - /// will be set 1 if user asks to 'go inside' the 'sequences' (VR = "SQ") + /// Will be set 1 if user asks to 'go inside' the 'sequences' (VR = "SQ") int enableSequences; - /// Amount of printed details for each Header Entry (Dicom Element): + /// \brief Amount of printed details for each Header Entry (Dicom Element): /// 0 : stands for the least detail level. int printLevel; diff --git a/src/jpeg/.cvsignore b/src/jpeg/.cvsignore index 282522db..ed951f5c 100644 --- a/src/jpeg/.cvsignore +++ b/src/jpeg/.cvsignore @@ -1,2 +1,5 @@ Makefile Makefile.in +DartTestfile.txt +cmake.check_depends +cmake.depends diff --git a/src/jpeg/libijg12/.cvsignore b/src/jpeg/libijg12/.cvsignore index 4727c1b0..d427ae1b 100644 --- a/src/jpeg/libijg12/.cvsignore +++ b/src/jpeg/libijg12/.cvsignore @@ -6,3 +6,6 @@ Makefile.in Makefile *.lo *.la +DartTestfile.txt +cmake.check_depends +cmake.depends diff --git a/src/jpeg/libijg8/.cvsignore b/src/jpeg/libijg8/.cvsignore index 4727c1b0..d427ae1b 100644 --- a/src/jpeg/libijg8/.cvsignore +++ b/src/jpeg/libijg8/.cvsignore @@ -6,3 +6,6 @@ Makefile.in Makefile *.lo *.la +DartTestfile.txt +cmake.check_depends +cmake.depends diff --git a/src/jpeg/ljpg/.cvsignore b/src/jpeg/ljpg/.cvsignore index 6e5ca7ed..40ed00b5 100644 --- a/src/jpeg/ljpg/.cvsignore +++ b/src/jpeg/ljpg/.cvsignore @@ -4,3 +4,7 @@ Makefile.in .libs *.lo *.la +DartTestfile.txt +cmake.check_depends +cmake.depends + diff --git a/vtk/.cvsignore b/vtk/.cvsignore index cd216bbd..913b1877 100644 --- a/vtk/.cvsignore +++ b/vtk/.cvsignore @@ -12,3 +12,6 @@ vtkGdcmReaderPython.cxx *Release* *.exp *.lib +DartTestfile.txt +cmake.check_depends +cmake.depends