New release (v1.0.20181114)

neurolabusc · Nov 24, 2018 · 41e3f50 · 41e3f50
1 parent 8369138
commit 41e3f50
Show file tree

Hide file tree

Showing 134 changed files with 10,554 additions and 1,441 deletions.
diff --git a/lut/Blue-Cyan.clut → Resources/lut/Blue-Cyan.clut b/lut/Blue-Cyan.clut → Resources/lut/Blue-Cyan.clut
diff --git a/lut/Bronze-Gold.clut → Resources/lut/Bronze-Gold.clut b/lut/Bronze-Gold.clut → Resources/lut/Bronze-Gold.clut
diff --git a/lut/Electric-Blue.clut → Resources/lut/Electric-Blue.clut b/lut/Electric-Blue.clut → Resources/lut/Electric-Blue.clut
diff --git a/lut/gold.clut → Resources/lut/Gold.clut b/lut/gold.clut → Resources/lut/Gold.clut
diff --git a/lut/Kelvin.clut → Resources/lut/Kelvin.clut b/lut/Kelvin.clut → Resources/lut/Kelvin.clut
diff --git a/lut/Montserrat.json → Resources/lut/Montserrat.json b/lut/Montserrat.json → Resources/lut/Montserrat.json
diff --git a/lut/montserrat.png → Resources/lut/Montserrat.png b/lut/montserrat.png → Resources/lut/Montserrat.png
diff --git a/lut/OpenSans.json → Resources/lut/OpenSans.json b/lut/OpenSans.json → Resources/lut/OpenSans.json
diff --git a/lut/opensans.png → Resources/lut/OpenSans.png b/lut/opensans.png → Resources/lut/OpenSans.png
diff --git a/lut/Oswald.json → Resources/lut/Oswald.json b/lut/Oswald.json → Resources/lut/Oswald.json
diff --git a/lut/Oswald.png → Resources/lut/Oswald.png b/lut/Oswald.png → Resources/lut/Oswald.png
diff --git a/lut/Oxygen.json → Resources/lut/Oxygen.json b/lut/Oxygen.json → Resources/lut/Oxygen.json
diff --git a/lut/oxygen.png → Resources/lut/Oxygen.png b/lut/oxygen.png → Resources/lut/Oxygen.png
diff --git a/lut/Roboto.json → Resources/lut/Roboto.json b/lut/Roboto.json → Resources/lut/Roboto.json
diff --git a/lut/roboto.png → Resources/lut/Roboto.png b/lut/roboto.png → Resources/lut/Roboto.png
diff --git a/lut/surface.clut → Resources/lut/Surface.clut b/lut/surface.clut → Resources/lut/Surface.clut
diff --git a/lut/Ubuntu.json → Resources/lut/Ubuntu.json b/lut/Ubuntu.json → Resources/lut/Ubuntu.json
diff --git a/lut/ubuntu.png → Resources/lut/Ubuntu.png b/lut/ubuntu.png → Resources/lut/Ubuntu.png
diff --git a/lut/unused/GE_color.clut → Resources/lut/unused/GE_color.clut b/lut/unused/GE_color.clut → Resources/lut/unused/GE_color.clut
diff --git a/lut/unused/cw_psych.clut → Resources/lut/unused/cw_psych.clut b/lut/unused/cw_psych.clut → Resources/lut/unused/cw_psych.clut
diff --git a/lut/unused/cwn_clear.clut → Resources/lut/unused/cwn_clear.clut b/lut/unused/cwn_clear.clut → Resources/lut/unused/cwn_clear.clut
diff --git a/lut/unused/cwn_fidl.clut → Resources/lut/unused/cwn_fidl.clut b/lut/unused/cwn_fidl.clut → Resources/lut/unused/cwn_fidl.clut
diff --git a/lut/unused/cwn_hsb8.clut → Resources/lut/unused/cwn_hsb8.clut b/lut/unused/cwn_hsb8.clut → Resources/lut/unused/cwn_hsb8.clut
diff --git a/lut/unused/cwn_raich4.clut → Resources/lut/unused/cwn_raich4.clut b/lut/unused/cwn_raich4.clut → Resources/lut/unused/cwn_raich4.clut
diff --git a/lut/unused/cwn_videen.clut → Resources/lut/unused/cwn_videen.clut b/lut/unused/cwn_videen.clut → Resources/lut/unused/cwn_videen.clut
diff --git a/lut/unused/cwp_clear.clut → Resources/lut/unused/cwp_clear.clut b/lut/unused/cwp_clear.clut → Resources/lut/unused/cwp_clear.clut
diff --git a/lut/unused/cwp_fidl.clut → Resources/lut/unused/cwp_fidl.clut b/lut/unused/cwp_fidl.clut → Resources/lut/unused/cwp_fidl.clut
diff --git a/lut/unused/cwp_hsb8.clut → Resources/lut/unused/cwp_hsb8.clut b/lut/unused/cwp_hsb8.clut → Resources/lut/unused/cwp_hsb8.clut
diff --git a/lut/unused/cwp_raich4.clut → Resources/lut/unused/cwp_raich4.clut b/lut/unused/cwp_raich4.clut → Resources/lut/unused/cwp_raich4.clut
diff --git a/lut/unused/cwp_videen.clut → Resources/lut/unused/cwp_videen.clut b/lut/unused/cwp_videen.clut → Resources/lut/unused/cwp_videen.clut
diff --git a/lut/unused/electric_blue.clut → Resources/lut/unused/electric_blue.clut b/lut/unused/electric_blue.clut → Resources/lut/unused/electric_blue.clut
diff --git a/lut/unused/gold.clut → Resources/lut/unused/gold.clut b/lut/unused/gold.clut → Resources/lut/unused/gold.clut
diff --git a/lut/unused/surface.clut → Resources/lut/unused/surface.clut b/lut/unused/surface.clut → Resources/lut/unused/surface.clut
diff --git a/lut/unused/x_rain.clut → Resources/lut/unused/x_rain.clut b/lut/unused/x_rain.clut → Resources/lut/unused/x_rain.clut
diff --git a/script/basic_paint_surface.gls → Resources/script/basic_paint_surface.gls b/script/basic_paint_surface.gls → Resources/script/basic_paint_surface.gls
diff --git a/script/create_atlas.gls → Resources/script/create_atlas.gls b/script/create_atlas.gls → Resources/script/create_atlas.gls
diff --git a/script/fmri_mesh.gls → Resources/script/fmri_mesh.gls b/script/fmri_mesh.gls → Resources/script/fmri_mesh.gls
diff --git a/script/frontal_atlas.gls → Resources/script/frontal_atlas.gls b/script/frontal_atlas.gls → Resources/script/frontal_atlas.gls
diff --git a/script/hide_curves.gls → Resources/script/hide_curves.gls b/script/hide_curves.gls → Resources/script/hide_curves.gls
diff --git a/script/mesh.gls → Resources/script/mesh.gls b/script/mesh.gls → Resources/script/mesh.gls
diff --git a/script/newer_2017.gls → Resources/script/newer_2017.gls b/script/newer_2017.gls → Resources/script/newer_2017.gls
diff --git a/script/node.gls → Resources/script/node.gls b/script/node.gls → Resources/script/node.gls
diff --git a/script/shaders.gls → Resources/script/shaders.gls b/script/shaders.gls → Resources/script/shaders.gls
diff --git a/script/track.gls → Resources/script/track.gls b/script/track.gls → Resources/script/track.gls
diff --git a/script/unused/caudate_atlas.gls → Resources/script/unused/caudate_atlas.gls b/script/unused/caudate_atlas.gls → Resources/script/unused/caudate_atlas.gls
diff --git a/script/unused/caudate_atlas_gray.gls → ...rces/script/unused/caudate_atlas_gray.gls b/script/unused/caudate_atlas_gray.gls → ...rces/script/unused/caudate_atlas_gray.gls
diff --git a/script/unused/forever.gls → Resources/script/unused/forever.gls b/script/unused/forever.gls → Resources/script/unused/forever.gls
diff --git a/script/unused/new_2017.gls → Resources/script/unused/new_2017.gls b/script/unused/new_2017.gls → Resources/script/unused/new_2017.gls
diff --git a/script/unused/outline.gls → Resources/script/unused/outline.gls b/script/unused/outline.gls → Resources/script/unused/outline.gls
diff --git a/shaders/Default.txt → Resources/shaders/Default.txt b/shaders/Default.txt → Resources/shaders/Default.txt
diff --git a/shaders/Default_Sky.txt → Resources/shaders/Default_Sky.txt b/shaders/Default_Sky.txt → Resources/shaders/Default_Sky.txt
diff --git a/shaders/Flat.txt → Resources/shaders/Flat.txt b/shaders/Flat.txt → Resources/shaders/Flat.txt
diff --git a/shaders/Gooch.txt → Resources/shaders/Gooch.txt b/shaders/Gooch.txt → Resources/shaders/Gooch.txt
diff --git a/shaders/Grid.txt → Resources/shaders/Grid.txt b/shaders/Grid.txt → Resources/shaders/Grid.txt
diff --git a/shaders/Heidrich-Seidel.txt → Resources/shaders/Heidrich-Seidel.txt b/shaders/Heidrich-Seidel.txt → Resources/shaders/Heidrich-Seidel.txt
diff --git a/shaders/Hemispheric.txt → Resources/shaders/Hemispheric.txt b/shaders/Hemispheric.txt → Resources/shaders/Hemispheric.txt
diff --git a/shaders/HideCurves.txt → Resources/shaders/HideCurves.txt b/shaders/HideCurves.txt → Resources/shaders/HideCurves.txt
diff --git a/shaders/Kelvin.txt → Resources/shaders/Kelvin.txt b/shaders/Kelvin.txt → Resources/shaders/Kelvin.txt
diff --git a/shaders/Matte.txt → Resources/shaders/Matte.txt b/shaders/Matte.txt → Resources/shaders/Matte.txt
diff --git a/shaders/Metal.txt → Resources/shaders/Metal.txt b/shaders/Metal.txt → Resources/shaders/Metal.txt
diff --git a/shaders/Minimal.txt → Resources/shaders/Minimal.txt b/shaders/Minimal.txt → Resources/shaders/Minimal.txt
diff --git a/shaders/MixMatch.txt → Resources/shaders/MixMatch.txt b/shaders/MixMatch.txt → Resources/shaders/MixMatch.txt
diff --git a/shaders/Oren-Nayer.txt → Resources/shaders/Oren-Nayer.txt b/shaders/Oren-Nayer.txt → Resources/shaders/Oren-Nayer.txt
diff --git a/shaders/Outline.txt → Resources/shaders/Outline.txt b/shaders/Outline.txt → Resources/shaders/Outline.txt
diff --git a/shaders/Phong.txt → Resources/shaders/Phong.txt b/shaders/Phong.txt → Resources/shaders/Phong.txt
diff --git a/shaders/PhongX.txt → Resources/shaders/PhongX.txt b/shaders/PhongX.txt → Resources/shaders/PhongX.txt
diff --git a/shaders/Phong_Matte.txt → Resources/shaders/Phong_Matte.txt b/shaders/Phong_Matte.txt → Resources/shaders/Phong_Matte.txt
diff --git a/shaders/Squares.txt → Resources/shaders/Squares.txt b/shaders/Squares.txt → Resources/shaders/Squares.txt
diff --git a/shaders/Toon.txt → Resources/shaders/Toon.txt b/shaders/Toon.txt → Resources/shaders/Toon.txt
diff --git a/shaders/Unused/Danny.txt → Resources/shaders/Unused/Danny.txt b/shaders/Unused/Danny.txt → Resources/shaders/Unused/Danny.txt
diff --git a/shaders/Unused/FloorReflect.txt → Resources/shaders/Unused/FloorReflect.txt b/shaders/Unused/FloorReflect.txt → Resources/shaders/Unused/FloorReflect.txt
diff --git a/shaders/Unused/NightVision.txt → Resources/shaders/Unused/NightVision.txt b/shaders/Unused/NightVision.txt → Resources/shaders/Unused/NightVision.txt
diff --git a/shaders/Unused/Simon.txt → Resources/shaders/Unused/Simon.txt b/shaders/Unused/Simon.txt → Resources/shaders/Unused/Simon.txt
diff --git a/shaders/Unused/mini.txt → Resources/shaders/Unused/mini.txt b/shaders/Unused/mini.txt → Resources/shaders/Unused/mini.txt
diff --git a/shaders/Ward.txt → Resources/shaders/Ward.txt b/shaders/Ward.txt → Resources/shaders/Ward.txt
diff --git a/shaders/Wire.txt → Resources/shaders/Wire.txt b/shaders/Wire.txt → Resources/shaders/Wire.txt
diff --git a/shaders/Wireframe.txt → Resources/shaders/Wireframe.txt b/shaders/Wireframe.txt → Resources/shaders/Wireframe.txt
diff --git a/shaders/xExploded.txt → Resources/shaders/xExploded.txt b/shaders/xExploded.txt → Resources/shaders/xExploded.txt
diff --git a/shaders/xGaps.txt → Resources/shaders/xGaps.txt b/shaders/xGaps.txt → Resources/shaders/xGaps.txt
diff --git a/shaders/xNormals.txt → Resources/shaders/xNormals.txt b/shaders/xNormals.txt → Resources/shaders/xNormals.txt
diff --git a/shadersOld/Default.txt → Resources/shadersOld/Default.txt b/shadersOld/Default.txt → Resources/shadersOld/Default.txt
diff --git a/shadersOld/Default_Sky.txt → Resources/shadersOld/Default_Sky.txt b/shadersOld/Default_Sky.txt → Resources/shadersOld/Default_Sky.txt
diff --git a/shadersOld/Fastest.txt → Resources/shadersOld/Fastest.txt b/shadersOld/Fastest.txt → Resources/shadersOld/Fastest.txt
diff --git a/shadersOld/Flat.txt → Resources/shadersOld/Flat.txt b/shadersOld/Flat.txt → Resources/shadersOld/Flat.txt
diff --git a/shadersOld/Gooch.txt → Resources/shadersOld/Gooch.txt b/shadersOld/Gooch.txt → Resources/shadersOld/Gooch.txt
diff --git a/shadersOld/Grid.txt → Resources/shadersOld/Grid.txt b/shadersOld/Grid.txt → Resources/shadersOld/Grid.txt
diff --git a/shadersOld/Heidrich-Seidel.txt → Resources/shadersOld/Heidrich-Seidel.txt b/shadersOld/Heidrich-Seidel.txt → Resources/shadersOld/Heidrich-Seidel.txt
diff --git a/shadersOld/Hemispheric.txt → Resources/shadersOld/Hemispheric.txt b/shadersOld/Hemispheric.txt → Resources/shadersOld/Hemispheric.txt
diff --git a/shadersOld/Matte.txt → Resources/shadersOld/Matte.txt b/shadersOld/Matte.txt → Resources/shadersOld/Matte.txt
diff --git a/shadersOld/Metal.txt → Resources/shadersOld/Metal.txt b/shadersOld/Metal.txt → Resources/shadersOld/Metal.txt
diff --git a/shadersOld/Minimal.txt → Resources/shadersOld/Minimal.txt b/shadersOld/Minimal.txt → Resources/shadersOld/Minimal.txt
diff --git a/shadersOld/MixMatch.txt → Resources/shadersOld/MixMatch.txt b/shadersOld/MixMatch.txt → Resources/shadersOld/MixMatch.txt
diff --git a/shadersOld/Oren-Nayer.txt → Resources/shadersOld/Oren-Nayer.txt b/shadersOld/Oren-Nayer.txt → Resources/shadersOld/Oren-Nayer.txt
diff --git a/shadersOld/Outline.txt → Resources/shadersOld/Outline.txt b/shadersOld/Outline.txt → Resources/shadersOld/Outline.txt
diff --git a/shadersOld/Phong.txt → Resources/shadersOld/Phong.txt b/shadersOld/Phong.txt → Resources/shadersOld/Phong.txt
diff --git a/shadersOld/Phong_Matte.txt → Resources/shadersOld/Phong_Matte.txt b/shadersOld/Phong_Matte.txt → Resources/shadersOld/Phong_Matte.txt
diff --git a/shadersOld/Toon.txt → Resources/shadersOld/Toon.txt b/shadersOld/Toon.txt → Resources/shadersOld/Toon.txt
diff --git a/shadersOld/Ward.txt → Resources/shadersOld/Ward.txt b/shadersOld/Ward.txt → Resources/shadersOld/Ward.txt
diff --git a/shadersOld/Wire.txt → Resources/shadersOld/Wire.txt b/shadersOld/Wire.txt → Resources/shadersOld/Wire.txt
diff --git a/shadersOld/Wireframe.txt → Resources/shadersOld/Wireframe.txt b/shadersOld/Wireframe.txt → Resources/shadersOld/Wireframe.txt
diff --git a/shadersOld/xExploded.txt → Resources/shadersOld/xExploded.txt b/shadersOld/xExploded.txt → Resources/shadersOld/xExploded.txt
diff --git a/shadersOld/xGaps.txt → Resources/shadersOld/xGaps.txt b/shadersOld/xGaps.txt → Resources/shadersOld/xGaps.txt
diff --git a/colorTable.pas b/colorTable.pas
@@ -159,7 +159,7 @@ function loadCustomLUT(var lIndex: integer): TLUTnodes;
  setNode(0,0,0,0,0, 0, result);
  setNode(255,255,255,255,255, 1, result);
  result.isFreeSurfer:= false;
- lFilename := CLUTdir+pathdelim+GLForm1.LUTdrop.Items[lIndex]+'.clut';
+ lFilename := CLUTdir+pathdelim+GLForm1.LayerColorDrop.Items[lIndex]+'.clut';
  if not fileexists(lFilename) then begin
     lIndex := 0;
     exit;
@@ -263,9 +263,14 @@ function makeLUT(var lIndex: integer): TLUTnodes;
        end;
        15: begin //FreeSurferCurve - valleys dark
           result.isFreeSurfer:= true;
-          setNode(0,0,0,0,0, 0, result);
-          setNode(0,0,0,0,156, 1, result);
-          setNode(0,0,0,255,255, 2, result);
+          setNode(  0,  0,  0,  0,  0, 0, result);
+          setNode(  0,  0,  0,  0,136, 1, result);
+          setNode(  0,  0,  0,140,155, 2, result);
+          setNode(  0,  0,  0,200,255, 3, result);
+
+          //setNode(255,0,0,255,0, 0, result);
+          //setNode(0,255,0,0,156, 1, result);
+          //setNode(0,0,255,255,255, 2, result);
 
        end;
        16: begin //FreeSurferCurve  - curves (valleys and ridges) dark
@@ -335,6 +340,8 @@ function UpdateTransferFunction (var lIndex: integer; isInvert: boolean): TLUT;/
     result[255].A := rev[255].A;
  end;
  if lLUTNodes.isFreeSurfer then begin
+   //for lInc := 1 to 255 do
+   //    result[lInc].A := 128;
    //result[255].R := 0;
    //result[255].G := 0;
    //result[255].B := 0;

diff --git a/commandsu.pas b/commandsu.pas
@@ -159,12 +159,15 @@ procedure WAIT (MSEC: integer);
 implementation
 uses
     //{$IFDEF UNIX}fileutil,{$ENDIF}
-    mainunit, define_types, shaderui, graphics, LCLintf, Forms, SysUtils, Dialogs, scriptengine, mesh, meshify;
+    mainunit, define_types, shaderui, graphics, LCLintf, Forms, SysUtils, Dialogs,  mesh, meshify;
 
 procedure SCRIPTFORMVISIBLE (VISIBLE: boolean);
 begin
-  GLForm1.ScriptMenuClick(nil);
-  ScriptForm.visible := VISIBLE;
+  //ScriptForm.visible := VISIBLE;
+  if (GLForm1.ScriptPanel.Width < 24) and (VISIBLE) then
+        GLForm1.ScriptPanel.Width := 240;
+  if (not VISIBLE) then
+     GLForm1.ScriptPanel.Width := 0;
 end;
 
 function ATLASMAXINDEX(OVERLAY: integer): integer;
@@ -174,7 +177,7 @@ function ATLASMAXINDEX(OVERLAY: integer): integer;
   else
       result := gMesh.overlay[OVERLAY].atlasMaxIndex;
   if result < 1 then
-     ScriptForm.Memo2.Lines.Add('Current mesh is not an atlas.');
+     GLForm1.ScriptOutputMemo.Lines.Add('Current mesh is not an atlas.');
 end;
 
 procedure ATLASGRAYBG(const Filt: array of integer);
@@ -327,16 +330,15 @@ procedure ATLASSTATMAP(ATLASNAME, STATNAME: string; const Indices: array of inte
     STATNAME := DefaultToHomeDir(STATNAME);
     STATNAME := changefileext(STATNAME,'.mz3');
     gMesh.SaveOverlay(STATNAME, gMesh.OpenOverlays);
-    ScriptForm.Memo2.Lines.Add('Creating mesh '+STATNAME);
+    GLForm1.ScriptOutputMemo.Lines.Add('Creating mesh '+STATNAME);
   end;
   //err := gMesh.AtlasStatMapCore(AtlasName, StatName, idxs, intens);
   123:
   if err <> '' then //report error
-     ScriptForm.Memo2.Lines.Add('ATLASSTATMAP: '+err);
+     GLForm1.ScriptOutputMemo.Lines.Add('ATLASSTATMAP: '+err);
   GLForm1.GLboxRequestUpdate(nil);
   GLForm1.UpdateToolbar;
-  GLForm1.StringGrid1.RowCount := gMesh.OpenOverlays+1;
-  GLForm1.UpdateOverlaySpread;
+  GLForm1.UpdateLayerBox(true);
 end;
 
 procedure BMPZOOM(Z: byte);
@@ -454,32 +456,32 @@ procedure MESHCREATE(niiname, meshname: string; threshold, decimateFrac: single;
 begin
   //Nii2MeshCore(niiname, meshname: string; threshold, decimateFrac: single; minimumClusterVox, smoothStyle: integer): integer;
   if (niiname = '') then begin
-    ScriptForm.Memo2.Lines.Add('meshcreate error: no NIfTI name');
+    GLForm1.ScriptOutputMemo.Lines.Add('meshcreate error: no NIfTI name');
     exit;
   end;
   if (meshname = '') then begin
-    ScriptForm.Memo2.Lines.Add('meshcreate error: no mesh name');
+    GLForm1.ScriptOutputMemo.Lines.Add('meshcreate error: no mesh name');
     exit;
   end;
   meshnamePth := DefaultToHomeDir(meshname);
   nVtx := Nii2MeshCore(niiname, meshnamePth, threshold, decimateFrac, minimumClusterVox, smoothStyle);
   if (nVtx < 3) then
-     ScriptForm.Memo2.Lines.Add('meshcreate error: no mesh created')
+     GLForm1.ScriptOutputMemo.Lines.Add('meshcreate error: no mesh created')
   else
-      ScriptForm.Memo2.Lines.Add('meshcreate generated mesh with '+inttostr(nVtx)+' vertices');
+      GLForm1.ScriptOutputMemo.Lines.Add('meshcreate generated mesh with '+inttostr(nVtx)+' vertices');
 end;
 
 procedure MESHLOAD(lFilename: string);
 begin
   if not GLForm1.OpenMesh(lFilename) then begin
-     ScriptForm.Memo2.Lines.Add('Unable to load mesh named "'+lFilename+'"');
+     GLForm1.ScriptOutputMemo.Lines.Add('Unable to load mesh named "'+lFilename+'"');
    end;
 end;
 
 procedure MESHSAVE(lFilename: string);
 begin
   if not GLForm1.SaveMeshCore(lFilename) then begin
-     ScriptForm.Memo2.Lines.Add('Unable to save mesh named "'+lFilename+'"');
+     GLForm1.ScriptOutputMemo.Lines.Add('Unable to save mesh named "'+lFilename+'"');
    end;
 end;
 
@@ -492,25 +494,25 @@ procedure MESHOVERLAYORDER (FLIP: boolean);
 procedure OVERLAYLOAD(lFilename: string);
 begin
    if not GLForm1.OpenOverlay(lFilename)then
-      ScriptForm.Memo2.Lines.Add('Unable to load overlay named "'+lFilename+'"');
+      GLForm1.ScriptOutputMemo.Lines.Add('Unable to load overlay named "'+lFilename+'"');
 end;
 
 procedure TRACKLOAD(lFilename: string);
 begin
       if not GLForm1.OpenTrack(lFilename) then
-        ScriptForm.Memo2.Lines.Add('Unable to load track named "'+lFilename+'"');
+        GLForm1.ScriptOutputMemo.Lines.Add('Unable to load track named "'+lFilename+'"');
 end;
 
 procedure NODELOAD(lFilename: string);
 begin
   if not GLForm1.OpenNode(lFilename) then
-      ScriptForm.Memo2.Lines.Add('Unable to load node named "'+lFilename+'"');
+      GLForm1.ScriptOutputMemo.Lines.Add('Unable to load node named "'+lFilename+'"');
 end;
 
 procedure EDGELOAD(lFilename: string);
 begin
   if not GLForm1.OpenEdge(lFilename)then
-      ScriptForm.Memo2.Lines.Add('Unable to load edge named "'+lFilename+'"');
+      GLForm1.ScriptOutputMemo.Lines.Add('Unable to load edge named "'+lFilename+'"');
 end;
 
 procedure SHADERNAME(lFilename: string);
@@ -601,8 +603,8 @@ procedure MODALMESSAGE(STR: string);
 
 procedure MODELESSMESSAGE(STR: string);
 begin
-   ScriptForm.Memo2.Lines.Add(STR);
-   ScriptForm.Refresh;
+   GLForm1.ScriptOutputMemo.Lines.Add(STR);
+   GLForm1.Refresh;
 end;
 
 procedure NODECOLOR(name: string; varies: boolean);
@@ -664,7 +666,7 @@ procedure EDGECREATE(filename: string; const mtx: array of single);
     n := length(mtx);
     nRow := round(sqrt(n));
     if (n < 1) or ((nRow * nRow) <> n) then begin
-       ScriptForm.Memo2.Lines.Add('EDGECREATE expects a matrix that has a size of n*n. For example, a connectome with 3 nodes should have a matrix with 9 items.');
+       GLForm1.ScriptOutputMemo.Lines.Add('EDGECREATE expects a matrix that has a size of n*n. For example, a connectome with 3 nodes should have a matrix with 9 items.');
        exit;
     end;
     //write output
@@ -691,9 +693,9 @@ procedure EDGECREATE(filename: string; const mtx: array of single);
     CloseFile(f);
     FileMode := fmOpenRead;
     if not GLForm1.OpenEdge(fnm) then
-       ScriptForm.Memo2.Lines.Add('EDGECREATE Unable to load edge file named "'+fnm+'" (use nodecreate or nodeload first) ')
+       GLForm1.ScriptOutputMemo.Lines.Add('EDGECREATE Unable to load edge file named "'+fnm+'" (use nodecreate or nodeload first) ')
     else
-        ScriptForm.Memo2.Lines.Add('EDGECREATE created "'+fnm+'"')
+        GLForm1.ScriptOutputMemo.Lines.Add('EDGECREATE created "'+fnm+'"')
 end;
 
 procedure NODECREATE(filename: string; const x,y,z,clr,radius: array of single);
@@ -705,15 +707,15 @@ procedure NODECREATE(filename: string; const x,y,z,clr,radius: array of single);
 begin
     n := length(x);
     if (n < 1) or (n <> length(y)) or (n <> length(z)) then begin
-       ScriptForm.Memo2.Lines.Add('NODECREATE error: x,y,z must have same number of nodes');
+       GLForm1.ScriptOutputMemo.Lines.Add('NODECREATE error: x,y,z must have same number of nodes');
        exit;
     end;
     if (length(clr) > 1) and (length(clr) <> n) then begin
-       ScriptForm.Memo2.Lines.Add('NODECREATE error: color must have same number of items as x,y and z');
+       GLForm1.ScriptOutputMemo.Lines.Add('NODECREATE error: color must have same number of items as x,y and z');
        exit;
     end;
     if (length(radius) > 1) and (length(radius) <> n) then begin
-       ScriptForm.Memo2.Lines.Add('NODECREATE error: radius must have same number of items as x,y and z');
+       GLForm1.ScriptOutputMemo.Lines.Add('NODECREATE error: radius must have same number of items as x,y and z');
        exit;
     end;
     //set color
@@ -756,9 +758,9 @@ procedure NODECREATE(filename: string; const x,y,z,clr,radius: array of single);
     CloseFile(f);
     FileMode := fmOpenRead;
     if not GLForm1.OpenNode(fnm) then
-       ScriptForm.Memo2.Lines.Add('NODECREATE Unable to load node named "'+fnm+'"')
+       GLForm1.ScriptOutputMemo.Lines.Add('NODECREATE Unable to load node named "'+fnm+'"')
     else
-        ScriptForm.Memo2.Lines.Add('NODECREATE created "'+fnm+'"')
+        GLForm1.ScriptOutputMemo.Lines.Add('NODECREATE created "'+fnm+'"')
 end;
 
 procedure NODESIZE(size: single; varies: boolean);

diff --git a/define_types.pas b/define_types.pas
@@ -4,7 +4,7 @@ interface
 uses graphics;
 {$endif}
 const
-  kVers = 'v1.0.20180622';
+  kVers = 'v1.0.20181114)';
   NaN : double = 1/0;
   kTab = chr(9);
   kCR = chr (13);