/////////////////////////////////////////////////////////////////////////////
-// Name: mod_image.cpp
+// Name: m_image.cpp
// Purpose: wxHtml module for displaying images
// Author: Vaclav Slavik
// RCS-ID: $Id$
#include <math.h>
#include <float.h>
-FORCE_LINK_ME(mod_image)
+FORCE_LINK_ME(m_image)
protected:
CoordArray coords;
celltype type;
- int radius;
+ int radius;
public:
- wxHtmlImageMapAreaCell( celltype t, wxString &coords );
- virtual wxString GetLink( int x = 0, int y = 0 ) const;
+ wxHtmlImageMapAreaCell( celltype t, wxString &coords, double pixel_scale = 1.0);
+ virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
};
-wxHtmlImageMapAreaCell::wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::celltype t, wxString &incoords )
+wxHtmlImageMapAreaCell::wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::celltype t, wxString &incoords, double pixel_scale )
{
- int i;
+ int i;
wxString x = incoords, y;
type = t;
while ((i = x.Find( ',' )) != -1) {
- coords.Add( wxAtoi( x.Left( i ).c_str() ) );
+ coords.Add( (int)(pixel_scale * (double)wxAtoi( x.Left( i ).c_str())) );
x = x.Mid( i + 1 );
}
- coords.Add( wxAtoi( x.c_str() ) );
+ coords.Add( (int)(pixel_scale * (double)wxAtoi( x.c_str())) );
}
-wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
+wxHtmlLinkInfo *wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
{
switch (type) {
case RECT:
{
- int l, t, r, b;
+ int l, t, r, b;
l = coords[ 0 ];
t = coords[ 1 ];
}
case CIRCLE:
{
- int l, t, r;
- double d;
+ int l, t, r;
+ double d;
l = coords[ 0 ];
t = coords[ 1 ];
case POLY:
{
if (coords.GetCount() >= 6) {
- int intersects = 0;
- int wherex = x;
- int wherey = y;
- int totalv = coords.GetCount() / 2;
- int totalc = totalv * 2;
- int xval = coords[totalc - 2];
- int yval = coords[totalc - 1];
- int end = totalc;
- int pointer = 1;
+ int intersects = 0;
+ int wherex = x;
+ int wherey = y;
+ int totalv = coords.GetCount() / 2;
+ int totalc = totalv * 2;
+ int xval = coords[totalc - 2];
+ int yval = coords[totalc - 1];
+ int end = totalc;
+ int pointer = 1;
if ((yval >= wherey) != (coords[pointer] >= wherey)) {
if ((xval >= wherex) == (coords[0] >= wherex)) {
break;
}
if (m_Next) {
- wxHtmlImageMapAreaCell *a = (wxHtmlImageMapAreaCell*)m_Next;
+ wxHtmlImageMapAreaCell *a = (wxHtmlImageMapAreaCell*)m_Next;
return a->GetLink( x, y );
}
- return wxEmptyString;
+ return NULL;
}
protected:
wxString m_Name;
public:
- virtual wxString GetLink( int x = 0, int y = 0 ) const;
+ virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
virtual const wxHtmlCell *Find( int cond, const void *param ) const;
};
m_Name = name ;
}
-wxString wxHtmlImageMapCell::GetLink( int x, int y ) const
+wxHtmlLinkInfo *wxHtmlImageMapCell::GetLink( int x, int y ) const
{
- wxHtmlImageMapAreaCell *a = (wxHtmlImageMapAreaCell*)m_Next;
+ wxHtmlImageMapAreaCell *a = (wxHtmlImageMapAreaCell*)m_Next;
if (a)
return a->GetLink( x, y );
return wxHtmlCell::GetLink( x, y );
wxHtmlImageMapCell *m_ImageMap;
wxString m_MapName;
- wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, int align = wxHTML_ALIGN_BOTTOM, wxString mapname = wxEmptyString);
+ wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, wxString mapname = wxEmptyString);
~wxHtmlImageCell() {if (m_Image) delete m_Image; }
void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
- virtual wxString GetLink( int x = 0, int y = 0 ) const;
+ virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
};
// wxHtmlImageCell
//--------------------------------------------------------------------------------
-wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxString mapname) : wxHtmlCell()
+wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, double scale, int align, wxString mapname) : wxHtmlCell()
{
wxImage *img;
int ww, hh;
hh = img -> GetHeight();
if (w != -1) m_Width = w; else m_Width = ww;
if (h != -1) m_Height = h; else m_Height = hh;
+
+ m_Width = (int)(scale * (double)m_Width);
+ m_Height = (int)(scale * (double)m_Height);
+
if ((m_Width != ww) || (m_Height != hh)) {
wxImage img2 = img -> Scale(m_Width, m_Height);
m_Image = new wxBitmap(img2.ConvertToBitmap());
void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
{
if (m_Image)
+// dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, (m_Image->GetMask() != (wxMask*) 0));
dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, TRUE);
wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}
-wxString wxHtmlImageCell::GetLink( int x, int y ) const
+wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
{
if (m_MapName.IsEmpty())
return wxHtmlCell::GetLink( x, y );
if (!m_ImageMap) {
- wxHtmlContainerCell *p, *op;
+ wxHtmlContainerCell *p, *op;
op = p = GetParent();
while (p) {
op = p;
TAG_HANDLER_PROC(tag)
{
- if (tag.GetName() == "IMG") {
- if (tag.HasParam("SRC")) {
+ if (tag.GetName() == wxT("IMG")) {
+ if (tag.HasParam(wxT("SRC"))) {
int w = -1, h = -1;
int al;
wxFSFile *str;
- wxString tmp = tag.GetParam("SRC");
+ wxString tmp = tag.GetParam(wxT("SRC"));
wxString mn = wxEmptyString;
str = m_WParser -> GetFS() -> OpenFile(tmp);
if (tag.HasParam(wxT("WIDTH"))) tag.ScanParam(wxT("WIDTH"), wxT("%i"), &w);
if (tag.HasParam(wxT("HEIGHT"))) tag.ScanParam(wxT("HEIGHT"), wxT("%i"), &h);
al = wxHTML_ALIGN_BOTTOM;
- if (tag.HasParam("ALIGN")) {
- wxString alstr = tag.GetParam("ALIGN");
+ if (tag.HasParam(wxT("ALIGN"))) {
+ wxString alstr = tag.GetParam(wxT("ALIGN"));
alstr.MakeUpper(); // for the case alignment was in ".."
- if (alstr == "TEXTTOP") al = wxHTML_ALIGN_TOP;
- else if ((alstr == "CENTER") || (alstr == "ABSCENTER")) al = wxHTML_ALIGN_CENTER;
+ if (alstr == wxT("TEXTTOP")) al = wxHTML_ALIGN_TOP;
+ else if ((alstr == wxT("CENTER")) || (alstr == wxT("ABSCENTER"))) al = wxHTML_ALIGN_CENTER;
}
- if (tag.HasParam("USEMAP")) {
- mn = tag.GetParam( "USEMAP" );
- if (mn[ 0 ] == '#') {
+ if (tag.HasParam(wxT("USEMAP"))) {
+ mn = tag.GetParam( wxT("USEMAP") );
+ if (mn[ (unsigned int) 0 ] == wxT('#')) {
mn = mn.Mid( 1 );
}
}
wxHtmlImageCell *cel = NULL;
if (str) {
- cel = new wxHtmlImageCell(str, w, h, al, mn);
+ cel = new wxHtmlImageCell(str, w, h, m_WParser -> GetPixelScale(), al, mn);
cel -> SetLink(m_WParser -> GetLink());
m_WParser -> GetContainer() -> InsertCell(cel);
delete str;
}
}
}
- if (tag.GetName() == "MAP") {
+ if (tag.GetName() == wxT("MAP")) {
m_WParser->CloseContainer();
m_WParser->OpenContainer();
- if (tag.HasParam("NAME")) {
- wxString tmp = tag.GetParam("NAME");
+ if (tag.HasParam(wxT("NAME"))) {
+ wxString tmp = tag.GetParam(wxT("NAME"));
wxHtmlImageMapCell *cel = new wxHtmlImageMapCell( tmp );
m_WParser->GetContainer()->InsertCell( cel );
}
m_WParser->CloseContainer();
m_WParser->OpenContainer();
}
- if (tag.GetName() == "AREA") {
- if (tag.HasParam("SHAPE")) {
- wxString tmp = tag.GetParam("SHAPE");
- wxString coords;
+ if (tag.GetName() == wxT("AREA")) {
+ if (tag.HasParam(wxT("SHAPE"))) {
+ wxString tmp = tag.GetParam(wxT("SHAPE"));
+ wxString coords = wxEmptyString;
tmp.MakeUpper();
wxHtmlImageMapAreaCell *cel = NULL;
- if (tag.HasParam("COORDS")) {
- coords = tag.GetParam("COORDS");
+ if (tag.HasParam(wxT("COORDS"))) {
+ coords = tag.GetParam(wxT("COORDS"));
}
- if (tmp == "POLY") {
- cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::POLY, coords );
- } else if (tmp == "CIRCLE") {
- cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords );
- } else if (tmp == "RECT") {
- cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords );
+ if (tmp == wxT("POLY")) {
+ cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::POLY, coords, m_WParser -> GetPixelScale() );
+ } else if (tmp == wxT("CIRCLE")) {
+ cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords, m_WParser -> GetPixelScale() );
+ } else if (tmp == wxT("RECT")) {
+ cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords, m_WParser -> GetPixelScale() );
}
- if (cel != NULL && tag.HasParam("HREF")) {
- wxString tmp = tag.GetParam("HREF");
- cel->SetLink( tmp );
+ if (cel != NULL && tag.HasParam(wxT("HREF"))) {
+ wxString tmp = tag.GetParam(wxT("HREF"));
+ wxString target = wxEmptyString;
+ if (tag.HasParam(wxT("TARGET"))) target = tag.GetParam(wxT("TARGET"));
+ cel->SetLink( wxHtmlLinkInfo(tmp, target));
}
if (cel != NULL) m_WParser->GetContainer()->InsertCell( cel );
}
projects / wxWidgets.git / blobdiff