Changeset 14300

Timestamp:

02/01/13 10:08:42 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: resize figure before the actual plot so that the axes are properly set up (resizing afterwards never works, so we used to have to call the plot command twice

Location:

issm/trunk-jpl/src/m/plot

Files:

• applyoptions.m (modified) (2 diffs)
• plotmodel.m (modified) (1 diff)

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

@@ -331 +331 @@
 end
 
-%position of figure
-if exist(options,'figposition'),
-
-        figposition=getfieldvalue(options,'figposition');
-        if ischar(figposition),
-                if strcmpi(figposition,'larour'),
-                        set(gcf,'Position',[1604 4 1594 1177]);
-                elseif strcmpi(figposition,'larour2'),
-                        set(gcf,'Position',[756    62   827   504]);
-                elseif strcmpi(figposition,'mathieu'),
-                        set(gcf,'Position',[300 1 1580 1150]);
-                elseif strcmpi(figposition,'fullscreen'),
-                        set(gcf,'Position',get(0,'ScreenSize'));
-                elseif strcmpi(figposition,'halfright'),
-                        screen=get(0,'ScreenSize');
-                        left=screen(1); bott=screen(2); widt=screen(3); heig=screen(4)-25;
-                        set(gcf,'Position',fix([left+widt/2 bott widt/2 heig]));
-                elseif strcmpi(figposition,'halfleft'),
-                        screen=get(0,'ScreenSize');
-                        left=screen(1); bott=screen(2); widt=screen(3); heig=screen(4)-25;
-                        set(gcf,'Position',fix([left bott widt/2 heig]));
-                elseif strcmpi(figposition,'square'),
-                        screen=get(0,'ScreenSize');
-                        left=screen(1); bott=screen(2); widt=min(screen(3)-25,screen(4)-25);
-                        set(gcf,'Position',fix([left+(screen(3)-widt) bott widt widt]));
-                elseif strcmpi(figposition,'portrait'),
-                        %reformat with letter paper size (8.5" x 11")
-                        screen=get(0,'ScreenSize');
-                        left=screen(1); bott=screen(2); widt=screen(3); heig=screen(4)-25;
-                        portrait=fix([left+widt-(heig*8.5/11) bott heig*8.5/11 heig]);
-                        set(gcf,'Position',portrait)
-                elseif strcmpi(figposition,'landscape'),
-                        %reformat with letter paper size (8.5" x 11")
-                        screen=get(0,'ScreenSize');
-                        left=screen(1); bott=screen(2); widt=screen(3); heig=screen(4)-25;
-                        landscape=fix([left+widt-(heig*11/8.5) bott heig*11/8.5 heig]);
-                        set(gcf,'Position',landscape)
-                else
-                        disp('''figposition'' string not supported yet');
-                end
-        else
-                set(gcf,'Position',figposition);
-        end
-
-end
-
 %axes position
 if exist(options,'axesPosition')
@@ -446 +400 @@
 set(gca,'color',getfieldvalue(options,'backgroundcolor','none'));
 
-%figurebackgrounbcolor
-set(gcf,'color',getfieldvalue(options,'figurebackgroundcolor','w'));
-
 %lighting
 if strcmpi(getfieldvalue(options,'light','off'),'on'),

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

@@ -34 +34 @@
 
         %Create figure 
+        f=figure(figurenumber);clf;
         if strcmpi(getfieldvalue(options.list{1},'visible','on'),'off'),
-                F=figure(figurenumber);clf;
-                set(F,'Visible','Off');
-        else
-                figure(figurenumber);clf;
+                set(f,'Visible','Off');
         end
 
-        %Use zbuffer renderer (snoother colors)
-        set(gcf,'Renderer','zbuffer');
+        if exist(options.list{1},'figposition'), % {{{
+                figposition=getfieldvalue(options.list{1},'figposition');
+                if ischar(figposition),
+                        if strcmpi(figposition,'larour'),
+                                set(gcf,'Position',[1604 4 1594 1177]);
+                        elseif strcmpi(figposition,'larour2'),
+                                set(gcf,'Position',[756    62   827   504]);
+                        elseif strcmpi(figposition,'mathieu'),
+                                set(gcf,'Position',[300 1 1580 1150]);
+                        elseif strcmpi(figposition,'fullscreen'),
+                                set(gcf,'Position',get(0,'ScreenSize'));
+                        elseif strcmpi(figposition,'halfright'),
+                                screen=get(0,'ScreenSize');
+                                left=screen(1); bott=screen(2); widt=screen(3); heig=screen(4)-25;
+                                set(gcf,'Position',fix([left+widt/2 bott widt/2 heig]));
+                        elseif strcmpi(figposition,'halfleft'),
+                                screen=get(0,'ScreenSize');
+                                left=screen(1); bott=screen(2); widt=screen(3); heig=screen(4)-25;
+                                set(gcf,'Position',fix([left bott widt/2 heig]));
+                        elseif strcmpi(figposition,'square'),
+                                screen=get(0,'ScreenSize');
+                                left=screen(1); bott=screen(2); widt=min(screen(3)-25,screen(4)-25);
+                                set(gcf,'Position',fix([left+(screen(3)-widt) bott widt widt]));
+                        elseif strcmpi(figposition,'portrait'),
+                                %reformat with letter paper size (8.5" x 11")
+                                screen=get(0,'ScreenSize');
+                                left=screen(1); bott=screen(2); widt=screen(3); heig=screen(4)-25;
+                                portrait=fix([left+widt-(heig*8.5/11) bott heig*8.5/11 heig]);
+                                set(gcf,'Position',portrait)
+                        elseif strcmpi(figposition,'landscape'),
+                                %reformat with letter paper size (8.5" x 11")
+                                screen=get(0,'ScreenSize');
+                                left=screen(1); bott=screen(2); widt=screen(3); heig=screen(4)-25;
+                                landscape=fix([left+widt-(heig*11/8.5) bott heig*11/8.5 heig]);
+                                set(gcf,'Position',landscape)
+                        else
+                                disp('''figposition'' string not supported yet');
+                        end
+                else
+                        set(gcf,'Position',figposition);
+                end
+        end % }}}
+
+        %Use zbuffer renderer (snoother colors) and white background
+        set(f,'Renderer','zbuffer','color',getfieldvalue(options.list{1},'figurebackgroundcolor','w'));
 
         %Go through all data plottable and close window if an error occurs