r614: no message

diff --git a/libctsim/ctndicom.cpp b/libctsim/ctndicom.cpp
index 36dbeb162e7ad295949b45ef566226ff06bf7065..02a4ed2da10073da89d6ea2a24df288e66ffc580 100644 (file)
--- a/libctsim/ctndicom.cpp
+++ b/libctsim/ctndicom.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctndicom.cpp,v 1.7 2001/03/07 16:34:47 kevin Exp $
+**  $Id: ctndicom.cpp,v 1.8 2001/03/07 16:52:52 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -291,6 +291,7 @@ DicomExporter::createDicomObject()
   snprintf (szRescaleIntercept, sizeof(szRescaleIntercept), "%e", dRescaleIntercept);
   snprintf (szRescaleSlope, sizeof(szRescaleIntercept), "%e", dRescaleSlope);
 
+  char szCTSimRoot[] = "1.2.826.0.1.3680043.2.284.";
   char szModality[] = "CT";
   char szSOPClassUID[65] = "1.2.840.10008.5.4.1.1.2";
   char szImgPhotometricInterp[] = "MONOCHROME2";
@@ -300,17 +301,17 @@ DicomExporter::createDicomObject()
   char szAcqKvp[] = "0";
   char szRelAcquisitionNumber[] = "1";
   char szRelImageNumber[] = "1";
-  char szIDSOPInstanceUID[] = "";
+  char szIDSOPInstanceUID[65] = "";
   char szIDManufacturer[] = "CTSim";
   char szRelPositionRefIndicator[] = "0";
-  char szRelFrameOfReferenceUID[] = "";
+  char szRelFrameOfReferenceUID[65] = "";
   char szRelSeriesNumber[] = "1";
   char szIDAccessionNumber[] = "0";
   char szRelStudyID[] = "1";
   char szIDReferringPhysician[] = "NONE";
   char szIDStudyTime[] = "000000.0";
   char szIDStudyDate[] = "00000000";
-  char szRelStudyInstanceUID[] = "";
+  char szRelStudyInstanceUID[65] = "";
   char szPatSex[] = "O";
   char szPatBirthdate[] = "0000000";
   char szPatID[] = "NONE";
@@ -318,6 +319,9 @@ DicomExporter::createDicomObject()
   char szIDImageType[] = "ORIGINAL";
   char szIDManufacturerModel[65] = "";
 
+  snprintf (szIDSOPInstanceUID, sizeof(szIDSOPInstanceUID), "%s.2.1.6.1", szCTSimRoot);
+  snprintf (szRelStudyInstanceUID, sizeof(szRelStudyInstanceUID), "%s.2.1.6.1.1", szCTSimRoot);
+  snprintf (szRelFrameOfReferenceUID, sizeof(szRelFrameOfReferenceUID), "%s.99", szCTSimRoot);
 #ifdef VERSION
   snprintf (szIDManufacturerModel, sizeof(szIDManufacturerModel), "VERSION %s", VERSION);
 #endif

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index a5660e44ad2d4114419fa494f89b793bc32f5fb4..e071497d2399e8f6235f5990e7d6da71a730d9cd 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -6,27 +6,18 @@
 --------------------Configuration: libctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD4.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC.tmp" with contents
 [
-/nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "..\..\..\wx2.2.5\src\png" /I "..\..\..\wx2.2.5\src\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /I "\dicom\ctn\include" /D "_DEBUG" /D "HAVE_WXWIN" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "HAVE_CTN_DICOM" /D VERSION=\"3.1.0\" /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+/nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "..\..\..\wx2.2.5\src\png" /I "..\..\..\wx2.2.5\src\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /I "\dicom\ctn\include" /D "_DEBUG" /D "HAVE_WXWIN" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "HAVE_CTN_DICOM" /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\ctsim\libctsim\array2dfile.cpp"
 "C:\ctsim\libctsim\backprojectors.cpp"
-"C:\ctsim\libctsupport\clip.cpp"
-"C:\ctsim\libctsupport\consoleio.cpp"
 "C:\ctsim\libctsim\ctndicom.cpp"
 "C:\ctsim\libctgraphics\dlgezplot.cpp"
-"C:\ctsim\libctgraphics\ezplot.cpp"
-"C:\ctsim\libctgraphics\ezset.cpp"
-"C:\ctsim\libctgraphics\ezsupport.cpp"
 "C:\ctsim\libctsim\filter.cpp"
-"C:\ctsim\libctsupport\fnetorderstream.cpp"
 "C:\ctsim\libctsim\fourier.cpp"
-"C:\ctsim\getopt\getopt.c"
-"C:\ctsim\getopt\getopt1.c"
 "C:\ctsim\libctsim\globalvars.cpp"
 "C:\ctsim\libctsupport\hashtable.cpp"
 "C:\ctsim\libctsim\imagefile.cpp"
-"C:\ctsim\libctsupport\interpolator.cpp"
-"C:\ctsim\libctsupport\mathfuncs.cpp"
 "C:\ctsim\libctsim\phantom.cpp"
 "C:\ctsim\libctsupport\plotfile.cpp"
 "C:\ctsim\libctgraphics\pol.cpp"
@@ -34,15 +25,11 @@ Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD4.tmp" with content
 "C:\ctsim\libctsim\projections.cpp"
 "C:\ctsim\libctsim\reconstruct.cpp"
 "C:\ctsim\libctsim\scanner.cpp"
-"C:\ctsim\libctgraphics\sgp.cpp"
-"C:\ctsim\libctsupport\strfuncs.cpp"
 "C:\ctsim\libctsupport\syserror.cpp"
 "C:\ctsim\libctsim\trace.cpp"
-"C:\ctsim\libctgraphics\transformmatrix.cpp"
-"C:\ctsim\libctsupport\xform.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD4.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD5.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPC.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD.tmp" with contents
 [
 /nologo /out:"Debug\libctsim.lib" 
 .\Debug\array2dfile.obj
@@ -78,33 +65,18 @@ Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD5.tmp" with content
 .\Debug\transformmatrix.obj
 .\Debug\xform.obj
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD5.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD.tmp"
 <h3>Output Window</h3>
 Compiling...
+array2dfile.cpp
 backprojectors.cpp
-clip.cpp
-consoleio.cpp
 ctndicom.cpp
 dlgezplot.cpp
-ezplot.cpp
-ezset.cpp
-ezsupport.cpp
 filter.cpp
-fnetorderstream.cpp
 fourier.cpp
-getopt.c
-getopt1.c
-C:\ctsim\getopt\getopt1.c(73) : warning C4028: formal parameter 2 different from declaration
-C:\ctsim\getopt\getopt1.c(73) : warning C4028: formal parameter 3 different from declaration
-C:\ctsim\getopt\getopt1.c(73) : warning C4028: formal parameter 4 different from declaration
-C:\ctsim\getopt\getopt1.c(89) : warning C4028: formal parameter 2 different from declaration
-C:\ctsim\getopt\getopt1.c(89) : warning C4028: formal parameter 3 different from declaration
-C:\ctsim\getopt\getopt1.c(89) : warning C4028: formal parameter 4 different from declaration
 globalvars.cpp
 hashtable.cpp
 imagefile.cpp
-interpolator.cpp
-mathfuncs.cpp
 phantom.cpp
 plotfile.cpp
 pol.cpp
@@ -112,52 +84,24 @@ procsignal.cpp
 projections.cpp
 reconstruct.cpp
 scanner.cpp
-sgp.cpp
-strfuncs.cpp
 syserror.cpp
 trace.cpp
-transformmatrix.cpp
-xform.cpp
 Creating library...
 <h3>
 --------------------Configuration: ctsim - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD6.tmp" with contents
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPE.tmp" with contents
 [
-winmm.lib rpcrt4.lib ws2_32.lib ../libctsim/Debug/libctsim.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib wxd.lib xpmd.lib tiffd.lib zlibd.lib pngd.lib comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib htmlhelp.lib ctn_lib.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"\wx2.2.5\lib" /libpath:"\dicom\ctn\winctn\ctn_lib\Debug" 
-.\Debug\backgroundmgr.obj
-.\Debug\backgroundsupr.obj
-.\Debug\ctsim.obj
-.\Debug\dialogs.obj
-.\Debug\dlgprojections.obj
-.\Debug\dlgreconstruct.obj
-.\Debug\docs.obj
-.\Debug\graph3dview.obj
-.\Debug\threadproj.obj
-.\Debug\threadraster.obj
-.\Debug\threadrecon.obj
-.\Debug\tips.obj
-.\Debug\views.obj
-.\Debug\ctsim.res
-\ctsim\msvc\libctsim\Debug\libctsim.lib
-"\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib"
-"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"
-\wx2.2.5\lib\jpegd.lib
-\wx2.2.5\lib\pngd.lib
-\wx2.2.5\lib\wxd.lib
-\wx2.2.5\lib\xpmd.lib
-\wx2.2.5\lib\zlibd.lib
-\wx2.2.5\lib\tiffd.lib
+/nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /I "\dicom\ctn\include" /D VERSION=\"3.0.0beta1\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.1.0\" /D "HAVE_CTN_DICOM" /FR"Debug/" /Fp"Debug/ctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\ctsim\src\backgroundmgr.cpp"
+"C:\ctsim\src\backgroundsupr.cpp"
+"C:\ctsim\src\graph3dview.cpp"
+"C:\ctsim\src\threadproj.cpp"
+"C:\ctsim\src\threadraster.cpp"
+"C:\ctsim\src\threadrecon.cpp"
 ]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPD6.tmp"
-<h3>Output Window</h3>
-Linking...
-
-
-
-<h3>Results</h3>
-ctsim.exe - 0 error(s), 6 warning(s)
-</pre>
-</body>
-</html>
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPE.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSPF.tmp" with contents
+[
+/nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /
\ No newline at end of file