Skip to content

Commit 95f466e

Browse files
author
Usseglio-Viretta
committed
Release version 1.0
- Import image file is now both *.tif and *.tiff - Microstructure genereation: dx and dz diameter were wrongly labelled (fixed) - Fix bug for RVE case D and E
1 parent 8779cf5 commit 95f466e

19 files changed

+62
-55
lines changed
Binary file not shown.
Binary file not shown.
-63 KB
Binary file not shown.

src/Create_mesh_for_FEM/microstructure_meshing_exported.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287

288288
function [array, outcome] = function_import_microstructure(app)
289289
app.LengthinvoxelEditField.Visible = 'off'; app.LengthinvoxelEditFieldLabel.Visible = 'off';
290-
[FileName,PathName,~] = uigetfile({'*.tif','Tif image (*.tif)'},'Select volume');
290+
[FileName,PathName,~] = uigetfile({'*.tif;*.tiff','Tif image (*.tif, *.tiff)'},'Select volume');
291291
app.Select_Lamp.Color = 'r'; app.ActualizeresetdimensionsButton.Enable = 'off';
292292
app.TabisNOTsetupcorrectlyLabel_2.Text = 'Tab is NOT setup correctly';
293293
if FileName==0
13 Bytes
Binary file not shown.

src/Filtering_and_segmentation/Segmentation_exported.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ function LoadvolumeMenuSelected(app, event)
10701070
str_dialogbox = 'Select a .tif file';
10711071

10721072
% Open dialog box to choose file path
1073-
[FileName,PathName,~] = uigetfile({'*.tif','Tif image (*.tif)'},str_dialogbox);
1073+
[FileName,PathName,~] = uigetfile({'*.tif;*.tiff','Tif image (*.tif, *.tiff)'},str_dialogbox);
10741074
if FileName==0
10751075
% User clicked cancel button or closed the dialog box
10761076
app.VolumeLoadedStatus.Text ='No volume loaded. Please load a volume: Menu/Load volume';

src/Main_menu/Main_menu.mlapp

295 Bytes
Binary file not shown.

src/Main_menu/Main_menu_exported.m

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
properties (Access = public)
55
MATBOXMicrostructureAnalysisToolboxUIFigure matlab.ui.Figure
66
MATBOXNRELMicrostructureAnalysisToolboxLabel matlab.ui.control.Label
7-
Version091March182021Label matlab.ui.control.Label
7+
Version10Matbox2021bMay182021Label matlab.ui.control.Label
88
SelectthemoduleassociatedwithyouractivityLabel matlab.ui.control.Label
99
Label matlab.ui.control.Label
1010
MicrostructuregenerationButton matlab.ui.control.Button
@@ -123,12 +123,12 @@ function createComponents(app)
123123
app.MATBOXNRELMicrostructureAnalysisToolboxLabel.Position = [1 788 439 75];
124124
app.MATBOXNRELMicrostructureAnalysisToolboxLabel.Text = {'MATBOX'; 'NREL Microstructure Analysis Toolbox '};
125125

126-
% Create Version091March182021Label
127-
app.Version091March182021Label = uilabel(app.MATBOXMicrostructureAnalysisToolboxUIFigure);
128-
app.Version091March182021Label.HorizontalAlignment = 'center';
129-
app.Version091March182021Label.FontAngle = 'italic';
130-
app.Version091March182021Label.Position = [1 761 439 22];
131-
app.Version091March182021Label.Text = 'Version: 0.91 - March 18, 2021';
126+
% Create Version10Matbox2021bMay182021Label
127+
app.Version10Matbox2021bMay182021Label = uilabel(app.MATBOXMicrostructureAnalysisToolboxUIFigure);
128+
app.Version10Matbox2021bMay182021Label.HorizontalAlignment = 'center';
129+
app.Version10Matbox2021bMay182021Label.FontAngle = 'italic';
130+
app.Version10Matbox2021bMay182021Label.Position = [1 761 439 22];
131+
app.Version10Matbox2021bMay182021Label.Text = 'Version: 1.0 (Matbox2021b) - May 18, 2021';
132132

133133
% Create SelectthemoduleassociatedwithyouractivityLabel
134134
app.SelectthemoduleassociatedwithyouractivityLabel = uilabel(app.MATBOXMicrostructureAnalysisToolboxUIFigure);
@@ -248,7 +248,7 @@ function createComponents(app)
248248

249249
% Create Generation_DropDown
250250
app.Generation_DropDown = uidropdown(app.MATBOXMicrostructureAnalysisToolboxUIFigure);
251-
app.Generation_DropDown.Items = {'Ellipsoid-based stochastic', 'Additives (stochastic or energetic method)', 'Deterministic geometries'};
251+
app.Generation_DropDown.Items = {'Ellipsoid-based stochastic', 'Additives (stochastic or energetic method)'};
252252
app.Generation_DropDown.Position = [243 632 183 22];
253253
app.Generation_DropDown.Value = 'Ellipsoid-based stochastic';
254254

Binary file not shown.

src/Microstrucrure_and_results_visualisation/microstructure_visualization_exported.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function startupFcn(app)
9696
function Checkseg_Importtif_grey_ButtonPushed(app, event)
9797
% Open dialog box to choose file path
9898
str_dialogbox = 'Select grey-level volume';
99-
[FileName,PathName,~] = uigetfile({'*.tif','Tif image (*.tif)'},str_dialogbox);
99+
[FileName,PathName,~] = uigetfile({'*.tif;*.tiff','Tif image (*.tif, *.tiff)'},str_dialogbox);
100100
if FileName==0
101101
% User clicked cancel button or closed the dialog box
102102
set(app.Checkseg_Greyvolumename,'FontColor','k','Text','No grey-level volume loaded');
@@ -138,7 +138,7 @@ function Checkseg_Importtif_grey_ButtonPushed(app, event)
138138
function Checkseg_Importtif_segmented_ButtonPushed(app, event)
139139
% Open dialog box to choose file path
140140
str_dialogbox = 'Select segmented volume';
141-
[FileName,PathName,~] = uigetfile({'*.tif','Tif image (*.tif)'},str_dialogbox);
141+
[FileName,PathName,~] = uigetfile({'*.tif;*.tiff','Tif image (*.tif, *.tiff)'},str_dialogbox);
142142
if FileName==0
143143
% User clicked cancel button or closed the dialog box
144144
set(app.Checkseg_Segmentedvolumename,'FontColor','k','Text','No segmented volume loaded');

0 commit comments

Comments
 (0)