Merge pull request #71 from OSU-LRAM/Review-Branch--Code-for-plotting-DA-for-systems-with-three-shape-variables

Fixed plotting bugs

Author: rlhatton

ProgramFiles/sys_draw_fcns/CCF_draw.m

@@ -52,15 +52,15 @@
 			H = cat(1,s.(['DA' CCF_addendum])...
 				,s.(['DA_optimized' CCF_addendum]));
 
-			if n_dim == 2
+            if n_dim == 2
 
 				h1name = 'DA';
 				h2name = 'DA_optimized';
 
 				h1 = cell(n_g,1);
 				h2 = cell(n_g,1);
 
-				if ~strcmp(shch,'null')
+                if ~strcmp(shch,'null')
 
 					for i = 1:numel(p.phi_locus)
 
@@ -75,8 +75,9 @@
 					end
 
 					zdata = cat(1,h1,h2);
-				end
-				
+                end
+                
+                
             end
 
 		case 'dA'
@@ -195,7 +196,7 @@
 % 					H{function_number}(singularity_location) = NaN;
 % 					
 % 				end
-				if n_dim==2
+                if n_dim==2
 				%Plot the constraint curvature function
                     meshhandle = surf(ax,grid{:},H{function_number});
                 end
@@ -264,14 +265,14 @@
                         end
                     end
 
-                    meshhandle=pcolor(xgrid,ygrid,-curvatureproj);
+                    meshhandle=pcolor(xgrid,ygrid,-curvatureproj,'Parent',ax);
                     meshhandle.ZData=zgrid;
 
                     hold on
 
                     colormap(Colorset.colormap); 
-                    shading interp
-                    view(3)
+                    shading(ax,'interp')
+                    view(ax,3)
 
 
                 end
@@ -284,7 +285,7 @@
                     end
                     if n_dim==3
                         meshhandle.FaceAlpha=0.9;
-                        plot3(p.phi_locus_full{i}.shape(:,1),p.phi_locus_full{i}.shape(:,2),p.phi_locus_full{i}.shape(:,3),'b','LineWidth',6);
+                        line('XData',p.phi_locus_full{i}.shape(:,1),'YData',p.phi_locus_full{i}.shape(:,2),'ZData',p.phi_locus_full{i}.shape(:,3),'Color',Colorset.spot,'LineWidth',6,'parent',ax);
                     end
 				end
 
@@ -377,8 +378,8 @@
                     end
 
 
-                   meshhandle=contourslice(grid{2,1},grid{1,1},grid{3,1},curvatureproj,xgrid,ygrid,zgrid);
-                    view(3)
+                   meshhandle=contourslice(grid{2,1},grid{1,1},grid{3,1},curvatureproj,xgrid,ygrid,zgrid,'parent',ax);
+                    view(ax,3)
 
 
                 end
@@ -390,8 +391,7 @@
 					overlay_shape_change_2d(ax,p,plot_info.stretch,s.convert);
                     end
                     if n_dim==3
-                        hold on
-                        plot3(p.phi_locus_full{i}.shape(:,1),p.phi_locus_full{i}.shape(:,2),p.phi_locus_full{i}.shape(:,3),'r','LineWidth',6);
+                        line('XData',p.phi_locus_full{i}.shape(:,1),'YData',p.phi_locus_full{i}.shape(:,2),'ZData',p.phi_locus_full{i}.shape(:,3),'Color',Colorset.spot,'LineWidth',6,'parent',ax);
                     end
 
 				end

ProgramFiles/sys_draw_fcns/vfield_draw.m

@@ -1,5 +1,10 @@
 function plot_info = vfield_draw(s,p,plot_info,sys,shch,resolution)
 
+    %Get the configuration file, and extract the Colorpath
+	configfile = 'sysplotter_config';
+    configfile = fullfile(fileparts(mfilename('fullpath')),'..',configfile);
+	load(configfile,'Colorset');
+
     %Vector field list
     vfield_list = {'X','Y','T','Xopt','Yopt','Topt'};
 
@@ -263,8 +268,7 @@
                 overlay_shape_change_2d(ax,p,plot_info.stretch,s.convert);
             end            
             if n_dim==3
-               hold on
-               plot3(p.phi_locus_full{i}.shape(:,1),p.phi_locus_full{i}.shape(:,2),p.phi_locus_full{i}.shape(:,3),'r','LineWidth',6);
+                line('XData',p.phi_locus_full{i}.shape(:,1),'YData',p.phi_locus_full{i}.shape(:,2),'ZData',p.phi_locus_full{i}.shape(:,3),'Color',Colorset.spot,'LineWidth',6,'parent',ax);
             end
 
         end

UserFiles/GenericUser/Systems/sysf_four_link_lowRe.m

@@ -70,7 +70,7 @@
 			s.grid_range = [-1,1,-1,1,-1,1]*2;
 
 			%densities for various operations
-			s.density.vector = [21 21 21]; %density to display vector field
+			s.density.vector = [10 10 10]; %density to display vector field
 			s.density.scalar = [21 21 21]; %density to display scalar functions
 			s.density.eval = [21 21 21];   %density for function evaluations
             s.density.metric_eval = [11 11 11]; %density for metric evaluation