Changeset 7245

Timestamp:

01/31/11 08:47:57 (14 years ago)

Author:

Eric.Larour

Message:

Not embedded inside applyoptions.m anymore

Location:

issm/trunk/src/m/utils/Basins

Files:

• basinzoom.m (modified) (4 diffs)
• showbasins.m (modified) (2 diffs)

issm/trunk/src/m/utils/Basins/basinzoom.m

@@ -1 @@
-function varargout=basinzoom(varargin)
+function varargout=basinzoom(options)
 %ANTZOOM - zoom on a basin in Antarctica or Greenland.
 %
@@ -6 +6 @@
 %
 %   Usage:
-%      varargout=basinzoom(region,unitmultiplier)
-
-%initialize options
-options=pairoptions(varargin{:});
+%      varargout=basinzoom(options)
 
 %recover some options, and set defaults
+
 unitmultiplier=getfieldvalue(options,'unit',NaN);
 basin=getfieldvalue(options,'basin');
-hemisphere=getfieldvalue(options,'hemisphere',+1);
-basindeltax=getfieldvalue(options,'basindeltax',300000); %100 km default
-basindeltay=getfieldvalue(options,'basindeltay',300000);
 
-if hemisphere==+1,
-        central_meridian=getfieldvalue(options,'central_meridian',45);
-        standard_parallel=getfieldvalue(options,'standard_parallel',70);
+if exist(options,'basindelta'),
+
+        basindeltax=getfieldvalue(options,'basindelta',300000); 
+        basindeltay=getfieldvalue(options,'basindelta',300000); 
 else
-        central_meridian=getfieldvalue(options,'central_meridian',0);
-        standard_parallel=getfieldvalue(options,'standard_parallel',71);
+        basindeltax=getfieldvalue(options,'basindeltax',300000); %100 km default
+        basindeltay=getfieldvalue(options,'basindeltay',300000);
 end
 
@@ -36 +32 @@
                 long=names{i,2};
                 lat=names{i,3};
+                hemisphere=names{i,4};
                 found=1;
                 break;
@@ -43 +40 @@
 if ~found,
         error(['basinzoom error message: cannot find basin ' basin '. Use isbasin to determine a basin name.']);
+end
+
+if hemisphere==+1,
+        central_meridian=getfieldvalue(options,'central_meridian',45);
+        standard_parallel=getfieldvalue(options,'standard_parallel',70);
+else
+        central_meridian=getfieldvalue(options,'central_meridian',0);
+        standard_parallel=getfieldvalue(options,'standard_parallel',71);
 end
 

issm/trunk/src/m/utils/Basins/showbasins.m

@@ -11 +11 @@
 %
 
-%initialize options
-options=pairoptions(varargin{:});
+%is varargin an options database already?
+if nargin==0,
+        options=pairoptions(varargin{:});
+elseif (isa(varargin{1},'plotoptions') | isa(varargin{1},'pairoptions')),
+        %do nothing to the varargin: 
+        options=varargin{1};
+else
+        %process varargin for options: 
+        options=pairoptions(varargin{:});
+end
+
 
 %recover some options, and set defaults
 unitmultiplier=getfieldvalue(options,'unit',1);
-hemisphere=getfieldvalue(options,'hemisphere',+1);
 fontsize=getfieldvalue(options,'fontsize',12);
+hemisphere=getfieldvalue(options,'hemisphere');
+
+if strcmpi(hemisphere,'s'),
+        hemisphere=-1;
+elseif strcmpi(hemisphere,'n'),
+        hemisphere=+1;
+else
+        error('showbasins error message: hemispehre should be either ''n'' or ''s''');
+        end
 
 if hemisphere==+1,
@@ -26 +43 @@
         standard_parallel=getfieldvalue(options,'standard_parallel',71);
 end
-
 
 %Ok, find basin we are talking about: