Changeset 18292

Timestamp:

07/27/14 18:14:12 (11 years ago)

Author:

Eric.Larour

Message:

CHG: new rgb plots + new webgl oriented rendering of plotmodel.

Location:

issm/branches/trunk-jpl-ad2/src/m/plot

Files:

• applyoptions.m (modified) (2 diffs)
• plot_gl.m (added)
• plot_manager.m (modified) (1 diff)
• plot_unit.m (modified) (1 diff)
• plotmodel.m (modified) (1 diff)
• prepare_gl.m (added)
• processdata.m (modified) (1 diff)
• rgbcolorbar.m (added)
• writejsfield.m (added)

issm/branches/trunk-jpl-ad2/src/m/plot/applyoptions.m

@@ -139 +139 @@
 %colorbar
 if getfieldvalue(options,'colorbar',1)==1,
+        if getfieldvalue(options,'rgb',0),
+                %this is an rgb plot, very different type of colorbar!
+                rgbcolorbar(options);
+                colorbar off
+                return;
+        end
         if exist(options,'colorbarcornerposition'),
                 c=colorbar(getfieldvalue(options,'colorbarcornerposition'),'peer',gca);
@@ -240 +246 @@
 else
         %do nothing
-
 end
 

issm/branches/trunk-jpl-ad2/src/m/plot/plot_manager.m

@@ -159 +159 @@
 end
 
+%Are we rendering on a browser? 
+if exist(options,'webgl'),
+        plot_gl(md,data,options);
+        return;
+end
+
 %Figure out if this is a semi-transparent plot.
 if exist(options,'googlemaps'),

issm/branches/trunk-jpl-ad2/src/m/plot/plot_unit.m

@@ -54 +54 @@
                         patch( 'Faces',[C A D],'Vertices', [x y z],'FaceVertexCData',data(:),'FaceColor','interp','EdgeColor',edgecolor);
                 else
+                        %do we have several columns to data, in which case we are dealing with an rgb plot?
                         A=elements(:,1); B=elements(:,2); C=elements(:,3); 
-                        patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
+                        if size(data,2)==3,
+                                patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', data,'FaceColor','interp','EdgeColor',edgecolor);
+                        else
+                                patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', data(:),'FaceColor','interp','EdgeColor',edgecolor);
+                        end
                 end
 

issm/branches/trunk-jpl-ad2/src/m/plot/plotmodel.m

@@ -34 +34 @@
 
         %Create figure 
-        f=figure(figurenumber);clf;
-        if strcmpi(getfieldvalue(options.list{1},'visible','on'),'off'),
-                set(f,'Visible','Off');
+        if ~exist(options.list{1},'webgl'),
+                f=figure(figurenumber);clf;
+                if strcmpi(getfieldvalue(options.list{1},'visible','on'),'off'),
+                        set(f,'Visible','Off');
+                end
+        else
+                plot_gl(md,options.list);
+                return;
         end
 

issm/branches/trunk-jpl-ad2/src/m/plot/processdata.m

@@ -62 +62 @@
 %quiver?
 if datasize(2)>1,
-        datatype=3;
+        
+        %rgb plot or quiver plot? 
+        if getfieldvalue(options,'rgb',0),
+                datatype=2;
+                return;
+        else
+                datatype=3;
+        end
 
         %check number of columns, add zeros if necessary,