/////////////////////////////////////////////////////////////////////////////
-// Name: m_image.cpp
+// Name: src/html/m_image.cpp
// Purpose: wxHtml module for displaying images
// Author: Vaclav Slavik
// RCS-ID: $Id$
#include "wx/wxprec.h"
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
+ #include "wx/dynarray.h"
#include "wx/dc.h"
#include "wx/scrolwin.h"
#include "wx/timer.h"
#include "wx/dcmemory.h"
+ #include "wx/log.h"
+ #include "wx/math.h"
+ #include "wx/image.h"
+ #include "wx/wxcrtvararg.h"
#endif
#include "wx/html/forcelnk.h"
#include "wx/html/m_templ.h"
#include "wx/html/htmlwin.h"
-#include "wx/image.h"
#include "wx/gifdecod.h"
-#include "wx/dynarray.h"
-#include "wx/log.h"
#include "wx/artprov.h"
-#include "wx/math.h"
#include <float.h>
wxHtmlRenderingInfo& WXUNUSED(info)) {}
- DECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell)
+ wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell);
};
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
wxHtmlRenderingInfo& WXUNUSED(info)) {}
- DECLARE_NO_COPY_CLASS(wxHtmlImageMapCell)
+ wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapCell);
};
{
public:
wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
- wxFSFile *input, int w = wxDefaultCoord, int h = wxDefaultCoord,
+ wxFSFile *input,
+ int w = wxDefaultCoord, bool wpercent = false,
+ int h = wxDefaultCoord, bool hpresent = false,
double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM,
const wxString& mapname = wxEmptyString);
- ~wxHtmlImageCell();
+ virtual ~wxHtmlImageCell();
void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
wxHtmlRenderingInfo& info);
virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const;
private:
wxBitmap *m_bitmap;
+ int m_align;
int m_bmpW, m_bmpH;
+ bool m_bmpWpercent:1;
+ bool m_bmpHpresent:1;
bool m_showFrame:1;
wxHtmlWindowInterface *m_windowIface;
#if wxUSE_GIF && wxUSE_TIMER
wxGIFDecoder *m_gifDecoder;
wxTimer *m_gifTimer;
int m_physX, m_physY;
+ size_t m_nCurrFrame;
#endif
double m_scale;
wxHtmlImageMapCell *m_imageMap;
wxString m_mapName;
- DECLARE_NO_COPY_CLASS(wxHtmlImageCell)
+ wxDECLARE_NO_COPY_CLASS(wxHtmlImageCell);
};
#if wxUSE_GIF && wxUSE_TIMER
private:
wxHtmlImageCell *m_cell;
- DECLARE_NO_COPY_CLASS(wxGIFTimer)
+ wxDECLARE_NO_COPY_CLASS(wxGIFTimer);
};
#endif
wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
wxFSFile *input,
- int w, int h, double scale, int align,
+ int w, bool wpercent, int h, bool hpresent, double scale, int align,
const wxString& mapname) : wxHtmlCell()
{
m_windowIface = windowIface;
m_scale = scale;
m_showFrame = false;
m_bitmap = NULL;
- m_bmpW = w;
- m_bmpH = h;
+ m_bmpW = w;
+ m_bmpH = h;
+ m_align = align;
+ m_bmpWpercent = wpercent;
+ m_bmpHpresent = hpresent;
m_imageMap = NULL;
m_mapName = mapname;
SetCanLiveOnPagebreak(false);
m_gifDecoder = NULL;
m_gifTimer = NULL;
m_physX = m_physY = wxDefaultCoord;
+ m_nCurrFrame = 0;
#endif
if ( m_bmpW && m_bmpH )
(input->GetLocation().Matches(wxT("*.gif")) ||
input->GetLocation().Matches(wxT("*.GIF"))) )
{
- m_gifDecoder = new wxGIFDecoder(s, true);
- if ( m_gifDecoder->ReadGIF() == wxGIF_OK )
+ m_gifDecoder = new wxGIFDecoder();
+ if ( m_gifDecoder->LoadGIF(*s) == wxGIF_OK )
{
wxImage img;
- if ( m_gifDecoder->ConvertToImage(&img) )
+ if ( m_gifDecoder->ConvertToImage(0, &img) )
SetImage(img);
readImg = false;
if ( m_gifDecoder->IsAnimation() )
{
m_gifTimer = new wxGIFTimer(this);
- m_gifTimer->Start(m_gifDecoder->GetDelay(), true);
+ long delay = m_gifDecoder->GetDelay(0);
+ if ( delay == 0 )
+ delay = 1;
+ m_gifTimer->Start(delay, true);
}
else
{
#endif // wxUSE_GIF && wxUSE_TIMER
{
wxImage image(*s, wxBITMAP_TYPE_ANY);
- if ( image.Ok() )
+ if ( image.IsOk() )
SetImage(image);
}
}
}
//else: ignore the 0-sized images used sometimes on the Web pages
- m_Width = (int)(scale * (double)m_bmpW);
- m_Height = (int)(scale * (double)m_bmpH);
-
- switch (align)
- {
- case wxHTML_ALIGN_TOP :
- m_Descent = m_Height;
- break;
- case wxHTML_ALIGN_CENTER :
- m_Descent = m_Height / 2;
- break;
- case wxHTML_ALIGN_BOTTOM :
- default :
- m_Descent = 0;
- break;
- }
}
void wxHtmlImageCell::SetImage(const wxImage& img)
{
#if !defined(__WXMSW__) || wxUSE_WXDIB
- if ( img.Ok() )
+ if ( img.IsOk() )
{
delete m_bitmap;
ww = img.GetWidth();
hh = img.GetHeight();
- if ( m_bmpW == wxDefaultCoord )
+ if ( m_bmpW == wxDefaultCoord)
m_bmpW = ww;
- if ( m_bmpH == wxDefaultCoord )
+ if ( m_bmpH == wxDefaultCoord)
m_bmpH = hh;
// Only scale the bitmap at the rendering stage,
{
wxImage img;
- m_gifDecoder->GoNextFrame(true);
+ // advance current frame
+ m_nCurrFrame++;
+ if (m_nCurrFrame == m_gifDecoder->GetFrameCount())
+ m_nCurrFrame = 0;
if ( m_physX == wxDefaultCoord )
{
wxRect rect(pos, wxSize(m_Width, m_Height));
if ( win->GetClientRect().Intersects(rect) &&
- m_gifDecoder->ConvertToImage(&img) )
+ m_gifDecoder->ConvertToImage(m_nCurrFrame, &img) )
{
#if !defined(__WXMSW__) || wxUSE_WXDIB
- if ( (int)m_gifDecoder->GetWidth() != m_Width ||
- (int)m_gifDecoder->GetHeight() != m_Height ||
- m_gifDecoder->GetLeft() != 0 || m_gifDecoder->GetTop() != 0 )
+ if ( m_gifDecoder->GetFrameSize(m_nCurrFrame) != wxSize(m_Width, m_Height) ||
+ m_gifDecoder->GetFramePosition(m_nCurrFrame) != wxPoint(0, 0) )
{
wxBitmap bmp(img);
wxMemoryDC dc;
dc.SelectObject(*m_bitmap);
- dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop(),
+ dc.DrawBitmap(bmp, m_gifDecoder->GetFramePosition(m_nCurrFrame),
true /* use mask */);
}
else
win->Refresh(img.HasMask(), &rect);
}
- timer->Start(m_gifDecoder->GetDelay(), true);
+ long delay = m_gifDecoder->GetDelay(m_nCurrFrame);
+ if ( delay == 0 )
+ delay = 1;
+ timer->Start(delay, true);
}
void wxHtmlImageCell::Layout(int w)
{
+ if (m_bmpWpercent)
+ {
+
+ m_Width = w*m_bmpW/100;
+
+ if (!m_bmpHpresent && m_bitmap != NULL)
+ m_Height = m_bitmap->GetHeight()*m_Width/m_bitmap->GetWidth();
+ else
+ m_Height = static_cast<int>(m_scale*m_bmpH);
+ } else
+ {
+ m_Width = static_cast<int>(m_scale*m_bmpW);
+ m_Height = static_cast<int>(m_scale*m_bmpH);
+ }
+
+ switch (m_align)
+ {
+ case wxHTML_ALIGN_TOP :
+ m_Descent = m_Height;
+ break;
+ case wxHTML_ALIGN_CENTER :
+ m_Descent = m_Height / 2;
+ break;
+ case wxHTML_ALIGN_BOTTOM :
+ default :
+ m_Descent = 0;
+ break;
+ }
+
wxHtmlCell::Layout(w);
m_physX = m_physY = wxDefaultCoord;
}
// and height, so we only do the scaling once.
double imageScaleX = 1.0;
double imageScaleY = 1.0;
- if (m_bmpW != m_bitmap->GetWidth())
- imageScaleX = (double) m_bmpW / (double) m_bitmap->GetWidth();
- if (m_bmpH != m_bitmap->GetHeight())
- imageScaleY = (double) m_bmpH / (double) m_bitmap->GetHeight();
+ if (m_Width != m_bitmap->GetWidth())
+ imageScaleX = (double) m_Width / (double) m_bitmap->GetWidth();
+ if (m_Height != m_bitmap->GetHeight())
+ imageScaleY = (double) m_Height / (double) m_bitmap->GetHeight();
double us_x, us_y;
dc.GetUserScale(&us_x, &us_y);
- dc.SetUserScale(us_x * m_scale * imageScaleX, us_y * m_scale * imageScaleY);
+ dc.SetUserScale(us_x * imageScaleX, us_y * imageScaleY);
- dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / (m_scale*imageScaleX)),
- (int) ((y + m_PosY) / (m_scale*imageScaleY)), true);
+ dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / (imageScaleX)),
+ (int) ((y + m_PosY) / (imageScaleY)), true);
dc.SetUserScale(us_x, us_y);
}
}
if (tag.HasParam(wxT("SRC")))
{
int w = wxDefaultCoord, h = wxDefaultCoord;
+ bool wpercent = false;
+ bool hpresent = false;
int al;
wxFSFile *str;
wxString tmp = tag.GetParam(wxT("SRC"));
str = m_WParser->OpenURL(wxHTML_URL_IMAGE, tmp);
if (tag.HasParam(wxT("WIDTH")))
- tag.GetParamAsInt(wxT("WIDTH"), &w);
+ {
+ wxString param = tag.GetParam(wxT("WIDTH"));
+ wxSscanf(param.c_str(), wxT("%i"), &w);
+ if (param.EndsWith(wxT("%"))) {
+ if (w < 0)
+ w = 0;
+ else if (w > 100)
+ w = 100;
+ wpercent = true;
+ }
+
+ }
+
if (tag.HasParam(wxT("HEIGHT")))
+ {
tag.GetParamAsInt(wxT("HEIGHT"), &h);
+ hpresent = true;
+ }
+
al = wxHTML_ALIGN_BOTTOM;
if (tag.HasParam(wxT("ALIGN")))
{
if (tag.HasParam(wxT("USEMAP")))
{
mn = tag.GetParam( wxT("USEMAP") );
- if (mn.GetChar(0) == wxT('#'))
+ if ( !mn.empty() && *mn.begin() == '#' )
{
mn = mn.Mid( 1 );
}
}
wxHtmlImageCell *cel = new wxHtmlImageCell(
m_WParser->GetWindowInterface(),
- str, w, h,
+ str, w, wpercent, h, hpresent,
m_WParser->GetPixelScale(),
al, mn);
m_WParser->ApplyStateToCell(cel);
projects / wxWidgets.git / blobdiff