Merge pull request #602 from ocehugo/release-2.6.1

Release 2.6.1
aodn · Oct 23, 2019 · 40287a2 · 40287a2
2 parents ce32d10 + 933b2aa
commit 40287a2
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,7 @@ Java/bin
 *.pyc
 *.m~
 *.log
+data
+dist
+data/*
+dist/*
diff --git a/GUI/mainWindow.m b/GUI/mainWindow.m
@@ -287,7 +287,7 @@ function mainWindow(windowTitle, sample_data, states, startState, selectionCallb
         'HandleVisibility', 'off', ...
         'OnCallback', @onZoomIn, ...
         'OffCallback', 'zoom(''off'')');
-    [img,map,alpha] = imread(fullfile(matlabroot,'toolbox','matlab','icons','tool_zoom_in.png'));
+    [img,map,alpha] = imread(fullfile(matlabroot,'mcr','toolbox','matlab','icons','tool_zoom_in.png'));
     img = double(img)/double(intmax(class(img)));
     img(repmat(alpha==0,[1 1 3])) = NaN;
     zoominb.CData = img;
@@ -297,7 +297,7 @@ function mainWindow(windowTitle, sample_data, states, startState, selectionCallb
         'HandleVisibility', 'off', ...
         'OnCallback', @onZoomOut, ...
         'OffCallback', 'zoom(''off'')');
-    [img,map,alpha] = imread(fullfile(matlabroot,'toolbox','matlab','icons','tool_zoom_out.png'));
+    [img,map,alpha] = imread(fullfile(matlabroot,'mcr','toolbox','matlab','icons','tool_zoom_out.png'));
     img = double(img)/double(intmax(class(img)));
     img(repmat(alpha==0,[1 1 3])) = NaN;
     zoomoutb.CData = img;
@@ -307,7 +307,7 @@ function mainWindow(windowTitle, sample_data, states, startState, selectionCallb
         'HandleVisibility', 'off', ...
         'OnCallback', 'pan(''on'')', ...
         'OffCallback', 'pan(''off'')');
-    [img,map,alpha] = imread(fullfile(matlabroot,'toolbox','matlab','icons','tool_hand.png'));
+    [img,map,alpha] = imread(fullfile(matlabroot,'mcr','toolbox','matlab','icons','tool_hand.png'));
     img = double(img)/double(intmax(class(img)));
     img(repmat(alpha==0,[1 1 3])) = NaN;
     hPan.CData = img;

diff --git a/Java/ddb.jar b/Java/ddb.jar
diff --git a/imosToolboxBatch_Win32.bat b/imosToolboxBatch_Win32.bat
diff --git a/imosToolbox_Linux64.bin b/imosToolbox_Linux64.bin
diff --git a/imosToolbox_Win32.bat b/imosToolbox_Win32.bat
diff --git a/imosToolbox_Win32.exe b/imosToolbox_Win32.exe
diff --git a/imosToolbox_Win64.exe b/imosToolbox_Win64.exe
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,7 @@ Java/bin @@
     *.pyc
     *.m~
     *.log
+    data
+    dist
+    data/*
+    dist/*