Skip to content

Commit a4e1af2

Browse files
author
Thomas Friedrich
authored
Merge pull request #21 from ThFriedrich/master
Bugfix Interactive Colorbar
2 parents 268ba35 + 92e5399 commit a4e1af2

File tree

4 files changed

+129
-140
lines changed

4 files changed

+129
-140
lines changed

‎GUI/createImages/shiftCBar_BarInFig.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ function changepointer(hf,~)
7777
elseif y_new<=1.1
7878
x = (y_int:((s+1-y_int)/(s+1)):(s+1))';
7979
else
80-
ym = min((y_int)/(y_new)*ceil(y_new),64);
81-
x = [linspace(1,(y_int)/(y_new)*floor(y_new),floor(y_new)) linspace(ym,64,65-ceil(y_new))]';
80+
ym = min((y_int)/(y_new)*ceil(y_new),s);
81+
x = [linspace(1,(y_int)/(y_new)*floor(y_new),floor(y_new)) linspace(ym,s,(s+1)-ceil(y_new))]';
8282
end
8383
cmap_new = [interp1(ind,cmap(:,1),x) interp1(ind,cmap(:,2),x) interp1(ind,cmap(:,3),x)];
8484
colormap(ha,cmap_new)

‎GUI/generalFunc/messagePanel.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
jText = JTextArea;
2727
jText.setAlignmentX(0.5);
2828
jpan.add(jText);
29-
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');
29+
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');
3030
jText.setText(str)
3131
jText.setEditable(false)
3232
jText.setFocusable(true)

‎StatSTEM.prj‎

Lines changed: 126 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -1,138 +1,127 @@
1-
<deployment-project plugin="plugin.ezdeploy" plugin-version="1.0">
2-
<configuration build-checksum="3180951167" file="C:\Users\Karel\Documents\MATLAB\StatSTEMv3.0\StatSTEM.prj" location="C:\Users\Karel\Documents\MATLAB\StatSTEMv3.0" name="StatSTEM" preferred-package-location="C:\Users\Karel\Documents\MATLAB\StatSTEMv3.0\StatSTEM\for_redistribution" preferred-package-type="package.type.exe" target="target.ezdeploy.standalone" target-name="Application Compiler">
3-
<param.appname>StatSTEM</param.appname>
4-
<param.icon>${PROJECT_ROOT}\StatSTEM_resources\icon.ico</param.icon>
5-
<param.icons>
6-
<file>${PROJECT_ROOT}\StatSTEM_resources\icon_48.png</file>
7-
<file>${PROJECT_ROOT}\StatSTEM_resources\icon_32.png</file>
8-
<file>${PROJECT_ROOT}\StatSTEM_resources\icon_24.png</file>
9-
<file>${PROJECT_ROOT}\StatSTEM_resources\icon_16.png</file>
10-
</param.icons>
11-
<param.version>3.0</param.version>
12-
<param.authnamewatermark />
13-
<param.email>Sandra.VanAert@uantwerpen.be</param.email>
14-
<param.company>EMAT</param.company>
15-
<param.summary>Application for extracting structural information from scanning transmission electron microscopy images</param.summary>
16-
<param.description>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.
17-
18-
When using this program please cite: A. De Backer, Ultramicroscopy 171 (2016), p.104-116</param.description>
19-
<param.screenshot>${PROJECT_ROOT}\GUI\splash.png</param.screenshot>
20-
<param.guid />
21-
<param.installpath.string>\EMAT\StatSTEM\</param.installpath.string>
22-
<param.installpath.combo>option.installpath.programfiles</param.installpath.combo>
23-
<param.logo />
24-
<param.install.notes />
25-
<param.target.install.notes />
26-
<param.intermediate>${PROJECT_ROOT}\StatSTEM\for_testing</param.intermediate>
27-
<param.files.only>${PROJECT_ROOT}\StatSTEM\for_redistribution_files_only</param.files.only>
28-
<param.output>${PROJECT_ROOT}\StatSTEM\for_redistribution</param.output>
29-
<param.logdir>${PROJECT_ROOT}\StatSTEM</param.logdir>
30-
<param.enable.clean.build>false</param.enable.clean.build>
31-
<param.user.defined.mcr.options />
32-
<param.target.type>subtarget.standalone</param.target.type>
33-
<param.support.packages />
34-
<param.web.mcr>true</param.web.mcr>
35-
<param.package.mcr>false</param.package.mcr>
36-
<param.no.mcr>false</param.no.mcr>
37-
<param.web.mcr.name>StatSTEM3.0</param.web.mcr.name>
38-
<param.package.mcr.name>MyAppInstaller_mcr</param.package.mcr.name>
39-
<param.no.mcr.name>MyAppInstaller_app</param.no.mcr.name>
40-
<param.windows.command.prompt>true</param.windows.command.prompt>
41-
<param.create.log>false</param.create.log>
42-
<param.log.file />
43-
<unset>
44-
<param.authnamewatermark />
45-
<param.guid />
46-
<param.installpath.string />
47-
<param.installpath.combo />
48-
<param.logo />
49-
<param.target.install.notes />
50-
<param.intermediate />
51-
<param.files.only />
52-
<param.output />
53-
<param.logdir />
54-
<param.enable.clean.build />
55-
<param.user.defined.mcr.options />
56-
<param.target.type />
57-
<param.support.packages />
58-
<param.web.mcr />
59-
<param.package.mcr />
60-
<param.no.mcr />
61-
<param.package.mcr.name />
62-
<param.no.mcr.name />
63-
<param.windows.command.prompt />
64-
<param.create.log />
65-
<param.log.file />
66-
</unset>
67-
<fileset.main>
68-
<file>${PROJECT_ROOT}\StatSTEM.m</file>
69-
</fileset.main>
70-
<fileset.resources>
71-
<file>${PROJECT_ROOT}\functions</file>
72-
<file>${PROJECT_ROOT}\GUI</file>
73-
<file>${PROJECT_ROOT}\StatSTEM.m</file>
74-
</fileset.resources>
75-
<fileset.package>
76-
<file>${PROJECT_ROOT}\Database</file>
77-
<file>${PROJECT_ROOT}\Examples</file>
78-
<file>${PROJECT_ROOT}\LICENSE.txt</file>
79-
</fileset.package>
80-
<fileset.depfun />
81-
<build-deliverables>
82-
<file location="${PROJECT_ROOT}\StatSTEM\for_testing" name="splash.png" optional="false">C:\Users\Karel\Documents\MATLAB\StatSTEMv3.0\StatSTEM\for_testing\splash.png</file>
83-
<file location="${PROJECT_ROOT}\StatSTEM\for_testing" name="readme.txt" optional="true">C:\Users\Karel\Documents\MATLAB\StatSTEMv3.0\StatSTEM\for_testing\readme.txt</file>
84-
<file location="${PROJECT_ROOT}\StatSTEM\for_testing" name="StatSTEM.exe" optional="false">C:\Users\Karel\Documents\MATLAB\StatSTEMv3.0\StatSTEM\for_testing\StatSTEM.exe</file>
85-
</build-deliverables>
86-
<workflow />
87-
<matlab>
88-
<root>C:\Program Files\MATLAB\R2017a</root>
89-
<toolboxes>
90-
<toolbox name="fixedpoint" />
91-
<toolbox name="matlabcoder" />
92-
<toolbox name="matlabhdlcoder" />
93-
<toolbox name="embeddedcoder" />
94-
<toolbox name="polyspacebugfinder" />
95-
</toolboxes>
96-
<toolbox>
97-
<fixedpoint>
98-
<enabled>true</enabled>
99-
</fixedpoint>
100-
</toolbox>
101-
<toolbox>
102-
<matlabcoder>
103-
<enabled>true</enabled>
104-
</matlabcoder>
105-
</toolbox>
106-
<toolbox>
107-
<matlabhdlcoder>
108-
<enabled>true</enabled>
109-
</matlabhdlcoder>
110-
</toolbox>
111-
<toolbox>
112-
<embeddedcoder>
113-
<enabled>true</enabled>
114-
</embeddedcoder>
115-
</toolbox>
116-
<toolbox>
117-
<polyspacebugfinder>
118-
<enabled>true</enabled>
119-
</polyspacebugfinder>
120-
</toolbox>
121-
</matlab>
122-
<platform>
123-
<unix>false</unix>
124-
<mac>false</mac>
125-
<windows>true</windows>
126-
<win2k>false</win2k>
127-
<winxp>false</winxp>
128-
<vista>false</vista>
129-
<linux>false</linux>
130-
<solaris>false</solaris>
131-
<osver>6.1</osver>
132-
<os32>false</os32>
133-
<os64>true</os64>
134-
<arch>win64</arch>
135-
<matlab>true</matlab>
136-
</platform>
137-
</configuration>
1+
<deployment-project plugin="plugin.ezdeploy" plugin-version="1.0">
2+
<configuration build-checksum="3180951167" file="C:\Users\thoma\Desktop\StatSTEM\StatSTEM.prj" location="C:\Users\thoma\Desktop\StatSTEM" name="StatSTEM" preferred-package-location="C:\Users\Karel\Documents\MATLAB\StatSTEMv3.0\StatSTEM\for_redistribution" preferred-package-type="package.type.exe" target="target.ezdeploy.standalone" target-name="Application Compiler">
3+
<param.appname>StatSTEM</param.appname>
4+
<param.icon>${PROJECT_ROOT}\StatSTEM_resources\icon.ico</param.icon>
5+
<param.icons>
6+
<file>${PROJECT_ROOT}\StatSTEM_resources\icon_48.png</file>
7+
<file>${PROJECT_ROOT}\StatSTEM_resources\icon_32.png</file>
8+
<file>${PROJECT_ROOT}\StatSTEM_resources\icon_24.png</file>
9+
<file>${PROJECT_ROOT}\StatSTEM_resources\icon_16.png</file>
10+
</param.icons>
11+
<param.version>3.1</param.version>
12+
<param.authnamewatermark />
13+
<param.email>Sandra.VanAert@uantwerpen.be</param.email>
14+
<param.company>EMAT</param.company>
15+
<param.summary>Application for extracting structural information from scanning transmission electron microscopy images</param.summary>
16+
<param.description>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.
17+
18+
When using this program please cite: A. De Backer, Ultramicroscopy 171 (2016), p.104-116</param.description>
19+
<param.screenshot>${PROJECT_ROOT}\GUI\splash.png</param.screenshot>
20+
<param.guid />
21+
<param.installpath.string>\EMAT\StatSTEM\</param.installpath.string>
22+
<param.installpath.combo>option.installpath.programfiles</param.installpath.combo>
23+
<param.logo />
24+
<param.install.notes />
25+
<param.target.install.notes />
26+
<param.intermediate>${PROJECT_ROOT}\StatSTEM\for_testing</param.intermediate>
27+
<param.files.only>${PROJECT_ROOT}\StatSTEM\for_redistribution_files_only</param.files.only>
28+
<param.output>${PROJECT_ROOT}\StatSTEM\for_redistribution</param.output>
29+
<param.logdir>${PROJECT_ROOT}\StatSTEM</param.logdir>
30+
<param.enable.clean.build>false</param.enable.clean.build>
31+
<param.user.defined.mcr.options />
32+
<param.target.type>subtarget.standalone</param.target.type>
33+
<param.support.packages />
34+
<param.web.mcr>true</param.web.mcr>
35+
<param.package.mcr>false</param.package.mcr>
36+
<param.no.mcr>false</param.no.mcr>
37+
<param.web.mcr.name>StatSTEM3.1</param.web.mcr.name>
38+
<param.package.mcr.name>MyAppInstaller_mcr</param.package.mcr.name>
39+
<param.no.mcr.name>MyAppInstaller_app</param.no.mcr.name>
40+
<param.windows.command.prompt>true</param.windows.command.prompt>
41+
<param.create.log>false</param.create.log>
42+
<param.log.file />
43+
<param.native.matlab>false</param.native.matlab>
44+
<param.checkbox>false</param.checkbox>
45+
<param.example />
46+
<param.help.text>Syntax
47+
-?
48+
49+
Input Arguments
50+
-? print help on how to use the application
51+
input arguments</param.help.text>
52+
<unset>
53+
<param.authnamewatermark />
54+
<param.guid />
55+
<param.installpath.string />
56+
<param.installpath.combo />
57+
<param.logo />
58+
<param.install.notes />
59+
<param.target.install.notes />
60+
<param.intermediate />
61+
<param.files.only />
62+
<param.output />
63+
<param.logdir />
64+
<param.enable.clean.build />
65+
<param.user.defined.mcr.options />
66+
<param.target.type />
67+
<param.support.packages />
68+
<param.web.mcr />
69+
<param.package.mcr />
70+
<param.no.mcr />
71+
<param.package.mcr.name />
72+
<param.no.mcr.name />
73+
<param.windows.command.prompt />
74+
<param.create.log />
75+
<param.log.file />
76+
<param.native.matlab />
77+
<param.checkbox />
78+
<param.example />
79+
</unset>
80+
<fileset.main>
81+
<file>${PROJECT_ROOT}\StatSTEM.m</file>
82+
</fileset.main>
83+
<fileset.resources>
84+
<file>${PROJECT_ROOT}\functions</file>
85+
<file>${PROJECT_ROOT}\GUI</file>
86+
<file>${PROJECT_ROOT}\StatSTEM.m</file>
87+
</fileset.resources>
88+
<fileset.package>
89+
<file>${PROJECT_ROOT}\Database</file>
90+
<file>${PROJECT_ROOT}\Examples</file>
91+
<file>${PROJECT_ROOT}\LICENSE.txt</file>
92+
</fileset.package>
93+
<fileset.depfun />
94+
<build-deliverables>
95+
<file location="${PROJECT_ROOT}\StatSTEM\for_testing" name="splash.png" optional="false">C:\Users\thoma\Desktop\StatSTEM\StatSTEM\for_testing\splash.png</file>
96+
<file location="${PROJECT_ROOT}\StatSTEM\for_testing" name="StatSTEM.exe" optional="false">C:\Users\thoma\Desktop\StatSTEM\StatSTEM\for_testing\StatSTEM.exe</file>
97+
<file location="${PROJECT_ROOT}\StatSTEM\for_testing" name="readme.txt" optional="true">C:\Users\thoma\Desktop\StatSTEM\StatSTEM\for_testing\readme.txt</file>
98+
</build-deliverables>
99+
<workflow />
100+
<matlab>
101+
<root>C:\Program Files\MATLAB\R2019b</root>
102+
<toolboxes>
103+
<toolbox name="matlabcoder" />
104+
</toolboxes>
105+
<toolbox>
106+
<matlabcoder>
107+
<enabled>true</enabled>
108+
</matlabcoder>
109+
</toolbox>
110+
</matlab>
111+
<platform>
112+
<unix>false</unix>
113+
<mac>false</mac>
114+
<windows>true</windows>
115+
<win2k>false</win2k>
116+
<winxp>false</winxp>
117+
<vista>false</vista>
118+
<linux>false</linux>
119+
<solaris>false</solaris>
120+
<osver>10.0</osver>
121+
<os32>false</os32>
122+
<os64>true</os64>
123+
<arch>win64</arch>
124+
<matlab>true</matlab>
125+
</platform>
126+
</configuration>
138127
</deployment-project>

StatSTEM_manual.pdf renamed to StatSTEM3.1_manual.pdf

File renamed without changes.

0 commit comments

Comments
 (0)