src/textured_element.cpp src/textured_element.h @@ -153,7 +153,7 @@ void Element::update_stats(void) { if( wantedSize < 1.0 ) wantedSize = 1.0; - radius = CUTOFF * size * 0.5; + radius = CUTOFF * size / 2; if( showInfo > 0 ) { showInfo--; src/element.cpp @@ -36,7 +36,7 @@ /** @author Erlend Simonsen <mr@fudgie.org> */ -class Element{ +class Element { public: Element() {}; @@ -44,11 +44,12 @@ public: virtual ~Element(); - void render(GLWidget *gl); - void renderRelations(GLWidget *gl); + virtual void render(GLWidget *gl); + virtual void renderRelations(GLWidget *gl); void update(GLWidget *gl); void update_stats(void); + bool contains(GLWidget *gl, Element *e); void repulsive_check(GLWidget *gl, Element *e); void attractive_check(GLWidget *gl, Element *e); src/element.h @@ -19,10 +19,8 @@ ***************************************************************************/ #include "glwidget.h" #include "element.h" +#include "textured_element.h" #include <QHash> - -using namespace std; - #include <iostream> #include <stdlib.h> #include <list> @@ -31,6 +29,8 @@ using namespace std; #include <sys/time.h> #include <math.h> +using namespace std; + Elements elements; Nodes nodes; @@ -110,7 +110,7 @@ void GLWidget::initializeGL() // glEnable(GL_LIGHTING); // glEnable(GL_LIGHT0); - glDisable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); glDisable(GL_CULL_FACE); glDisable(GL_DEPTH_TEST); @@ -136,7 +136,6 @@ void GLWidget::initializeGL() glVertex3f(0.0, r, 0.0); glEnd(); glEndList(); - } void GLWidget::paintGL() @@ -409,12 +408,19 @@ void GLWidget::mouseMoveEvent(QMouseEvent *event) // cout << "x: " << x << ", y: " << y << endl; } -void GLWidget::addRelation(Input *h, QString &url, QString &ref, bool external) { +void GLWidget::addRelation(Input *h, QString &url, QString &ref, bool external, QImage *img) { if( elements.contains(h->getDomain() + url) == false ) { QColor color = h->getColor(); - elements[h->getDomain() + url] = new Element(h, url, color); - nodes.push_back( elements[h->getDomain() + url] ); + Element *e; + if( img != NULL ) { + cout << "addRelation image[" << img->width() << "x" << img->height() << "]" << endl; + e = new TexturedElement(this, h, url, color, img); + } else { + e = new Element(h, url, color); + } + elements[h->getDomain() + url] = e; + nodes.push_back( e ); } if( ref != "-" && !ref.isEmpty() ) { src/glwidget.cpp @@ -70,7 +70,7 @@ public: QSize minimumSizeHint() const; QSize sizeHint() const; - void addRelation(Input *h, QString &url, QString &ref, bool external = false); + void addRelation(Input *h, QString &url, QString &ref, bool external = false, QImage *img = NULL); int showLines() { return linesMode; }; bool showForces() const { return forces; }; src/glwidget.h @@ -20,11 +20,15 @@ using namespace std; Digg::Digg(QObject *parent) { - http = new QHttp(this); + http = new QHttp("services.digg.com", 80, this); - connect(http, SIGNAL(done(bool)), - this, SLOT(parse(bool)) ); + connect(http, SIGNAL(requestFinished(int,bool)), + this, SLOT(parse(int,bool)) ); + httpImages = new QHttp("digg.com", 80, this); + + connect(httpImages, SIGNAL(requestFinished(int,bool)), + this, SLOT(getImage(int,bool)) ); maxDate = 0; curDate = 0; @@ -46,7 +50,7 @@ void Digg::fetchDiggs( void ) { header.setValue("Host", "services.digg.com"); header.setValue("User-Agent", "glTrail v0.01 (http://www.fudgie.org/gltrail.html)" ); - http->setHost("services.digg.com"); + // http->setHost("services.digg.com"); cout << "Fetching[" << url.toString().toStdString() << "]" << endl; @@ -64,7 +68,7 @@ void Digg::fetchStory( QString story ) { header.setValue("Host", "services.digg.com"); header.setValue("User-Agent", "glTrail v0.01 (http://www.fudgie.org/gltrail.html)" ); - http->setHost("services.digg.com"); + // http->setHost("services.digg.com"); cout << "Fetching[" << url.toString().toStdString() << "]" << endl; @@ -72,23 +76,49 @@ void Digg::fetchStory( QString story ) { } +void Digg::fetchImage( QString img ) { + QUrl url; + url.setPath(img ); + + QHttpRequestHeader header("GET", url.toString() ); + + header.setValue("Host", "digg.com"); + header.setValue("User-Agent", "glTrail v0.01 (http://www.fudgie.org/gltrail.html)" ); + + // http->setHost("services.digg.com"); + + cout << "Fetching[" << url.toString().toStdString() << "]" << endl; + + httpImages->request(header); +} + + void Digg::run( void ) { fetchDiggs(); forever { - if( duggQueue.size() > 0 ) { + + if( duggQueue.size() > 0 && curDate > 5) { cout << duggQueue.size() << " pending diggs" << endl; Dugg d = duggQueue.first(); - cout << d.date << " <=> " << curDate << endl; + cout << d.date << " <= " << curDate << endl; if( d.date > curDate + 5 ) { curDate = d.date; } while( d.date <= curDate && duggQueue.size() > 0 ) { - gl->addRelation(this, d.story, d.user, true); + + if( d.image.isEmpty() ) { + gl->addRelation(this, d.story, d.user, true); + } else { + if( images[d.image] == NULL ) + cout << "Adding rel with MISSING image[" << d.image.toStdString() << "]" << endl; + + gl->addRelation(this, d.story, d.user, true, images[d.image] ); + } duggQueue.removeFirst(); if( duggQueue.size() > 0 ) { @@ -110,16 +140,32 @@ void Digg::run( void ) { } } - if( curDate > 0 ) { - curDate += 1; - } - + curDate += 1; sleep(1); } } -void Digg::parse( bool error ) { +void Digg::getImage( int id, bool error ) { + if(!error) { + cout << "Got image[" << httpImages->currentRequest().path().toStdString() << "]" << endl; + QByteArray buf = httpImages->readAll(); + if( !images.contains(httpImages->currentRequest().path()) ) { + QImage *img = new QImage(); + img->loadFromData(buf); + images.insert( httpImages->currentRequest().path(), img); + cout << "Added width: " << img->width() << ", height: " << img->height() << endl; + } else { + cout << "Already in cache[" << httpImages->currentRequest().path().toStdString() << "]" << endl; + } + } else { + cout << "Error getting [" << httpImages->currentRequest().path().toStdString() << "]" << endl; + } +} + +void Digg::parse( int id, bool error ) { if( !error ) { + cout << "Got[" << http->currentRequest().path().toStdString() << "]" << endl; + QString result = http->readAll(); // cout << "Got " << result.toStdString() << endl; @@ -160,29 +206,35 @@ void Digg::parse( bool error ) { QString id; QString title; + QString image; QString storyPattern("<story id=\"(\\d+)\" link=\"([^\"]+)\".*diggs=\"(\\d+)\" comments=\"(\\d+)\""); QString titlePattern("<title>(.*)</title>"); - // cout << "pattern[" << storyPattern.toStdString() << "]" << endl; + QString imagePattern("<thumbnail .* src=\"([^\"]+)\""); QRegExp rx(storyPattern); QRegExp rxTitle(titlePattern); + QRegExp rxImage(imagePattern); for( int i = 2; i < lines.size(); i++ ) { if( rx.indexIn(lines[i]) > -1 ) { id = rx.cap(1); } else if( rxTitle.indexIn(lines[i]) > -1 ) { title = rxTitle.cap(1); + } else if( rxImage.indexIn(lines[i]) > -1 ) { + image = rxImage.cap(1); + fetchImage(image); } } - cout << "id[" << id.toStdString() << "], title[" << title.toStdString() << "]" << endl; + cout << "id[" << id.toStdString() << "], title[" << title.toStdString() << "], image[" << image.toStdString() << "]" << endl; if( !id.isEmpty() && !title.isEmpty() ) { stories.insert(id, title); d.story = title; + d.image = image; + duggQueue << d; } - duggQueue << d; } } src/inputs/digg.cpp @@ -7,6 +7,7 @@ #include <QThread> #include <QColor> #include <QHttp> +#include <QImage> #include "../input.h" class GLWidget; @@ -16,6 +17,7 @@ struct Dugg { QString story; QString user; QString status; + QString image; }; class Digg : public QThread, public Input { @@ -30,18 +32,21 @@ class Digg : public QThread, public Input { void fetchDiggs(); void fetchStory(QString story); + void fetchImage(QString image); void startProcessing() {}; void endProcessing() {}; public slots: - void parse(bool); + void parse(int,bool); + void getImage(int,bool); protected: void run(); private: QHttp *http; + QHttp *httpImages; qlonglong maxDate; qlonglong curDate; @@ -49,7 +54,7 @@ class Digg : public QThread, public Input { QList<Dugg> duggQueue; QList<Dugg> storiesQueue; QHash<QString,QString> stories; - + QHash<QString,QImage *> images; }; #endif src/inputs/digg.h @@ -4,6 +4,7 @@ CONFIG += debug SOURCES += main.cpp \ activity.cpp \ element.cpp \ + textured_element.cpp \ window.cpp \ glwidget.cpp \ background_updater.cpp \ @@ -14,6 +15,7 @@ SOURCES += main.cpp \ HEADERS += input.h \ element.h \ + textured_element.h \ activity.h \ relation.h \ window.h \ src/src.pro 39cc0eee427b53a09cf3e1c67aab2a0b3a66a93e 9e9bc275d8c6740dcf34e0fdb0804667afadddeb Erlend Simonsen mr@fudgie.org http://github.com/Fudge/gltrail/commit/9acb397527f0a6f79db92fc4f0f211aaf4b7f22d 9acb397527f0a6f79db92fc4f0f211aaf4b7f22d 2008-03-25T13:46:24-07:00 2008-03-25T13:46:24-07:00 Merge branch 'images' 586cd0277be7b0f1b7d1035e5bb1a43c82c44573 Erlend Simonsen mr@fudgie.org