Merge pull request TopoToolbox#139 from dirkscherler/main

Update to DIVIDEobj etc

Author: wschwanghart

toolbox/@DIVIDEobj/DIVIDEobj.m

@@ -24,14 +24,16 @@
 % Examples
 %
 %     DEM = GRIDobj('srtm_bigtujunga30m_utm11.tif');
-%     FD  = FLOWobj(DEM,'preprocess','c');
+%     FD  = FLOWobj(DEM);
 %     S = STREAMobj(FD,flowacc(FD)>1000);
 %     D = DIVIDEobj(FD,S);
 %     subplot(1,2,1)
 %     plot(D)
+%     axis image
 %     D2 = cleanedges(D,FD);
 %     subplot(1,2,2)
 %     plot(D2)
+%     axis image
 %  
 % See also: DIVIDEobj, DIVIDEobj/divnet
 %

toolbox/@DIVIDEobj/cleanedges.m

@@ -28,7 +28,7 @@
 % Examples
 %     
 %     DEM = GRIDobj('srtm_bigtujunga30m_utm11.tif');
-%     FD = FLOWobj(DEM,'preprocess','carve');
+%     FD = FLOWobj(DEM);
 %     FA = flowacc(FD);
 %     ST = STREAMobj(FD,FA>500);
 %     D = DIVIDEobj(FD,ST);

toolbox/@DIVIDEobj/dist2node.m

@@ -32,7 +32,7 @@
 % Example
 %
 %     DEM = GRIDobj('srtm_bigtujunga30m_utm11.tif');
-%     FD  = FLOWobj(DEM,'preprocess','c');
+%     FD  = FLOWobj(DEM);
 %     ST = STREAMobj(FD,flowacc(FD)>1000);
 %     D = DIVIDEobj(FD,ST);
 %     D = divorder(D,'topo');

toolbox/@DIVIDEobj/jctangle.m

@@ -47,7 +47,7 @@
 % Example
 %
 %     DEM = GRIDobj('srtm_bigtujunga30m_utm11.tif');
-%     FD  = FLOWobj(DEM,'preprocess','c');
+%     FD  = FLOWobj(DEM);
 %     ST = STREAMobj(FD,flowacc(FD)>1000);
 % 
 %     figure
@@ -116,6 +116,13 @@
 % Parse
 parse(p,varargin{:});
 
+if ischar(p.Results.colormap)
+    cmap = validatecolor(p.Results.colormap);
+else
+    cmap = p.Results.colormap;
+end
+
+
 % default values
 if isempty(p.Results.style) 
     if not(isempty(D.order))
@@ -168,9 +175,9 @@
     mindo = min(uqdo);
     a = (siz(2)-siz(1))/(maxdo-mindo);
     b = siz(1)-a*mindo;
-
+    
     % Colormap
-    rgb = num2rgb(uqdo,p.Results.colormap,[mindo maxdo]);
+    rgb = num2rgb(uqdo,cmap,[mindo maxdo]);
 end
 
 [x,y] = ind2coord(D,D.IX(ix));

toolbox/@DIVIDEobj/plot.m

@@ -25,7 +25,7 @@
 % Example
 %     
 %     DEM = GRIDobj('srtm_bigtujunga30m_utm11.tif');
-%     FD  = FLOWobj(DEM,'preprocess','c');
+%     FD  = FLOWobj(DEM);
 %     ST = STREAMobj(FD,flowacc(FD)>1000);
 %     D = DIVIDEobj(FD,ST);
 %     D = divorder(D,'topo');

toolbox/@DIVIDEobj/removeshortdivides.m

@@ -34,15 +34,15 @@
 % Example
 %
 %     DEM = GRIDobj('srtm_bigtujunga30m_utm11.tif');
-%     FD  = FLOWobj(DEM,'preprocess','c');
+%     FD  = FLOWobj(DEM);
 %     ST = STREAMobj(FD,flowacc(FD)>1000);
 %     D = DIVIDEobj(FD,ST);
 %     D2 = shrink(D,FD,1000);
 %     subplot(2,1,1)
-%     plot(D,'color','k')
+%     plot(D)
 %     axis image
 %     subplot(2,1,2)
-%     plot(D2,'color','r')
+%     plot(D2)
 %     axis image
 %
 % See also: DIVIDEobj, DIVIDEobj/plot

toolbox/@DIVIDEobj/shrink.m

@@ -75,7 +75,7 @@
 [X,Y] = getcoordinates(DEM,'matrix');
 qz = F(X(:),Y(:));
 
-
-OUT = GRIDobj(DEM,resize(qz,DEM.size));
+OUT = GRIDobj(DEM,'double');
+OUT.Z(:) = qz(:);
 OUT.Z(OUT.Z>maxdist | OUT.Z<mindist) = nan;
 

toolbox/@GRIDobj/dist2curve.m

@@ -195,7 +195,7 @@
 
 if options.mingradient~=0
     b = zeros(n,1);
-    b(S.ix) = -p.Results.mingradient;
+    b(S.ix) = -options.mingradient;
 else
     b = sparse(n,1);
 end