*** empty log message ***

1 files changed, 12 insertions, 13 deletions

diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 548f323..696ce97 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -31,6 +31,9 @@
 
 /*
  * $Log$
+ * Revision 1.43  2005/07/27 12:40:47  deva
+ * *** empty log message ***
+ *
  * Revision 1.42  2005/07/25 15:56:27  deva
  * *** empty log message ***
  *
@@ -300,7 +303,7 @@ void MainWindow::createGui()
   img_live->setFixedSize(output_width - 20, output_height - 20);
   img_live->move(10,10);
   g1->addMultiCellWidget ( img_recedge, 0, 0, 0, 2, Qt::AlignHCenter);
-  QObject::connect( img_live, SIGNAL(clicked()), this, SLOT(live_clicked()) );
+  //  QObject::connect( img_live, SIGNAL(clicked()), this, SLOT(live_clicked()) );
 
   // CPR/NAME LABEL + CPR button
   lbl_cpr = createLabel("", output_width - (int)(BUTTON_WIDTH * unit), BUTTON_HEIGHT);
@@ -342,11 +345,9 @@ void MainWindow::createGui()
   int w = (int)((float)BUTTON_WIDTH * unit);
   int h = (int)(576.0f / (720.0f / ((float)BUTTON_WIDTH * unit)));
 
-  QImage dummy_resized = img_dummy->smoothScale(w, h);
-
   for(int i = 0; i < NUM_HISTORY; i++) {
-    img_history[i] = new QLabel(gb);
-    img_history[i]->setPixmap(dummy_resized);
+    img_history[i] = new HistoryWidget(gb);
+    img_history[i]->set_image(img_dummy);
     img_history[i]->setFixedSize(w, h);
   }
 
@@ -581,18 +582,16 @@ void MainWindow::shoot_clicked()
   //  unsigned char pixels[720*576*3];
   info->log("Snapshot (%s).", frozen?"frozen":"unfrozen");
 
-  QImage image(720, 576, 32);
-
-  camera->snapshot(image.bits());
+  QImage screenshot(720, 576, 32);
 
-  image = image.smoothScale(img_history[0]->width(), img_history[0]->height());
+  camera->snapshot(screenshot.bits());
 
-  QPixmap pixmap;
+  QImage *image;
   for(int cnt = (NUM_HISTORY-1); cnt > 0; cnt--) {
-    pixmap = *img_history[cnt-1]->pixmap();
-    img_history[cnt]->setPixmap(pixmap);
+    image = img_history[cnt-1]->get_image();
+    img_history[cnt]->set_image(image);
   }
-  img_history[0]->setPixmap(image);
+  img_history[0]->set_image(&screenshot);
 
   if(frozen) {
     camera->unfreeze();