[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Pkg-octave-devel] Bug#661430: marked as done (bugfix:octave-epstk: invisible axis ruins plot line)



Your message dated Wed, 14 Mar 2012 21:21:54 +0000
with message-id <E1S7vdq-0008CP-HO@franck.debian.org>
and subject line Bug#660750: fixed in octave-epstk 2.3-3
has caused the Debian Bug report #660750,
regarding bugfix:octave-epstk: invisible axis ruins plot line
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
660750: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660750
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: octave-epstk
Version: 2.3-2
Severity: normal

There was a clipping bug in eplot.m.

The bugfix is in the attachment.


%%NAME
%%  eplot  - make linear plot
%%
%%SYNOPSIS
%%  eplot ([xData,[yData,[legendText,[dash,[color[,width]]]]]])
%%
%%PARAMETER(S)
%%  xData          vector of x-data  
%%                 or matrix(2xn) of x0,x1-data to plot lines 
%%  yData          vector of y-data
%%                 or matrix(2xn) of y0,y1-data to plot lines
%%  legendText     text of legend, if empty  string then no legend
%%  dash          if a scalar and
%%                  dash=0  solid plot line,
%%                  dash>0  dash length
%%                  dash<0  fill plot line with color
%%                default: dash=eLineDash
%%                if a vector with size 1xn, then dash describes
%%                  a dash combination [space lineLength1 lineLength2 ...]
%%                if a string then dash is a name of symbol
%%                if a matrix and color=-1
%%                  dash is the image of plot 
%%                  and filled with RGB values
%%                  (value=R*2^16+G*2^8+B and R,G,B are integer of 0:255)
%%                if a matrix and color is a colormap
%%                  dash is the image of plot 
%%                  and filled with indices of colormap
%%                if a string dash is filename of a JPEG-file
%%  color         if dash>=0 vector of plot color ([r g b])
%%                if dash<0  vector of background color
%%                if dash a matrix then colormap of image or -1
%%                default: dash=eLineColor
%%  width         width of plot line
%% 
%% Important: eplot without parameters closes the current plot explicit.
%%            it's useful for several plot on one page 
%%
%%GLOBAL PARAMETER(S)
%%  ePlotAreaPos
%%  ePlotAreaWidth
%%  ePlotAreaHeight
%%  eXAxisSouthScale
%%  eYAxisWestScale
%%  ePlotAreaXValueStart
%%  ePlotAreaXValueEnd
%%  ePlotAreaYValueStart
%%  ePlotAreaYValueEnd
%%  ePlotLineInterpolation
%%  ePlotLineWidth
%%  ePlotLineColor; 
%%  ePlotLineDash; 
%%  ePlotLegendPos;
%%  ePlotLegendTextFont
%%  ePlotLegendTextColor
%%  ePlotLegendFontSize
%%  ePlotLegendDistance
%%  eAxesColor
% written by stefan.mueller@fhr.fraunhofer.de (C) 2010

function eplot(xData,yData,legendText,dash,color,width)
  if nargin>6
    eusage('eplot([xData,[yData,[legendText,[dash,[color[,width]]]]]])');
  end
  eglobpar;
  if (nargin==0)
    %finish plotting
    
    % write title
    etitle;

    %value range
    if eXAxisSouthScale(1)~=eXAxisSouthScale(3)
      %fix scale
      ePlotAreaXValueStart=eXAxisSouthScale(1);
      ePlotAreaXValueEnd=eXAxisSouthScale(3);
    else
      if eXAxisSouthScaleType==2
        if (ePlotAreaXValueStart>0)&(ePlotAreaXValueEnd>0)
          ePlotAreaXValueStart=log10(ePlotAreaXValueStart);
          ePlotAreaXValueEnd=log10(ePlotAreaXValueEnd);
        else 
          error('xValues<=0 for log scale');
        end
      end
    end
    if eYAxisWestScale(1)~=eYAxisWestScale(3)
      %fix scale 
      ePlotAreaYValueStart=eYAxisWestScale(1);
      ePlotAreaYValueEnd=eYAxisWestScale(3);
    else
      if eYAxisWestScaleType==2
        if (ePlotAreaYValueStart>0)&(ePlotAreaYValueEnd>0)
          ePlotAreaYValueStart=log10(ePlotAreaYValueStart);
          ePlotAreaYValueEnd=log10(ePlotAreaYValueEnd);
        else 
          error('yValues<=0 for log scale');
        end
      end
    end
    if (eXAxisSouthScale(1)==eXAxisSouthScale(3))&eAxesCrossOrigin
      xRange=ePlotAreaXValueEnd-ePlotAreaXValueStart;
      ePlotAreaXValueStart=ePlotAreaXValueStart-0.05*xRange; 
      ePlotAreaXValueEnd=ePlotAreaXValueEnd+0.05*xRange; 
    end
    if eYAxisWestScale(1)==eYAxisWestScale(3)
      yRange=ePlotAreaYValueEnd-ePlotAreaYValueStart;
      ePlotAreaYValueStart=ePlotAreaYValueStart-0.05*yRange; 
      ePlotAreaYValueEnd=ePlotAreaYValueEnd+0.05*yRange; 
    end
    egrid;
      
    % plot line and write legend
    if ePlotAreaXValueEnd==ePlotAreaXValueStart
      ePlotAreaXValueStart=ePlotAreaXValueStart-1;
      ePlotAreaXValueEnd=ePlotAreaXValueEnd+1
    end
    if ePlotAreaYValueEnd==ePlotAreaYValueStart
      ePlotAreaYValueStart=ePlotAreaYValueStart-1;
      ePlotAreaYValueEnd=ePlotAreaYValueEnd+1
    end
    ePlotAreaXFac=ePlotAreaWidth*eFac/...
      (ePlotAreaXValueEnd-ePlotAreaXValueStart);
    ePlotAreaYFac=ePlotAreaHeight*eFac/...
      (ePlotAreaYValueEnd-ePlotAreaYValueStart);
    legendPos=ePlotLegendPos;
    for i=1:ePlotLineNo
      parameter=sprintf('global ePlotLineWidth%d;',i);
      eval(parameter);
      parameter=sprintf('width=ePlotLineWidth%d;',i);
      eval(parameter);
      parameter=sprintf('global ePlotLineColor%d;',i);
      eval(parameter);
      parameter=sprintf('color=ePlotLineColor%d;',i);
      eval(parameter);
      parameter=sprintf('global ePlotLineDash%d;',i);
      eval(parameter);
      parameter=sprintf('dash=ePlotLineDash%d;',i);
      eval(parameter);
      parameter=sprintf('global ePlotLegendText%d;',i);
      eval(parameter);
      parameter=sprintf('legendText=ePlotLegendText%d;',i);
      eval(parameter);
      parameter=sprintf('global ePlotXData%d;',i);
      eval(parameter);
      parameter=sprintf('xData=ePlotXData%d;',i);
      eval(parameter);
      parameter=sprintf('global ePlotYData%d;',i);
      eval(parameter);
      parameter=sprintf('yData=ePlotYData%d;',i);
      eval(parameter);
      if eXAxisSouthScaleType==2
        xData=log10(xData);
      end
      xData=(xData-ePlotAreaXValueStart)*ePlotAreaXFac;
      [xr xc]=size(xData);
      if eYAxisWestScaleType==2
        yData=log10(yData);
      end
      yData=(yData-ePlotAreaYValueStart)*ePlotAreaYFac;
      [yr yc]=size(yData);

      eclip(eFile,...
            (ePlotAreaPos(1)-0.5*eAxesLineWidth)*eFac,...
            (ePlotAreaPos(2)-0.5*eAxesLineWidth)*eFac,...
            (ePlotAreaWidth+eAxesLineWidth)*eFac,...
            (ePlotAreaHeight+eAxesLineWidth)*eFac);   
      if ischar(dash)
        n=size(xData,2);
        exyplots(eFile,...
          ePlotAreaPos(1)*eFac,...
          ePlotAreaPos(2)*eFac,...
          xData(1,:),...
          yData(1,:),...
          ones(1,n),...
          ones(1,n),...
          zeros(1,n),...
          dash,...
          color);
      elseif (size(dash,1)>1) && (size(dash,2)>1) 
        exyploti(eFile,...
          ePlotAreaPos(1)*eFac,...
          ePlotAreaPos(2)*eFac,...
          xData(1,:),...
          yData(1,:),...
          dash,...
          color);
      elseif (dash<0)
        exyplotf(eFile,...
          ePlotAreaPos(1)*eFac,...
          ePlotAreaPos(2)*eFac,...
          xData(1,:),...
          yData(1,:),...
          color,...
	  ePlotLineInterpolation)
      elseif xr==1
        exyplot(eFile,...
          ePlotAreaPos(1)*eFac,...
          ePlotAreaPos(2)*eFac,...
          xData(1,:),...
          yData(1,:),...
          color,...
          dash*eFac,...
          width*eFac,...
	  ePlotLineInterpolation);
      else
        xData=reshape(xData,1,2*xc); 
        yData=reshape(yData,1,2*yc); 
        exyline(eFile,...
          ePlotAreaPos(1)*eFac,...
          ePlotAreaPos(2)*eFac,...
          xData,...
          yData,...
          color,...
          dash*eFac,...
          width*eFac);
      end
      eclip(eFile,0,0,0,0);
      if strcmp(legendText,'')~=1
        eplotlg(eFile,...
          (ePlotAreaPos(1)+legendPos(1))*eFac,...
          (ePlotAreaPos(2)+legendPos(2))*eFac,...
          color,... 
          dash,...
          width*eFac,...
          legendText,...
          eFonts(ePlotLegendTextFont,:),...
          ePlotLegendFontSize*eFac,ePlotLegendTextColor);
        legendPos(2)=legendPos(2)-ePlotLegendDistance/70*ePlotLegendFontSize;
      end
    end
    eaxes;
    ePlotLineNo=0;
  else    
    % add plot line
    ePlotLineNo=ePlotLineNo+1;
    %width
    if (nargin<6) 
      width=ePlotLineWidth;
    end
    parameter=sprintf('global ePlotLineWidth%d;',ePlotLineNo);
    eval(parameter);
    parameter=sprintf('ePlotLineWidth%d=width;',ePlotLineNo);
    eval(parameter);
    %color
    if (nargin<5)
      color=ePlotLineColor; 
    end
    parameter=sprintf('global ePlotLineColor%d;',ePlotLineNo);
    eval(parameter);
    parameter=sprintf('ePlotLineColor%d=color;',ePlotLineNo);
    eval(parameter);
    
    %dash
    if (nargin<4)
      dash=ePlotLineDash; 
    end
    parameter=sprintf('global ePlotLineDash%d;',ePlotLineNo);
    eval(parameter);
    parameter=sprintf('ePlotLineDash%d=dash;',ePlotLineNo);
    eval(parameter);
  
    % legend text
    if (nargin<3)
      legendText='';
    end
    parameter=sprintf('global ePlotLegendText%d;',ePlotLineNo);
    eval(parameter);
    parameter=sprintf('ePlotLegendText%d=legendText;',ePlotLineNo);
    eval(parameter);

    [xr xc]=size(xData);
    if xr>2
      xData=xData';
    end
    if (nargin<2)
      yData=xData;
      xData=1:size(yData,2);
      if xr==2
        xData=[xData;xData];
      end
    else
      [yr yc]=size(yData);
      if yr>2
       yData=yData';
      end
    end
    % data
    parameter=sprintf('global ePlotXData%d;',ePlotLineNo);
    eval(parameter);
    parameter=sprintf('ePlotXData%d=xData;',ePlotLineNo);
    eval(parameter);
    parameter=sprintf('global ePlotYData%d;',ePlotLineNo);
    eval(parameter);
    parameter=sprintf('ePlotYData%d=yData;',ePlotLineNo);
    eval(parameter);
  
    %value range
    xMin=min(min(xData));
    xMax=max(max(xData));
    if xMin<ePlotAreaXValueStart | ePlotLineNo==1
      ePlotAreaXValueStart=xMin;
    end
    if xMax>ePlotAreaXValueEnd | ePlotLineNo==1
      ePlotAreaXValueEnd=xMax;
    end
    yMin=min(min(yData));
    yMax=max(max(yData));
    if yMin<ePlotAreaYValueStart | ePlotLineNo==1
      ePlotAreaYValueStart=yMin;
    end
    if yMax>ePlotAreaYValueEnd | ePlotLineNo==1
      ePlotAreaYValueEnd=yMax;
    end
  end

--- End Message ---
--- Begin Message ---
Source: octave-epstk
Source-Version: 2.3-3

We believe that the bug you reported is fixed in the latest version of
octave-epstk, which is due to be installed in the Debian FTP archive:

octave-epstk_2.3-3.debian.tar.gz
  to main/o/octave-epstk/octave-epstk_2.3-3.debian.tar.gz
octave-epstk_2.3-3.dsc
  to main/o/octave-epstk/octave-epstk_2.3-3.dsc
octave-epstk_2.3-3_all.deb
  to main/o/octave-epstk/octave-epstk_2.3-3_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 660750@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Thomas Weber <tweber@debian.org> (supplier of updated octave-epstk package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Wed, 14 Mar 2012 21:26:05 +0100
Source: octave-epstk
Binary: octave-epstk
Architecture: source all
Version: 2.3-3
Distribution: unstable
Urgency: low
Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
Changed-By: Thomas Weber <tweber@debian.org>
Description: 
 octave-epstk - GNU Octave encapsulated postscript toolkit
Closes: 660750
Changes: 
 octave-epstk (2.3-3) unstable; urgency=low
 .
   * Bump to debhelper compat level 9
   * Bump to Standards-Version 3.9.3, no changes needed
   * Build-depend on octave-pkg-dev >= 1.0.0, to build against Octave 3.6
   * Add Sébastien Villemot to the list of Uploaders
   * debian/copyright: update to machine-readable format 1.0
   * New patch: fix_invisible_axis (closes: #660750)
Checksums-Sha1: 
 7f77c16f1d25b8617a205383ba817577d1ca02a7 1427 octave-epstk_2.3-3.dsc
 5ecb18478ac0273d0aa745d2387008cf09421a10 11819 octave-epstk_2.3-3.debian.tar.gz
 ae96b20d8e2d380b72f4fcef9995c8a28f1f238c 1173658 octave-epstk_2.3-3_all.deb
Checksums-Sha256: 
 2d112c86d6ad52796f4f86d91f82aabe29f5dd40105c0537595e7f20b738be1d 1427 octave-epstk_2.3-3.dsc
 358cdc9503d378a853f1d64de6831591fcf50736f432900f2932e096b6743925 11819 octave-epstk_2.3-3.debian.tar.gz
 dc9b461915cc1767730e7a54ce9af18eb6c3c9a1e66b6ddb3ef21b1d81cbc9ea 1173658 octave-epstk_2.3-3_all.deb
Files: 
 83be084b08c81ab012fe45ddf493146f 1427 math optional octave-epstk_2.3-3.dsc
 8d97bcf8d5ba3a1a28550b2736340f58 11819 math optional octave-epstk_2.3-3.debian.tar.gz
 ecb12f15c436fb374f76bb4e81ca54bf 1173658 math optional octave-epstk_2.3-3_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iEYEARECAAYFAk9hB6UACgkQPqD4a3lPnXzP7QCfSs6OJVmw4enfV+et1pC/8aSs
A5gAmwW3Lze1NA7z+Zll+H2q/2/3RyDb
=IxPR
-----END PGP SIGNATURE-----



--- End Message ---

Reply to: