[med-svn] [mricron] 01/03: Imported Upstream version 0.20140804.1~dfsg.1
Michael Hanke
mih at moszumanska.debian.org
Fri Oct 3 13:53:06 UTC 2014
This is an automated email from the git hooks/post-receive script.
mih pushed a commit to annotated tag debian/0.20140804.1_dfsg.1-1
in repository mricron.
commit 280f4a7d91e2b774626f77251c449323c7ae9f78
Author: Michael Hanke <michael.hanke at gmail.com>
Date: Fri Oct 3 15:19:33 2014 +0200
Imported Upstream version 0.20140804.1~dfsg.1
---
common/define_types.pas | 2 +-
dcm2nii/convert.pas | 2 +
dcm2nii/dcm2nii.app/Contents/Info.plist | 43 --------
dcm2nii/dcm2nii.app/Contents/MacOS/dcm2nii | 1 -
dcm2nii/dcm2nii.app/Contents/PkgInfo | 1 -
dcm2nii/dcm2nii.lpi | 103 +++++++++----------
dcm2nii/dcm2niigui.app/Contents/Info.plist | 43 --------
dcm2nii/dcm2niigui.app/Contents/MacOS/dcm2niigui | 1 -
dcm2nii/dcm2niigui.app/Contents/PkgInfo | 1 -
dcm2nii/dcm2niigui.lpi | 121 ++++++++++++-----------
dcm2nii/parconvert.pas | 12 ++-
mricron.app/Contents/Info.plist | 43 --------
mricron.app/Contents/MacOS/mricron | 1 -
mricron.app/Contents/PkgInfo | 1 -
mricron.lpi | 77 +++++++--------
npm/MeanFLU.nii.gz | Bin 291497 -> 0 bytes
npm/npm.app/Contents/Info.plist | 43 --------
npm/npm.app/Contents/MacOS/npm | 1 -
npm/npm.app/Contents/PkgInfo | 1 -
npm/wlsFLU.nii.gz | Bin 293632 -> 0 bytes
20 files changed, 164 insertions(+), 333 deletions(-)
diff --git a/common/define_types.pas b/common/define_types.pas
index 589205f..92d1202 100755
--- a/common/define_types.pas
+++ b/common/define_types.pas
@@ -18,7 +18,7 @@ interface
SysUtils,classes,IniFiles,
{$IFDEF GUI} forms,userdir, dialogs{$ELSE}dialogsx{$ENDIF};
const
- kMRIcronVersDate = '4JULY2014';
+ kMRIcronVersDate = '4AUGUST2014';
{$IFDEF FPC}
{$ifdef CPU32}
kMRIcronVers = kMRIcronVersDate+' 32bit BSD License';
diff --git a/dcm2nii/convert.pas b/dcm2nii/convert.pas
index f714609..8664f4a 100755
--- a/dcm2nii/convert.pas
+++ b/dcm2nii/convert.pas
@@ -1618,6 +1618,8 @@ lFlip := false;
for lIndex := 1 to lDTIdir do
if (lDTIra[lIndex].bval = 0) or (lDTIra[lIndex].v1 <> 0) or (lDTIra[lIndex].v2 <> 0) or (lDTIra[lIndex].v3 <> 0) then
lEnd := lIndex;
+
+
if ((lStart >1) or (lEnd < lDTIdir)) and (lStart <= lEnd) then begin
if lVolSave then {save slice-by-slice}
lOutDTIname := SaveNIfTICoreCrop (lOutImgName, lvBuffer, lVolOffsetInit,lStart-1,lDTIdir-lEnd, lAHdr, lPref)
diff --git a/dcm2nii/dcm2nii.app/Contents/Info.plist b/dcm2nii/dcm2nii.app/Contents/Info.plist
deleted file mode 100755
index f964ff6..0000000
--- a/dcm2nii/dcm2nii.app/Contents/Info.plist
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>dcm2nii</string>
- <key>CFBundleName</key>
- <string>dcm2nii</string>
- <key>CFBundleIdentifier</key>
- <string>com.company.dcm2nii</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>dcm2</string>
- <key>CFBundleShortVersionString</key>
- <string>0.1</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- <key>CSResourcesFileMapped</key>
- <true/>
- <key>CFBundleDocumentTypes</key>
- <array>
- <dict>
- <key>CFBundleTypeRole</key>
- <string>Viewer</string>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>*</string>
- </array>
- <key>CFBundleTypeOSTypes</key>
- <array>
- <string>fold</string>
- <string>disk</string>
- <string>****</string>
- </array>
- </dict>
- </array>
-</dict>
-</plist>
diff --git a/dcm2nii/dcm2nii.app/Contents/MacOS/dcm2nii b/dcm2nii/dcm2nii.app/Contents/MacOS/dcm2nii
deleted file mode 100755
index bdcd35a..0000000
--- a/dcm2nii/dcm2nii.app/Contents/MacOS/dcm2nii
+++ /dev/null
@@ -1 +0,0 @@
-../../../dcm2nii
\ No newline at end of file
diff --git a/dcm2nii/dcm2nii.app/Contents/PkgInfo b/dcm2nii/dcm2nii.app/Contents/PkgInfo
deleted file mode 100755
index 6f749b0..0000000
--- a/dcm2nii/dcm2nii.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
diff --git a/dcm2nii/dcm2nii.lpi b/dcm2nii/dcm2nii.lpi
index 7434a8f..38e1824 100755
--- a/dcm2nii/dcm2nii.lpi
+++ b/dcm2nii/dcm2nii.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
@@ -193,7 +193,6 @@
<Unit20>
<Filename Value="paramstrs.pas"/>
<UnitName Value="paramstrs"/>
- <IsVisibleTab Value="True"/>
<EditorIndex Value="9"/>
<WindowIndex Value="0"/>
<TopLine Value="300"/>
@@ -227,10 +226,11 @@
<Unit24>
<Filename Value="..\common\define_types.pas"/>
<UnitName Value="define_types"/>
+ <IsVisibleTab Value="True"/>
<EditorIndex Value="7"/>
<WindowIndex Value="0"/>
- <TopLine Value="34"/>
- <CursorPos X="21" Y="51"/>
+ <TopLine Value="1"/>
+ <CursorPos X="23" Y="11"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit24>
@@ -332,124 +332,124 @@
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
- <Filename Value="dicomcompat.pas"/>
- <Caret Line="309" Column="111" TopLine="307"/>
+ <Filename Value="dicom.pas"/>
+ <Caret Line="6" Column="15" TopLine="2"/>
</Position1>
<Position2>
<Filename Value="dicom.pas"/>
- <Caret Line="6" Column="15" TopLine="2"/>
+ <Caret Line="1" Column="1" TopLine="1"/>
</Position2>
<Position3>
- <Filename Value="dicom.pas"/>
- <Caret Line="1" Column="1" TopLine="1"/>
- </Position3>
- <Position4>
<Filename Value="convert.pas"/>
<Caret Line="1090" Column="21" TopLine="1073"/>
+ </Position3>
+ <Position4>
+ <Filename Value="dicomtypes.pas"/>
+ <Caret Line="246" Column="54" TopLine="230"/>
</Position4>
<Position5>
<Filename Value="dicomtypes.pas"/>
- <Caret Line="246" Column="54" TopLine="230"/>
+ <Caret Line="229" Column="6" TopLine="219"/>
</Position5>
<Position6>
- <Filename Value="dicomtypes.pas"/>
- <Caret Line="229" Column="6" TopLine="219"/>
- </Position6>
- <Position7>
<Filename Value="convert.pas"/>
<Caret Line="1090" Column="21" TopLine="1073"/>
- </Position7>
- <Position8>
+ </Position6>
+ <Position7>
<Filename Value="paramstrs.pas"/>
<Caret Line="342" Column="23" TopLine="324"/>
+ </Position7>
+ <Position8>
+ <Filename Value="convert.pas"/>
+ <Caret Line="1094" Column="25" TopLine="1070"/>
</Position8>
<Position9>
<Filename Value="convert.pas"/>
- <Caret Line="1094" Column="25" TopLine="1070"/>
+ <Caret Line="1081" Column="91" TopLine="1066"/>
</Position9>
<Position10>
<Filename Value="convert.pas"/>
- <Caret Line="1081" Column="91" TopLine="1066"/>
+ <Caret Line="1090" Column="143" TopLine="1081"/>
</Position10>
<Position11>
<Filename Value="convert.pas"/>
- <Caret Line="1090" Column="143" TopLine="1081"/>
+ <Caret Line="1094" Column="22" TopLine="1081"/>
</Position11>
<Position12>
- <Filename Value="convert.pas"/>
- <Caret Line="1094" Column="22" TopLine="1081"/>
- </Position12>
- <Position13>
<Filename Value="..\common\define_types.pas"/>
<Caret Line="11" Column="23" TopLine="1"/>
- </Position13>
- <Position14>
+ </Position12>
+ <Position13>
<Filename Value="dicom.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
+ </Position13>
+ <Position14>
+ <Filename Value="paramstrs.pas"/>
+ <Caret Line="75" Column="35" TopLine="75"/>
</Position14>
<Position15>
<Filename Value="paramstrs.pas"/>
- <Caret Line="75" Column="35" TopLine="75"/>
+ <Caret Line="344" Column="17" TopLine="327"/>
</Position15>
<Position16>
<Filename Value="paramstrs.pas"/>
- <Caret Line="344" Column="17" TopLine="327"/>
+ <Caret Line="343" Column="38" TopLine="332"/>
</Position16>
<Position17>
<Filename Value="paramstrs.pas"/>
- <Caret Line="343" Column="38" TopLine="332"/>
+ <Caret Line="342" Column="70" TopLine="332"/>
</Position17>
<Position18>
- <Filename Value="paramstrs.pas"/>
- <Caret Line="342" Column="70" TopLine="332"/>
- </Position18>
- <Position19>
<Filename Value="..\common\define_types.pas"/>
<Caret Line="3" Column="94" TopLine="1"/>
+ </Position18>
+ <Position19>
+ <Filename Value="paramstrs.pas"/>
+ <Caret Line="342" Column="40" TopLine="335"/>
</Position19>
<Position20>
<Filename Value="paramstrs.pas"/>
- <Caret Line="342" Column="40" TopLine="335"/>
+ <Caret Line="344" Column="43" TopLine="337"/>
</Position20>
<Position21>
<Filename Value="paramstrs.pas"/>
- <Caret Line="344" Column="43" TopLine="337"/>
+ <Caret Line="342" Column="94" TopLine="339"/>
</Position21>
<Position22>
<Filename Value="paramstrs.pas"/>
- <Caret Line="342" Column="94" TopLine="339"/>
+ <Caret Line="344" Column="30" TopLine="335"/>
</Position22>
<Position23>
- <Filename Value="paramstrs.pas"/>
- <Caret Line="344" Column="30" TopLine="335"/>
- </Position23>
- <Position24>
<Filename Value="dicom.pas"/>
<Caret Line="19" Column="44" TopLine="1"/>
+ </Position23>
+ <Position24>
+ <Filename Value="..\common\gzio2.pas"/>
+ <Caret Line="1881" Column="12" TopLine="1"/>
</Position24>
<Position25>
<Filename Value="..\common\gzio2.pas"/>
- <Caret Line="1881" Column="12" TopLine="1"/>
+ <Caret Line="2006" Column="3" TopLine="2005"/>
</Position25>
<Position26>
<Filename Value="..\common\gzio2.pas"/>
- <Caret Line="2006" Column="3" TopLine="2005"/>
+ <Caret Line="2007" Column="3" TopLine="1994"/>
</Position26>
<Position27>
- <Filename Value="..\common\gzio2.pas"/>
- <Caret Line="2007" Column="3" TopLine="1994"/>
- </Position27>
- <Position28>
<Filename Value="dicom.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
- </Position28>
- <Position29>
+ </Position27>
+ <Position28>
<Filename Value="dcm2nii.lpr"/>
<Caret Line="65" Column="23" TopLine="48"/>
- </Position29>
- <Position30>
+ </Position28>
+ <Position29>
<Filename Value="paramstrs.pas"/>
<Caret Line="13" Column="49" TopLine="1"/>
+ </Position29>
+ <Position30>
+ <Filename Value="..\common\define_types.pas"/>
+ <Caret Line="51" Column="21" TopLine="34"/>
</Position30>
</JumpHistory>
</ProjectOptions>
@@ -484,4 +484,5 @@
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
+ <EditorMacros Count="0"/>
</CONFIG>
diff --git a/dcm2nii/dcm2niigui.app/Contents/Info.plist b/dcm2nii/dcm2niigui.app/Contents/Info.plist
deleted file mode 100644
index 327b516..0000000
--- a/dcm2nii/dcm2niigui.app/Contents/Info.plist
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>dcm2niigui</string>
- <key>CFBundleName</key>
- <string>dcm2niigui.exe</string>
- <key>CFBundleIdentifier</key>
- <string>com.company.dcm2niigui</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>dcm2</string>
- <key>CFBundleShortVersionString</key>
- <string>0.1</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- <key>CSResourcesFileMapped</key>
- <true/>
- <key>CFBundleDocumentTypes</key>
- <array>
- <dict>
- <key>CFBundleTypeRole</key>
- <string>Viewer</string>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>*</string>
- </array>
- <key>CFBundleTypeOSTypes</key>
- <array>
- <string>fold</string>
- <string>disk</string>
- <string>****</string>
- </array>
- </dict>
- </array>
-</dict>
-</plist>
diff --git a/dcm2nii/dcm2niigui.app/Contents/MacOS/dcm2niigui b/dcm2nii/dcm2niigui.app/Contents/MacOS/dcm2niigui
deleted file mode 120000
index eb6cf9b..0000000
--- a/dcm2nii/dcm2niigui.app/Contents/MacOS/dcm2niigui
+++ /dev/null
@@ -1 +0,0 @@
-../../../dcm2niigui
\ No newline at end of file
diff --git a/dcm2nii/dcm2niigui.app/Contents/PkgInfo b/dcm2nii/dcm2niigui.app/Contents/PkgInfo
deleted file mode 100644
index 6f749b0..0000000
--- a/dcm2nii/dcm2niigui.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
diff --git a/dcm2nii/dcm2niigui.lpi b/dcm2nii/dcm2niigui.lpi
index 10d105b..e631273 100755
--- a/dcm2nii/dcm2niigui.lpi
+++ b/dcm2nii/dcm2niigui.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<CONFIG>
<ProjectOptions>
<Version Value="9"/>
@@ -113,10 +113,11 @@
<Unit7>
<Filename Value="..\common\define_types.pas"/>
<UnitName Value="define_types"/>
+ <IsVisibleTab Value="True"/>
<EditorIndex Value="2"/>
<WindowIndex Value="0"/>
<TopLine Value="1"/>
- <CursorPos X="26" Y="23"/>
+ <CursorPos X="33" Y="21"/>
<UsageCount Value="113"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Delphi"/>
@@ -126,8 +127,8 @@
<UnitName Value="convert"/>
<EditorIndex Value="0"/>
<WindowIndex Value="0"/>
- <TopLine Value="1595"/>
- <CursorPos X="93" Y="1608"/>
+ <TopLine Value="1613"/>
+ <CursorPos X="1" Y="1618"/>
<UsageCount Value="115"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Delphi"/>
@@ -235,11 +236,10 @@
<Unit20>
<Filename Value="parconvert.pas"/>
<UnitName Value="parconvert"/>
- <IsVisibleTab Value="True"/>
<EditorIndex Value="3"/>
<WindowIndex Value="0"/>
- <TopLine Value="1127"/>
- <CursorPos X="89" Y="1140"/>
+ <TopLine Value="1124"/>
+ <CursorPos X="66" Y="1125"/>
<UsageCount Value="26"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Delphi"/>
@@ -249,8 +249,8 @@
<UnitName Value="bvec"/>
<EditorIndex Value="1"/>
<WindowIndex Value="0"/>
- <TopLine Value="53"/>
- <CursorPos X="46" Y="67"/>
+ <TopLine Value="34"/>
+ <CursorPos X="48" Y="61"/>
<UsageCount Value="26"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Delphi"/>
@@ -282,123 +282,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="parconvert.pas"/>
- <Caret Line="143" Column="7" TopLine="123"/>
+ <Caret Line="1110" Column="36" TopLine="1091"/>
</Position1>
<Position2>
<Filename Value="parconvert.pas"/>
- <Caret Line="148" Column="10" TopLine="128"/>
+ <Caret Line="1111" Column="43" TopLine="1092"/>
</Position2>
<Position3>
<Filename Value="parconvert.pas"/>
- <Caret Line="3" Column="114" TopLine="1"/>
+ <Caret Line="1113" Column="16" TopLine="1094"/>
</Position3>
<Position4>
<Filename Value="parconvert.pas"/>
- <Caret Line="1116" Column="42" TopLine="1109"/>
+ <Caret Line="1120" Column="29" TopLine="1109"/>
</Position4>
<Position5>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1117" Column="34" TopLine="1109"/>
+ <Filename Value="bvec.pas"/>
+ <Caret Line="74" Column="12" TopLine="50"/>
</Position5>
<Position6>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1123" Column="129" TopLine="1109"/>
+ <Filename Value="convert.pas"/>
+ <Caret Line="1611" Column="44" TopLine="1587"/>
</Position6>
<Position7>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1277" Column="97" TopLine="1258"/>
+ <Filename Value="convert.pas"/>
+ <Caret Line="67" Column="108" TopLine="66"/>
</Position7>
<Position8>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1279" Column="103" TopLine="1260"/>
+ <Filename Value="convert.pas"/>
+ <Caret Line="242" Column="51" TopLine="223"/>
</Position8>
<Position9>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1280" Column="63" TopLine="1269"/>
+ <Filename Value="convert.pas"/>
+ <Caret Line="397" Column="40" TopLine="375"/>
</Position9>
<Position10>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1281" Column="57" TopLine="1269"/>
+ <Filename Value="convert.pas"/>
+ <Caret Line="1181" Column="29" TopLine="1176"/>
</Position10>
<Position11>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1060" Column="57" TopLine="1056"/>
+ <Filename Value="convert.pas"/>
+ <Caret Line="1182" Column="19" TopLine="1176"/>
</Position11>
<Position12>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1050" Column="29" TopLine="1049"/>
+ <Filename Value="convert.pas"/>
+ <Caret Line="1199" Column="30" TopLine="1181"/>
</Position12>
<Position13>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1105" Column="17" TopLine="1086"/>
+ <Filename Value="convert.pas"/>
+ <Caret Line="1282" Column="29" TopLine="1260"/>
</Position13>
<Position14>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1108" Column="35" TopLine="1089"/>
+ <Filename Value="convert.pas"/>
+ <Caret Line="1370" Column="65" TopLine="1348"/>
</Position14>
<Position15>
<Filename Value="parconvert.pas"/>
- <Caret Line="1110" Column="36" TopLine="1091"/>
+ <Caret Line="1282" Column="64" TopLine="1272"/>
</Position15>
<Position16>
<Filename Value="parconvert.pas"/>
- <Caret Line="1111" Column="43" TopLine="1092"/>
+ <Caret Line="1024" Column="61" TopLine="1021"/>
</Position16>
<Position17>
<Filename Value="parconvert.pas"/>
- <Caret Line="1113" Column="16" TopLine="1094"/>
+ <Caret Line="6" Column="88" TopLine="1"/>
</Position17>
<Position18>
- <Filename Value="parconvert.pas"/>
- <Caret Line="1120" Column="29" TopLine="1109"/>
+ <Filename Value="convert.pas"/>
+ <Caret Line="1621" Column="66" TopLine="1610"/>
</Position18>
<Position19>
- <Filename Value="bvec.pas"/>
- <Caret Line="74" Column="12" TopLine="50"/>
+ <Filename Value="parconvert.pas"/>
+ <Caret Line="1" Column="130" TopLine="1"/>
</Position19>
<Position20>
- <Filename Value="convert.pas"/>
- <Caret Line="1611" Column="44" TopLine="1587"/>
+ <Filename Value="parconvert.pas"/>
+ <Caret Line="343" Column="22" TopLine="304"/>
</Position20>
<Position21>
- <Filename Value="convert.pas"/>
- <Caret Line="67" Column="108" TopLine="66"/>
+ <Filename Value="parconvert.pas"/>
+ <Caret Line="384" Column="26" TopLine="346"/>
</Position21>
<Position22>
- <Filename Value="convert.pas"/>
- <Caret Line="242" Column="51" TopLine="223"/>
+ <Filename Value="parconvert.pas"/>
+ <Caret Line="917" Column="21" TopLine="879"/>
</Position22>
<Position23>
- <Filename Value="convert.pas"/>
- <Caret Line="397" Column="40" TopLine="375"/>
+ <Filename Value="parconvert.pas"/>
+ <Caret Line="1141" Column="27" TopLine="1103"/>
</Position23>
<Position24>
- <Filename Value="convert.pas"/>
- <Caret Line="1181" Column="29" TopLine="1176"/>
+ <Filename Value="parconvert.pas"/>
+ <Caret Line="343" Column="22" TopLine="320"/>
</Position24>
<Position25>
- <Filename Value="convert.pas"/>
- <Caret Line="1182" Column="19" TopLine="1176"/>
+ <Filename Value="parconvert.pas"/>
+ <Caret Line="384" Column="26" TopLine="346"/>
</Position25>
<Position26>
- <Filename Value="convert.pas"/>
- <Caret Line="1199" Column="30" TopLine="1181"/>
+ <Filename Value="parconvert.pas"/>
+ <Caret Line="917" Column="21" TopLine="879"/>
</Position26>
<Position27>
- <Filename Value="convert.pas"/>
- <Caret Line="1282" Column="29" TopLine="1260"/>
+ <Filename Value="parconvert.pas"/>
+ <Caret Line="1139" Column="23" TopLine="1113"/>
</Position27>
<Position28>
- <Filename Value="convert.pas"/>
- <Caret Line="1370" Column="65" TopLine="1348"/>
+ <Filename Value="parconvert.pas"/>
+ <Caret Line="1138" Column="27" TopLine="1116"/>
</Position28>
<Position29>
<Filename Value="parconvert.pas"/>
- <Caret Line="1282" Column="64" TopLine="1272"/>
+ <Caret Line="1052" Column="10" TopLine="1043"/>
</Position29>
<Position30>
<Filename Value="parconvert.pas"/>
- <Caret Line="1024" Column="61" TopLine="1021"/>
+ <Caret Line="1143" Column="75" TopLine="1118"/>
</Position30>
</JumpHistory>
</ProjectOptions>
@@ -446,4 +446,5 @@
</Item2>
</Exceptions>
</Debugging>
+ <EditorMacros Count="0"/>
</CONFIG>
diff --git a/dcm2nii/parconvert.pas b/dcm2nii/parconvert.pas
index 2d25220..51e3dbf 100755
--- a/dcm2nii/parconvert.pas
+++ b/dcm2nii/parconvert.pas
@@ -1049,7 +1049,7 @@ label
678;
var
//lVaryingScaleFactorsTableEntries,
- lLines,lColBytes,lRows,lRowsdiv2,lSwap,lInc,l4Doffset,lcurrent4Dvol,lnum4Ddatasets,lSlicePixelsx, lnSlicesx,
+ lEnd, lLines,lColBytes,lRows,lRowsdiv2,lSwap,lInc,l4Doffset,lcurrent4Dvol,lnum4Ddatasets,lSlicePixelsx, lnSlicesx,
lSliceSzOutx,lSLiceSzx,lRescaleEntries, lPos,lOffsetTableEntries,lSliceOrient: longint;
lOutF,lInF: File;
lNHdr,lAHdr: TNIFTIhdr;
@@ -1131,11 +1131,19 @@ begin
end;
dcmMsg(lFileName+' -> '+ lOutImgName);
//exit; //trap
- if (lDicomData.XYZdim[4] > 1) then begin //if 4D: save DTI data
+ if (lDicomData.XYZdim[4] > 5) then begin //if 4D: save DTI data
lInc := 1;
while (lInc <= lDicomData.XYZdim[4]) and (lDTIra[lInc].bval = lDTIra[1].bval) and (lDTIra[lInc].v1 = lDTIra[1].v1) do
inc(lInc);
+ lEnd := 0;
if (lInc <= lDicomData.XYZdim[4]) then begin//bvec or bval vary
+ for linc := 1 to lDicomData.XYZdim[4] do
+ if (lDTIra[lInc].bval = 0) or (lDTIra[lInc].v1 <> 0) or (lDTIra[lInc].v2 <> 0) or (lDTIra[lInc].v3 <> 0) then
+ lEnd := lInc;
+ if (lEnd = (lDicomData.XYZdim[4]-1)) then begin
+ dcmMsg('Warning: final volume is computed ADC and will not be converted (as it would disrupt processing). You can re-create a better ADC image after eddy current correction.');
+ lDicomData.XYZdim[4] := lEnd;
+ end;
computeOrient(lDICOMData,lSliceOrient);
siemensPhilipsCorrectBvecs(lDICOMdata, lDTIra, lDicomData.XYZdim[4], false);
DTItextfiles (lOutImgName, lDTIra, lDicomData.XYZdim[4]);
diff --git a/mricron.app/Contents/Info.plist b/mricron.app/Contents/Info.plist
deleted file mode 100644
index de29ee6..0000000
--- a/mricron.app/Contents/Info.plist
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>mricron</string>
- <key>CFBundleName</key>
- <string>MRIcron</string>
- <key>CFBundleIdentifier</key>
- <string>com.company.mricron</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>mric</string>
- <key>CFBundleShortVersionString</key>
- <string>0.1</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- <key>CSResourcesFileMapped</key>
- <true/>
- <key>CFBundleDocumentTypes</key>
- <array>
- <dict>
- <key>CFBundleTypeRole</key>
- <string>Viewer</string>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>*</string>
- </array>
- <key>CFBundleTypeOSTypes</key>
- <array>
- <string>fold</string>
- <string>disk</string>
- <string>****</string>
- </array>
- </dict>
- </array>
-</dict>
-</plist>
diff --git a/mricron.app/Contents/MacOS/mricron b/mricron.app/Contents/MacOS/mricron
deleted file mode 120000
index 36c5b68..0000000
--- a/mricron.app/Contents/MacOS/mricron
+++ /dev/null
@@ -1 +0,0 @@
-../../../mricron
\ No newline at end of file
diff --git a/mricron.app/Contents/PkgInfo b/mricron.app/Contents/PkgInfo
deleted file mode 100644
index 6f749b0..0000000
--- a/mricron.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
diff --git a/mricron.lpi b/mricron.lpi
index be5d39e..e8a40f3 100755
--- a/mricron.lpi
+++ b/mricron.lpi
@@ -169,8 +169,8 @@
<IsVisibleTab Value="True"/>
<EditorIndex Value="0"/>
<WindowIndex Value="0"/>
- <TopLine Value="4101"/>
- <CursorPos X="26" Y="4119"/>
+ <TopLine Value="1384"/>
+ <CursorPos X="50" Y="1395"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@@ -181,8 +181,8 @@
<UnitName Value="nifti_img"/>
<EditorIndex Value="9"/>
<WindowIndex Value="0"/>
- <TopLine Value="5298"/>
- <CursorPos X="52" Y="5323"/>
+ <TopLine Value="1"/>
+ <CursorPos X="144" Y="3"/>
<UsageCount Value="100"/>
<Loaded Value="True"/>
<DefaultSyntaxHighlighter Value="Delphi"/>
@@ -286,7 +286,6 @@
<CursorPos X="77" Y="2"/>
<UsageCount Value="200"/>
<Loaded Value="True"/>
- <LoadedDesigner Value="True"/>
<DefaultSyntaxHighlighter Value="Delphi"/>
</Unit21>
<Unit22>
@@ -1306,123 +1305,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1128" Column="43" TopLine="1102"/>
+ <Caret Line="4110" Column="31" TopLine="4084"/>
</Position1>
<Position2>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="4110" Column="27" TopLine="4096"/>
+ <Caret Line="4500" Column="20" TopLine="4475"/>
</Position2>
<Position3>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="240" Column="28" TopLine="225"/>
+ <Caret Line="4670" Column="27" TopLine="4644"/>
</Position3>
<Position4>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="830" Column="28" TopLine="809"/>
+ <Caret Line="4690" Column="20" TopLine="4665"/>
</Position4>
<Position5>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="841" Column="37" TopLine="816"/>
+ <Caret Line="4884" Column="20" TopLine="4858"/>
</Position5>
<Position6>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="872" Column="20" TopLine="846"/>
+ <Caret Line="5051" Column="28" TopLine="5025"/>
</Position6>
<Position7>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1029" Column="28" TopLine="1003"/>
+ <Caret Line="240" Column="28" TopLine="225"/>
</Position7>
<Position8>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1374" Column="26" TopLine="1348"/>
+ <Caret Line="830" Column="28" TopLine="804"/>
</Position8>
<Position9>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1377" Column="22" TopLine="1351"/>
+ <Caret Line="841" Column="37" TopLine="816"/>
</Position9>
<Position10>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1380" Column="21" TopLine="1354"/>
+ <Caret Line="1029" Column="28" TopLine="1003"/>
</Position10>
<Position11>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1385" Column="36" TopLine="1359"/>
+ <Caret Line="1392" Column="35" TopLine="1384"/>
</Position11>
<Position12>
- <Filename Value="nifti_img_view.pas"/>
- <Caret Line="1441" Column="25" TopLine="1416"/>
+ <Filename Value="nifti_hdr_view.pas"/>
+ <Caret Line="171" Column="31" TopLine="156"/>
</Position12>
<Position13>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1453" Column="27" TopLine="1427"/>
+ <Caret Line="1392" Column="35" TopLine="1384"/>
</Position13>
<Position14>
- <Filename Value="nifti_img_view.pas"/>
- <Caret Line="1492" Column="23" TopLine="1466"/>
+ <Filename Value="nifti_img.pas"/>
+ <Caret Line="2" Column="121" TopLine="1"/>
</Position14>
<Position15>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1620" Column="22" TopLine="1594"/>
+ <Caret Line="111" Column="31" TopLine="107"/>
</Position15>
<Position16>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="4110" Column="31" TopLine="4084"/>
+ <Caret Line="3" Column="51" TopLine="1"/>
</Position16>
<Position17>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="4500" Column="20" TopLine="4475"/>
+ <Caret Line="1638" Column="9" TopLine="1620"/>
</Position17>
<Position18>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="4670" Column="27" TopLine="4644"/>
+ <Caret Line="3654" Column="56" TopLine="3637"/>
</Position18>
<Position19>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="4690" Column="20" TopLine="4665"/>
+ <Caret Line="3702" Column="54" TopLine="3680"/>
</Position19>
<Position20>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="4884" Column="20" TopLine="4858"/>
+ <Caret Line="3750" Column="52" TopLine="3733"/>
</Position20>
<Position21>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="5051" Column="28" TopLine="5025"/>
+ <Caret Line="1638" Column="9" TopLine="1627"/>
</Position21>
<Position22>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="240" Column="28" TopLine="225"/>
+ <Caret Line="3654" Column="56" TopLine="3636"/>
</Position22>
<Position23>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="830" Column="28" TopLine="804"/>
+ <Caret Line="3702" Column="54" TopLine="3685"/>
</Position23>
<Position24>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="841" Column="37" TopLine="816"/>
+ <Caret Line="3750" Column="52" TopLine="3733"/>
</Position24>
<Position25>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1029" Column="28" TopLine="1003"/>
+ <Caret Line="33" Column="44" TopLine="30"/>
</Position25>
<Position26>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1392" Column="35" TopLine="1384"/>
+ <Caret Line="1395" Column="50" TopLine="1385"/>
</Position26>
<Position27>
- <Filename Value="nifti_hdr_view.pas"/>
- <Caret Line="171" Column="31" TopLine="156"/>
+ <Filename Value="nifti_img_view.pas"/>
+ <Caret Line="1398" Column="47" TopLine="1385"/>
</Position27>
<Position28>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="1392" Column="35" TopLine="1384"/>
+ <Caret Line="1402" Column="57" TopLine="1385"/>
</Position28>
<Position29>
- <Filename Value="nifti_img.pas"/>
- <Caret Line="2" Column="121" TopLine="1"/>
+ <Filename Value="nifti_img_view.pas"/>
+ <Caret Line="1720" Column="50" TopLine="1703"/>
</Position29>
<Position30>
<Filename Value="nifti_img_view.pas"/>
- <Caret Line="111" Column="31" TopLine="107"/>
+ <Caret Line="2512" Column="50" TopLine="2494"/>
</Position30>
</JumpHistory>
</ProjectOptions>
diff --git a/npm/MeanFLU.nii.gz b/npm/MeanFLU.nii.gz
deleted file mode 100755
index f654e0a..0000000
Binary files a/npm/MeanFLU.nii.gz and /dev/null differ
diff --git a/npm/npm.app/Contents/Info.plist b/npm/npm.app/Contents/Info.plist
deleted file mode 100755
index faabe7e..0000000
--- a/npm/npm.app/Contents/Info.plist
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>npm</string>
- <key>CFBundleName</key>
- <string>npm</string>
- <key>CFBundleIdentifier</key>
- <string>com.company.npm</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>npm?</string>
- <key>CFBundleShortVersionString</key>
- <string>0.1</string>
- <key>CFBundleVersion</key>
- <string>1</string>
- <key>CSResourcesFileMapped</key>
- <true/>
- <key>CFBundleDocumentTypes</key>
- <array>
- <dict>
- <key>CFBundleTypeRole</key>
- <string>Viewer</string>
- <key>CFBundleTypeExtensions</key>
- <array>
- <string>*</string>
- </array>
- <key>CFBundleTypeOSTypes</key>
- <array>
- <string>fold</string>
- <string>disk</string>
- <string>****</string>
- </array>
- </dict>
- </array>
-</dict>
-</plist>
diff --git a/npm/npm.app/Contents/MacOS/npm b/npm/npm.app/Contents/MacOS/npm
deleted file mode 100755
index 20acbf9..0000000
--- a/npm/npm.app/Contents/MacOS/npm
+++ /dev/null
@@ -1 +0,0 @@
-../../../npm
\ No newline at end of file
diff --git a/npm/npm.app/Contents/PkgInfo b/npm/npm.app/Contents/PkgInfo
deleted file mode 100755
index 6f749b0..0000000
--- a/npm/npm.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
diff --git a/npm/wlsFLU.nii.gz b/npm/wlsFLU.nii.gz
deleted file mode 100755
index 6cfa648..0000000
Binary files a/npm/wlsFLU.nii.gz and /dev/null differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mricron.git
More information about the debian-med-commit
mailing list