New release 1.2.20211007

rordenlab · Jan 9, 2022 · b67bb3d · b67bb3d
1 parent eea783f
commit b67bb3d
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 67 deletions.
diff --git a/MRIcroGL.lps b/MRIcroGL.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <Version Value="12"/>
     <BuildModes Active="Default"/>
-    <Units Count="49">
+    <Units Count="50">
       <Unit0>
         <Filename Value="MRIcroGL.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -19,11 +19,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="9899"/>
-        <CursorPos X="30" Y="9902"/>
+        <TopLine Value="9894"/>
+        <CursorPos X="20" Y="9930"/>
         <UsageCount Value="204"/>
         <Loaded Value="True"/>
-        <LoadedDesigner Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="dcm2nii.pas"/>
@@ -176,7 +175,7 @@
       </Unit17>
       <Unit18>
         <Filename Value="prefs.pas"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="2"/>
         <TopLine Value="82"/>
         <CursorPos X="66" Y="92"/>
         <UsageCount Value="105"/>
@@ -198,11 +197,10 @@
       </Unit20>
       <Unit21>
         <Filename Value="../Metal-Demos/common/SimdUtils.pas"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="14"/>
         <CursorPos X="27" Y="31"/>
         <UsageCount Value="100"/>
-        <Loaded Value="True"/>
       </Unit21>
       <Unit22>
         <Filename Value="../Metal-Demos/common/VectorMath.pas"/>
@@ -225,7 +223,7 @@
       </Unit24>
       <Unit25>
         <Filename Value="colorEditor.pas"/>
-        <EditorIndex Value="12"/>
+        <EditorIndex Value="11"/>
         <TopLine Value="267"/>
         <CursorPos X="61" Y="292"/>
         <UsageCount Value="98"/>
@@ -253,7 +251,7 @@
       </Unit28>
       <Unit29>
         <Filename Value="colorTable.pas"/>
-        <EditorIndex Value="13"/>
+        <EditorIndex Value="12"/>
         <TopLine Value="562"/>
         <CursorPos X="71" Y="568"/>
         <UsageCount Value="93"/>
@@ -283,10 +281,9 @@
       </Unit32>
       <Unit33>
         <Filename Value="../Metal-Demos/common/retinahelper.pas"/>
-        <EditorIndex Value="11"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="13" Y="22"/>
         <UsageCount Value="101"/>
-        <Loaded Value="True"/>
       </Unit33>
       <Unit34>
         <Filename Value="../Python27-for-Lazarus/python4lazarus/PythonEngine.pas"/>
@@ -327,8 +324,8 @@
       <Unit39>
         <Filename Value="PythonBridge/PythonBridge.pas"/>
         <EditorIndex Value="9"/>
-        <TopLine Value="445"/>
-        <CursorPos X="10" Y="450"/>
+        <TopLine Value="117"/>
+        <CursorPos X="54" Y="127"/>
         <UsageCount Value="56"/>
         <Loaded Value="True"/>
       </Unit39>
@@ -381,151 +378,159 @@
       </Unit45>
       <Unit46>
         <Filename Value="../fpc/packages/fcl-process/src/processbody.inc"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="5"/>
         <TopLine Value="174"/>
         <CursorPos X="10" Y="185"/>
         <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit46>
       <Unit47>
         <Filename Value="../fpc/rtl/objpas/sysutils/filutilh.inc"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="4"/>
         <TopLine Value="186"/>
         <CursorPos X="26" Y="198"/>
         <UsageCount Value="12"/>
         <Loaded Value="True"/>
       </Unit47>
       <Unit48>
         <Filename Value="fsl_calls.pas"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="3"/>
         <TopLine Value="134"/>
         <CursorPos X="9" Y="148"/>
         <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit48>
+      <Unit49>
+        <Filename Value="Metal-Demos/common/SimdUtils.pas"/>
+        <EditorIndex Value="1"/>
+        <TopLine Value="42"/>
+        <CursorPos Y="75"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit49>
     </Units>
     <Build>
       <CleanOutputFileMask Value="*.ppu;*.ppl;*.o;*.or"/>
     </Build>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="6598" Column="16" TopLine="6586"/>
+        <Caret Line="9971" Column="22" TopLine="9939"/>
       </Position1>
       <Position2>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="490" Column="34" TopLine="470"/>
+        <Caret Line="490" Column="34" TopLine="471"/>
       </Position2>
       <Position3>
-        <Filename Value="mainunit.pas"/>
-        <Caret Line="3686" Column="39" TopLine="3653"/>
+        <Filename Value="fsl_calls.pas"/>
       </Position3>
       <Position4>
-        <Filename Value="mainunit.pas"/>
-        <Caret Line="6598" Column="22" TopLine="6565"/>
+        <Filename Value="fsl_calls.pas"/>
+        <Caret Line="140" Column="3" TopLine="127"/>
       </Position4>
       <Position5>
-        <Filename Value="mainunit.pas"/>
-        <Caret Line="9965" Column="22" TopLine="9933"/>
+        <Filename Value="fsl_calls.pas"/>
+        <Caret Line="147" Column="58" TopLine="130"/>
       </Position5>
       <Position6>
-        <Filename Value="mainunit.pas"/>
-        <Caret Line="9966" Column="22" TopLine="9934"/>
+        <Filename Value="prefs.pas"/>
+        <Caret Line="101" Column="13" TopLine="69"/>
       </Position6>
       <Position7>
-        <Filename Value="mainunit.pas"/>
-        <Caret Line="9971" Column="22" TopLine="9939"/>
+        <Filename Value="prefs.pas"/>
+        <Caret Line="100" Column="69" TopLine="56"/>
       </Position7>
       <Position8>
-        <Filename Value="mainunit.pas"/>
-        <Caret Line="490" Column="34" TopLine="471"/>
+        <Filename Value="prefs.pas"/>
+        <Caret Line="102" Column="68" TopLine="75"/>
       </Position8>
       <Position9>
-        <Filename Value="fsl_calls.pas"/>
+        <Filename Value="nifti.pas"/>
+        <Caret Line="6911" Column="33" TopLine="6911"/>
       </Position9>
       <Position10>
-        <Filename Value="fsl_calls.pas"/>
-        <Caret Line="140" Column="3" TopLine="127"/>
+        <Filename Value="nifti.pas"/>
+        <Caret Line="161" Column="27" TopLine="143"/>
       </Position10>
       <Position11>
-        <Filename Value="fsl_calls.pas"/>
-        <Caret Line="147" Column="58" TopLine="130"/>
+        <Filename Value="nifti.pas"/>
+        <Caret Line="3510" Column="16" TopLine="3496"/>
       </Position11>
       <Position12>
-        <Filename Value="prefs.pas"/>
-        <Caret Line="101" Column="13" TopLine="69"/>
+        <Filename Value="nifti.pas"/>
+        <Caret Line="3512" Column="18" TopLine="3496"/>
       </Position12>
       <Position13>
-        <Filename Value="prefs.pas"/>
-        <Caret Line="100" Column="69" TopLine="56"/>
+        <Filename Value="nifti.pas"/>
+        <Caret Line="3524" Column="17" TopLine="3496"/>
       </Position13>
       <Position14>
-        <Filename Value="prefs.pas"/>
-        <Caret Line="102" Column="68" TopLine="75"/>
+        <Filename Value="nifti.pas"/>
+        <Caret Line="3540" Column="19" TopLine="3508"/>
       </Position14>
       <Position15>
         <Filename Value="nifti.pas"/>
-        <Caret Line="6911" Column="33" TopLine="6911"/>
+        <Caret Line="3604" Column="16" TopLine="3584"/>
       </Position15>
       <Position16>
         <Filename Value="nifti.pas"/>
-        <Caret Line="161" Column="27" TopLine="143"/>
+        <Caret Line="3606" Column="18" TopLine="3584"/>
       </Position16>
       <Position17>
         <Filename Value="nifti.pas"/>
-        <Caret Line="3510" Column="16" TopLine="3496"/>
+        <Caret Line="3619" Column="17" TopLine="3587"/>
       </Position17>
       <Position18>
         <Filename Value="nifti.pas"/>
-        <Caret Line="3512" Column="18" TopLine="3496"/>
+        <Caret Line="3635" Column="19" TopLine="3604"/>
       </Position18>
       <Position19>
         <Filename Value="nifti.pas"/>
-        <Caret Line="3524" Column="17" TopLine="3496"/>
+        <Caret Line="4619" Column="11" TopLine="4587"/>
       </Position19>
       <Position20>
         <Filename Value="nifti.pas"/>
-        <Caret Line="3540" Column="19" TopLine="3508"/>
+        <Caret Line="4743" Column="36" TopLine="4741"/>
       </Position20>
       <Position21>
         <Filename Value="nifti.pas"/>
-        <Caret Line="3604" Column="16" TopLine="3584"/>
+        <Caret Line="4622" Column="38" TopLine="4602"/>
       </Position21>
       <Position22>
         <Filename Value="nifti.pas"/>
-        <Caret Line="3606" Column="18" TopLine="3584"/>
+        <Caret Line="4615" Column="15" TopLine="4588"/>
       </Position22>
       <Position23>
         <Filename Value="nifti.pas"/>
-        <Caret Line="3619" Column="17" TopLine="3587"/>
+        <Caret Line="4597" Column="30" TopLine="4587"/>
       </Position23>
       <Position24>
-        <Filename Value="nifti.pas"/>
-        <Caret Line="3635" Column="19" TopLine="3604"/>
+        <Filename Value="mainunit.pas"/>
+        <Caret Line="3672" Column="36" TopLine="3666"/>
       </Position24>
       <Position25>
-        <Filename Value="nifti.pas"/>
-        <Caret Line="4619" Column="11" TopLine="4587"/>
+        <Filename Value="mainunit.pas"/>
+        <Caret Line="9902" Column="37" TopLine="9899"/>
       </Position25>
       <Position26>
-        <Filename Value="nifti.pas"/>
-        <Caret Line="4743" Column="36" TopLine="4741"/>
+        <Filename Value="mainunit.pas"/>
+        <Caret Line="3488" Column="45" TopLine="3468"/>
       </Position26>
       <Position27>
-        <Filename Value="nifti.pas"/>
-        <Caret Line="4622" Column="38" TopLine="4602"/>
+        <Filename Value="Metal-Demos/common/SimdUtils.pas"/>
+        <Caret Line="81" Column="36" TopLine="64"/>
       </Position27>
       <Position28>
-        <Filename Value="nifti.pas"/>
-        <Caret Line="4615" Column="15" TopLine="4588"/>
+        <Filename Value="Metal-Demos/common/SimdUtils.pas"/>
+        <Caret Line="45" Column="12" TopLine="19"/>
       </Position28>
       <Position29>
-        <Filename Value="nifti.pas"/>
-        <Caret Line="4597" Column="30" TopLine="4587"/>
+        <Filename Value="mainunit.pas"/>
+        <Caret Line="3472" Column="33" TopLine="3469"/>
       </Position29>
       <Position30>
         <Filename Value="mainunit.pas"/>
-        <Caret Line="3672" Column="36" TopLine="3666"/>
+        <Caret Line="5444" Column="41" TopLine="5412"/>
       </Position30>
     </JumpHistory>
     <RunParams>

diff --git a/MRIcroGL.res b/MRIcroGL.res
diff --git a/PythonBridge/PythonBridge.pas b/PythonBridge/PythonBridge.pas
@@ -193,7 +193,6 @@ function PythonLoadAndInitialize(resourceDir, resourceDir2: ansistring; callback
     home2 := resourceDir2 + pathdelim + 'python37';
     if (not (DirectoryExists(home))) and (DirectoryExists(home2)) then
        home := home2;
-
     if not (DirectoryExists(home)) then begin
       {$ifdef lcl}
       ShowMessage('Static Python: Unable to find Python home: '+home +' : '+home2);

diff --git a/deb/copyright b/deb/copyright
@@ -11,6 +11,7 @@ Files-Excluded: */*.or
                 */*~
                 */Resources/python37
                 */Resources/python36.zip
+                */Resources/python36.dll
                 */Thumbs.db
                 */.DS_Store
                 */PythonBridge/aarch64-darwin
@@ -25,7 +26,7 @@ Files-Excluded: */*.or
                 */*.dpl
 
 Files: *
-Copyright: Copyright 2006-2021, Chris Rorden
+Copyright: Copyright 2011-2021, Chris Rorden
 License: BSD-2-clause
 
 Files: Metal-Demos/common/VectorMath.pas

diff --git a/deb/mricrogl-data.install b/deb/mricrogl-data.install
@@ -5,3 +5,4 @@ Resources/script usr/share/mricrogl
 Resources/shader usr/share/mricrogl
 Resources/standard usr/share/mricrogl
 #TODO Roboto.json/Roboto.png from Resources
+
diff --git a/mainunit.pas b/mainunit.pas
@@ -3486,7 +3486,7 @@ function TGLForm1.PyCreate: boolean;
  printf('ResourceDir: '+ResourceDir +' PyLib: '+PyLib);
  //showmessage('ResourceDir: '+ResourceDir +' PyLib: '+PyLib);
  if not PythonLoadAndInitialize(PyLib, ResourceDir, GLForm1.GotPythonData) then begin
-   writeln('Unable to load Python');
+   printf('Unable to load Python');
    exit(false);
  end;
  printf('Loading modules....');

diff --git a/vers.inc b/vers.inc
@@ -1 +1 @@
-kVers='1.2.20211006';
+kVers='1.2.20211007';