[mcxstudio] correctly handle _ArrayOrder_=c, fix --lang for mcxcl/mmc

Author: fangq

mcxstudio/mcxgui.pas

@@ -849,9 +849,6 @@ procedure TfmMCX.mcxdoDefaultExecute(Sender: TObject);
       ckSpecular.Checked:=false;
       edWorkLoad.Text:='100';
       edMoreParam.Text:='';
-      if(Length(DefaultLang) > 0) then begin
-          edMoreParam.Text:='--lang ' + DefaultLang;
-      end;
 
       edUnitInMM.Text:='1';
       ckSharedFS.Checked:=false;
@@ -1809,7 +1806,7 @@ procedure TfmMCX.FormCreate(Sender: TObject);
     if(not DirectoryExists(workdir)) then
         UseUserFolder:=true;
 
-    DefaultLang := 'en';
+    DefaultLang := '';
     if(Application.HasOption('l','lang')) then
         DefaultLang := Application.GetOptionValue('l', 'lang');
 end;
@@ -3284,6 +3281,11 @@ function TfmMCX.CreateCmd(proc: TProcess=nil):AnsiString;
         param.Add(debugflag);
     end;
 
+    if (Length(DefaultLang) > 0) and (grProgram.ItemIndex = 0) then begin
+        param.Add('--lang');
+        param.Add(DefaultLang);
+    end;
+
     if(Length(edMoreParam.Text)>0) then begin
         shellscript:=TStringList.Create;
         shellscript.StrictDelimiter:=true;
@@ -3293,6 +3295,7 @@ function TfmMCX.CreateCmd(proc: TProcess=nil):AnsiString;
         shellscript.Free;
     end;
 
+
     AddLog('"-- Command: --"');
     AddLog(cmd+' '+param.DelimitedText);
 

mcxstudio/mcxview.pas

@@ -609,7 +609,7 @@ procedure TfmViewer.glCanvasMouseWheel(Sender: TObject; Shift: TShiftState;
   XZGrid.Position.Y:=-M_Output_Texture_3D.Y_Size/2;
   XZGrid.Position.Z:=-M_Output_Texture_3D.Z_Size/2;
 
-  GLCamera.DepthOfView:=2.0*sqrt(Frame.Scale.X*Frame.Scale.X+Frame.Scale.Y*Frame.Scale.Y+Frame.Scale.Z*Frame.Scale.Z);
+  GLCamera.DepthOfView:=2.5*sqrt(Frame.Scale.X*Frame.Scale.X+Frame.Scale.Y*Frame.Scale.Y+Frame.Scale.Z*Frame.Scale.Z);
   GLCamera.Position.X:=M_Output_Texture_3D.X_Size;
   GLCamera.Position.Y:=M_Output_Texture_3D.Y_Size*0.7;
   GLCamera.Position.Z:=M_Output_Texture_3D.Z_Size;

mcxstudio/texture_3d.pas

@@ -253,6 +253,7 @@ procedure TTexture_3D.Load_From_JNIFTI_File (Const F_FileName : String);
   bufin, bufout: TMemoryStream;
   unzip: TDecompressionStream;
   idx: integer;
+  columnmajor: boolean=false;
 
 begin { TTexture_3D.Load_From_File }
   Screen.Cursor := crHourGlass;
@@ -291,9 +292,11 @@ procedure TTexture_3D.Load_From_JNIFTI_File (Const F_FileName : String);
     idx := JDataType.IndexOf(niidata.FindPath('_ArrayType_').AsString);
     if idx >= 0 then
          DataFormat := PtrUInt(JDataType.Objects[idx]);
+    if (niidata.FindPath('_ArrayOrder_') <> nil) and (Pos(niidata.FindPath('_ArrayOrder_').AsString, 'c') = 1) then
+         columnmajor := true;
 
     bufout.Position:=0;
-    Load_Texture_From_Stream(bufout, XDim, YDim, ZDim, TDim, DataFormat, false);
+    Load_Texture_From_Stream(bufout, XDim, YDim, ZDim, TDim, DataFormat, columnmajor);
   finally
     bufout.Free;
     jnii.Free;