Search for verstag.h in app subdirs first.

[bertos.git] / drv / lcd_gfx_qt.cpp

diff --git a/drv/lcd_gfx_qt.cpp b/drv/lcd_gfx_qt.cpp
index b8e91cfa59a64bb700cf84974dd95d29346430e4..8f3981e43face603578ff3f1db8e275e6da2d628 100755 (executable)
--- a/drv/lcd_gfx_qt.cpp
+++ b/drv/lcd_gfx_qt.cpp
@@ -14,6 +14,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.7  2006/04/27 05:43:08  bernie
+ *#* Fix naming conventions.
+ *#*
+ *#* Revision 1.6  2006/02/20 02:00:40  bernie
+ *#* Port to Qt 4.1.
+ *#*
+ *#* Revision 1.5  2006/02/15 09:13:16  bernie
+ *#* Switch to BITMAP_FMT_PLANAR_V_LSB.
+ *#*
+ *#* Revision 1.4  2006/02/10 12:33:49  bernie
+ *#* Make emulator display a bit larger.
+ *#*
  *#* Revision 1.3  2006/01/23 23:11:07  bernie
  *#* Use RASTER_SIZE() to compute... err... the raster size.
  *#*
@@ -28,11 +40,19 @@
 #include "lcd_gfx_qt.h"
 #include <emul/emul.h>
 #include <cfg/debug.h>
-
-#include <qpainter.h>
-#include <qimage.h>
-#include <qsizepolicy.h>
-#include <qsize.h>
+#include <gfx/gfx.h> // CONFIG_BITMAP_FMT
+
+#if _QT < 4
+       #include <qpainter.h>
+       #include <qimage.h>
+       #include <qsizepolicy.h>
+       #include <qsize.h>
+#else
+       #include <QtGui/QPainter>
+       #include <QtGui/QImage>
+       #include <QtGui/QSizePolicy>
+       #include <QtCore/QSize>
+#endif
 
 // Display colors
 #define LCD_FG_COLOR 0x0, 0x0, 0x0
@@ -40,7 +60,7 @@
 
 
 EmulLCD::EmulLCD(QWidget *parent, const char *name) :
-       QFrame(parent, name, WRepaintNoErase | WResizeNoErase),
+       QFrame(parent, name, Qt::WRepaintNoErase | Qt::WResizeNoErase),
        fg_color(LCD_FG_COLOR),
        bg_color(LCD_BG_COLOR)
 {
@@ -73,22 +93,45 @@ QSize EmulLCD::sizeHint() const
 }
 
 
-void EmulLCD::drawContents(QPainter *p)
+void EmulLCD::paintEvent(QPaintEvent * /*event*/)
 {
+       QPainter p(this);
        QImage img(raster, WIDTH, HEIGHT, 1, NULL, 0, QImage::BigEndian);
 
-       p->setBackgroundMode(OpaqueMode);
-       p->setPen(fg_color);
-       p->setBackgroundColor(bg_color);
-       p->drawImage(frame_width, frame_width, img);
+       p.setBackgroundMode(Qt::OpaqueMode);
+       p.setPen(fg_color);
+       p.setBackgroundColor(bg_color);
+       p.drawImage(frame_width, frame_width, img);
 }
 
 void EmulLCD::writeRaster(uint8_t *new_raster)
 {
+#if CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_H_MSB
+
+       /* Straight copy */
        memcpy(raster, new_raster, sizeof(raster));
 
-       QPainter p(this);
-       drawContents(&p);
+#elif CONFIG_BITMAP_FMT == BITMAP_FMT_PLANAR_V_LSB
+
+       /* Rotation */
+       for (int y = 0; y < HEIGHT; ++y)
+       {
+               for (int xbyte = 0; xbyte < WIDTH/8; ++xbyte)
+               {
+                       uint8_t v = 0;
+                       for (int xbit = 0; xbit < 8; ++xbit)
+                               v |= (new_raster[(xbyte * 8 + xbit) + (y / 8) * WIDTH] & (1 << (y%8)) )
+                                       ? (1 << (7 - xbit)) : 0;
+
+                       raster[y * ((WIDTH + 7) / 8) + xbyte] = v;
+               }
+       }
+
+#else
+       #error Unsupported bitmap format
+#endif
+
+       repaint();
 }
 
 
@@ -98,6 +141,7 @@ void EmulLCD::writeRaster(uint8_t *new_raster)
 
 /*!
  * Raster buffer to draw into.
+ *
  * Bits in the bitmap bytes have vertical orientation,
  * as required by the LCD driver.
  */
@@ -108,18 +152,18 @@ DECLARE_WALL(wall_after_raster, WALL_SIZE)
 /*! Default LCD bitmap */
 struct Bitmap lcd_bitmap;
 
-extern "C" void lcd_init(void)
+/*extern "C"*/ void lcd_init(void)
 {
-       //INIT_WALL(wall_before_raster);
-       //INIT_WALL(wall_after_raster);
+       //FIXME INIT_WALL(wall_before_raster);
+       //FIXME INIT_WALL(wall_after_raster);
        gfx_bitmapInit(&lcd_bitmap, lcd_raster, EmulLCD::WIDTH, EmulLCD::HEIGHT);
        gfx_bitmapClear(&lcd_bitmap);
 }
 
-extern "C" void lcd_blit_bitmap(Bitmap *bm)
+/*extern "C"*/ void lcd_blitBitmap(Bitmap *bm)
 {
-       //CHECK_WALL(wall_before_raster);
-       //CHECK_WALL(wall_after_raster);
+       //FIXME CHECK_WALL(wall_before_raster);
+       //FIXME CHECK_WALL(wall_after_raster);
        emul->emulLCD->writeRaster(bm->raster);
 }