Skip to content
Snippets Groups Projects
Commit b2b3de10 authored by jacques.grelet_ird.fr's avatar jacques.grelet_ird.fr
Browse files

move quitProgram as nested function in tsgqc 

resolve problem with icons path under R2016b compiler
need to tested with R2012b compiler
remove debug info in readTsgIniLabview.m
parent 4dfe1f68
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
compiler/Windows (x64)/R2016b/tsgqc.prj
+ 81
− 6
View file @ b2b3de10
<deployment-project plugin="plugin.ezdeploy" plugin-version="1.0">
<configuration build-checksum="3362879886" file="C:\svn\tsg-qc\trunk\compiler\Windows (x64)\R2016b\tsgqc.prj" location="C:\svn\tsg-qc\trunk\compiler\Windows (x64)\R2016b" name="tsgqc" preferred-package-location="C:\svn\tsg-qc\trunk\compiler\Windows (x64)\R2016b\tsgqc\for_redistribution" preferred-package-type="package.type.exe" target="target.ezdeploy.standalone" target-name="Application Compiler">
<configuration build-checksum="1123329992" file="C:\svn\tsg-qc\trunk\compiler\Windows (x64)\R2016b\tsgqc.prj" location="C:\svn\tsg-qc\trunk\compiler\Windows (x64)\R2016b" name="tsgqc" preferred-package-location="C:\svn\tsg-qc\trunk\compiler\Windows (x64)\R2016b\tsgqc\for_redistribution" preferred-package-type="package.type.exe" target="target.ezdeploy.standalone" target-name="Application Compiler">
<param.appname>tsgqc</param.appname>
<param.icon />
<param.icons />
<param.version>1.45</param.version>
<param.version>1.46</param.version>
<param.authnamewatermark>Jacques Grelet</param.authnamewatermark>
<param.email>Jacques.Grelet@ird.fr</param.email>
<param.company>IRD</param.company>
......@@ -31,7 +31,7 @@
<param.web.mcr.name>MyAppInstaller_web</param.web.mcr.name>
<param.package.mcr.name>MyAppInstaller_mcr</param.package.mcr.name>
<param.no.mcr.name>MyAppInstaller_app</param.no.mcr.name>
<param.windows.command.prompt>true</param.windows.command.prompt>
<param.windows.command.prompt>false</param.windows.command.prompt>
<param.create.log>false</param.create.log>
<param.log.file />
<unset>
......@@ -57,16 +57,91 @@
<param.web.mcr.name />
<param.package.mcr.name />
<param.no.mcr.name />
<param.windows.command.prompt />
<param.create.log />
<param.log.file />
</unset>
<fileset.main>
<file>C:\svn\tsg-qc\trunk\tsgqc.m</file>
</fileset.main>
<fileset.resources />
<fileset.resources>
<file>C:\svn\oceano\lib\matlab\isas13_annual_surf.nc</file>
<file>C:\svn\oceano\lib\matlab\isas13_monthly_surf.nc</file>
<file>C:\svn\oceano\lib\matlab\isas13_seasonal_surf.nc</file>
<file>C:\svn\oceano\lib\matlab\woa01_annual_surf.nc</file>
<file>C:\svn\oceano\lib\matlab\woa01_monthly_surf.nc</file>
<file>C:\svn\oceano\lib\matlab\woa01_seasonal_surf.nc</file>
<file>C:\svn\oceano\lib\matlab\woa05_annual_surf.nc</file>
<file>C:\svn\oceano\lib\matlab\woa05_monthly_surf.nc</file>
<file>C:\svn\oceano\lib\matlab\woa05_seasonal_surf.nc</file>
<file>C:\svn\tsg-qc\trunk\@dynaload</file>
<file>C:\svn\tsg-qc\trunk\@hashtable</file>
<file>C:\svn\tsg-qc\trunk\@kml</file>
<file>C:\svn\tsg-qc\trunk\@kmlAnimation</file>
<file>C:\svn\tsg-qc\trunk\@netcdf_native</file>
<file>C:\svn\tsg-qc\trunk\@node</file>
<file>C:\svn\tsg-qc\trunk\@stack</file>
<file>C:\svn\tsg-qc\trunk\@tsg_nc</file>
<file>C:\svn\tsg-qc\trunk\tsg_data</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\bottleicon.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\climicon.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\delbottleicon.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\Google-Earth-icon.gif</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\hdricon.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\interp.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\mapicon.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\outils.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\pan.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\printdoc.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\qcicon.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\reporticon.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\savedoc.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\selecttime.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\Thermo.jpg</file>
<file>C:\svn\tsg-qc\trunk\tsg_icon\zoom.mat</file>
<file>C:\svn\tsg-qc\trunk\tsg_io</file>
<file>C:\svn\tsg-qc\trunk\tsg_util</file>
<file>C:\Users\jgrelet\Matlab\toolbox\m_map</file>
</fileset.resources>
<fileset.package />
<fileset.depfun />
<fileset.depfun>
<file>${MATLAB_ROOT}\toolbox\matlab\demos\topo.mat</file>
<file>C:\svn\oceano\lib\matlab\dd2dm.m</file>
<file>C:\svn\oceano\lib\matlab\medianf.m</file>
<file>C:\svn\oceano\lib\matlab\tbase.m</file>
<file>C:\svn\oceano\lib\matlab\to_date.m</file>
<file>C:\svn\oceano\lib\matlab\to_day.m</file>
<file>C:\svn\oceano\lib\matlab\to_sec.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\camera.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\captureScreen.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\colorbar.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\contour.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\contour3.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\contourf.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\createFolder.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\kml.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\model.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\modelTour.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\newAnimation.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\newFolder.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\overlay.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\parseIconURL.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\plot.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\plot3.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\point.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\poly.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\poly3.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\polyMap.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\quadoverlay.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\quiver.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\quiver3d.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\scatter.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\scatter3.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\screenoverlay.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\surf.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\text.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kml\transfer.m</file>
<file>C:\Users\jgrelet\Matlab\toolbox\kml_toolbox\@kmlAnimation\kmlAnimation.m</file>
</fileset.depfun>
<build-deliverables>
<file location="${PROJECT_ROOT}\tsgqc\for_testing" name="tsgqc.exe" optional="false">C:\svn\tsg-qc\trunk\compiler\Windows (x64)\R2016b\tsgqc\for_testing\tsgqc.exe</file>
<file location="${PROJECT_ROOT}\tsgqc\for_testing" name="splash.png" optional="false">C:\svn\tsg-qc\trunk\compiler\Windows (x64)\R2016b\tsgqc\for_testing\splash.png</file>
......
tsg_io/readTsgIniLabview.m
+ 3
− 3
View file @ b2b3de10
......@@ -79,7 +79,7 @@ while ~feof(fid)
% for debbuging only
% ------------------
fprintf('%s -> %s\n', clef, tsg.(clef));
%fprintf('%s -> %s\n', clef, tsg.(clef));
continue
end
......@@ -154,7 +154,7 @@ while ~feof(fid)
% for debbuging only
% ------------------
fprintf('%s => %s\n', clef, tsg.(clef));
%fprintf('%s => %s\n', clef, tsg.(clef));
case 2
......@@ -166,7 +166,7 @@ while ~feof(fid)
% for debbuging only
% ------------------
fprintf('%s => %f\n', clef, tsg.(clef));
%fprintf('%s => %f\n', clef, tsg.(clef));
end
......
tsg_util/quitProgram.m deleted 100644 → 0
+ 0
− 42
View file @ 4dfe1f68
function quitProgram(DEFAULT_PATH_FILE, varargin)
% QUITPROGRAM Exit tsgqc_GUI application
%
% Input
% -----
% hTsgGUI ............ Handel to the main user interface
%
% Output
% ------
% none
%
% $Id$
% close all windows
% -----------------
for i=1:size(varargin,2)
delete(varargin{i});
end
% reset userdata property of root Matalab object (0) for next use
% ---------------------------------------------------------------
set(0, 'userdata', []);
% reset Matlab search path to default
% addpath isn't mandatory and failed with compiled applications
% --------------------------------------------------------------
if (~isdeployed)
rmpath( [DEFAULT_PATH_FILE filesep 'tsg_util'] );
rmpath( [DEFAULT_PATH_FILE filesep 'tsg_data'] );
rmpath( [DEFAULT_PATH_FILE filesep 'tsg_io'] );
end
% Refresh file system caches
% --------------------------
rehash;
% clear base workspace just before quit, this is the only method
% to clear NetCDF variables assign to base workspace with assignin
% ----------------------------------------------------------------
evalin('base','clear all');
end
tsg_util/tsg_preferences.m
+ 6
− 3
View file @ b2b3de10
function tsg_preferences(hTsgGUI, app_name, DEFAULT_PATH_FILE)
function ok = tsg_preferences(hTsgGUI, app_name, DEFAULT_PATH_FILE)
% tsg_preferences(S1,S2) returns structure tsg saved in S1.mat file
% and with S2 internal version number.
% If S1.mat dosn't exist, call tsg_initialisation to create it in
......@@ -11,7 +11,7 @@ function tsg_preferences(hTsgGUI, app_name, DEFAULT_PATH_FILE)
%
% Output
% ------
% none
% boolean
%
% $Id$
......@@ -73,7 +73,8 @@ switch fid
% quit program
% ------------
quitProgram(DEFAULT_PATH_FILE, hTsgGUI);
ok = false;
return
end
......@@ -119,6 +120,8 @@ close(wb)
% ---------------------
set(hTsgGUI,'Pointer','arrow');
ok = true;
return
% ----------------------------------------------------------------------
% nested function new_config
......
tsgqc.m
+ 588
− 547
View file @ b2b3de10
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment