diff --git a/GUI/createImages/shiftCBar_BarInFig.m b/GUI/createImages/shiftCBar_BarInFig.m index 8068166..8c5f507 100644 --- a/GUI/createImages/shiftCBar_BarInFig.m +++ b/GUI/createImages/shiftCBar_BarInFig.m @@ -77,8 +77,8 @@ function changepointer(hf,~) elseif y_new<=1.1 x = (y_int:((s+1-y_int)/(s+1)):(s+1))'; else - ym = min((y_int)/(y_new)*ceil(y_new),64); - x = [linspace(1,(y_int)/(y_new)*floor(y_new),floor(y_new)) linspace(ym,64,65-ceil(y_new))]'; + ym = min((y_int)/(y_new)*ceil(y_new),s); + x = [linspace(1,(y_int)/(y_new)*floor(y_new),floor(y_new)) linspace(ym,s,(s+1)-ceil(y_new))]'; end cmap_new = [interp1(ind,cmap(:,1),x) interp1(ind,cmap(:,2),x) interp1(ind,cmap(:,3),x)]; colormap(ha,cmap_new) diff --git a/GUI/generalFunc/messagePanel.m b/GUI/generalFunc/messagePanel.m index 106feec..a79383c 100644 --- a/GUI/generalFunc/messagePanel.m +++ b/GUI/generalFunc/messagePanel.m @@ -26,7 +26,7 @@ jText = JTextArea; jText.setAlignmentX(0.5); jpan.add(jText); -str = sprintf('Welcome to StatSTEM v3.0, have fun analysing\nWhen using StatSTEM please cite: A. De Backer, K.H.W. van den Bos, et. al., Ultramicroscopy 171 (2016), p.104-116'); +str = sprintf('Welcome to StatSTEM v3.1, have fun analysing\nWhen using StatSTEM please cite: A. De Backer, K.H.W. van den Bos, et. al., Ultramicroscopy 171 (2016), p.104-116'); jText.setText(str) jText.setEditable(false) jText.setFocusable(true) diff --git a/StatSTEM.prj b/StatSTEM.prj index b476bbf..c46e78d 100644 --- a/StatSTEM.prj +++ b/StatSTEM.prj @@ -1,138 +1,127 @@ - - - StatSTEM - ${PROJECT_ROOT}\StatSTEM_resources\icon.ico - - ${PROJECT_ROOT}\StatSTEM_resources\icon_48.png - ${PROJECT_ROOT}\StatSTEM_resources\icon_32.png - ${PROJECT_ROOT}\StatSTEM_resources\icon_24.png - ${PROJECT_ROOT}\StatSTEM_resources\icon_16.png - - 3.0 - - Sandra.VanAert@uantwerpen.be - EMAT - Application for extracting structural information from scanning transmission electron microscopy images - Scanning transmission electron microscopy images will be modeled by a superposition of Gaussian peaks describing each individual atomic column. Overlap of intensities from neighbouring columns is taken into account. Structural parameters, like column positions and scattering cross sections, can be stored in a MATLAB file format. From the modelled image, the number of atoms in each atomic column can be determined together with an atomically resolved strain map. - -When using this program please cite: A. De Backer, Ultramicroscopy 171 (2016), p.104-116 - ${PROJECT_ROOT}\GUI\splash.png - - \EMAT\StatSTEM\ - option.installpath.programfiles - - - - ${PROJECT_ROOT}\StatSTEM\for_testing - ${PROJECT_ROOT}\StatSTEM\for_redistribution_files_only - ${PROJECT_ROOT}\StatSTEM\for_redistribution - ${PROJECT_ROOT}\StatSTEM - false - - subtarget.standalone - - true - false - false - StatSTEM3.0 - MyAppInstaller_mcr - MyAppInstaller_app - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - ${PROJECT_ROOT}\StatSTEM.m - - - ${PROJECT_ROOT}\functions - ${PROJECT_ROOT}\GUI - ${PROJECT_ROOT}\StatSTEM.m - - - ${PROJECT_ROOT}\Database - ${PROJECT_ROOT}\Examples - ${PROJECT_ROOT}\LICENSE.txt - - - - C:\Users\Karel\Documents\MATLAB\StatSTEMv3.0\StatSTEM\for_testing\splash.png - C:\Users\Karel\Documents\MATLAB\StatSTEMv3.0\StatSTEM\for_testing\readme.txt - C:\Users\Karel\Documents\MATLAB\StatSTEMv3.0\StatSTEM\for_testing\StatSTEM.exe - - - - C:\Program Files\MATLAB\R2017a - - - - - - - - - - true - - - - - true - - - - - true - - - - - true - - - - - true - - - - - false - false - true - false - false - false - false - false - 6.1 - false - true - win64 - true - - + + + StatSTEM + ${PROJECT_ROOT}\StatSTEM_resources\icon.ico + + ${PROJECT_ROOT}\StatSTEM_resources\icon_48.png + ${PROJECT_ROOT}\StatSTEM_resources\icon_32.png + ${PROJECT_ROOT}\StatSTEM_resources\icon_24.png + ${PROJECT_ROOT}\StatSTEM_resources\icon_16.png + + 3.1 + + Sandra.VanAert@uantwerpen.be + EMAT + Application for extracting structural information from scanning transmission electron microscopy images + Scanning transmission electron microscopy images will be modeled by a superposition of Gaussian peaks describing each individual atomic column. Overlap of intensities from neighbouring columns is taken into account. Structural parameters, like column positions and scattering cross sections, can be stored in a MATLAB file format. From the modelled image, the number of atoms in each atomic column can be determined together with an atomically resolved strain map. + +When using this program please cite: A. De Backer, Ultramicroscopy 171 (2016), p.104-116 + ${PROJECT_ROOT}\GUI\splash.png + + \EMAT\StatSTEM\ + option.installpath.programfiles + + + + ${PROJECT_ROOT}\StatSTEM\for_testing + ${PROJECT_ROOT}\StatSTEM\for_redistribution_files_only + ${PROJECT_ROOT}\StatSTEM\for_redistribution + ${PROJECT_ROOT}\StatSTEM + false + + subtarget.standalone + + true + false + false + StatSTEM3.1 + MyAppInstaller_mcr + MyAppInstaller_app + true + false + + false + false + + Syntax + -? + + Input Arguments + -? print help on how to use the application + input arguments + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${PROJECT_ROOT}\StatSTEM.m + + + ${PROJECT_ROOT}\functions + ${PROJECT_ROOT}\GUI + ${PROJECT_ROOT}\StatSTEM.m + + + ${PROJECT_ROOT}\Database + ${PROJECT_ROOT}\Examples + ${PROJECT_ROOT}\LICENSE.txt + + + + C:\Users\thoma\Desktop\StatSTEM\StatSTEM\for_testing\splash.png + C:\Users\thoma\Desktop\StatSTEM\StatSTEM\for_testing\StatSTEM.exe + C:\Users\thoma\Desktop\StatSTEM\StatSTEM\for_testing\readme.txt + + + + C:\Program Files\MATLAB\R2019b + + + + + + true + + + + + false + false + true + false + false + false + false + false + 10.0 + false + true + win64 + true + + \ No newline at end of file diff --git a/StatSTEM_manual.pdf b/StatSTEM3.1_manual.pdf similarity index 100% rename from StatSTEM_manual.pdf rename to StatSTEM3.1_manual.pdf