[Kstars-devel] KDE/kdeedu/kstars/kstars
Anne-Marie Mahfouf
annma at kde.org
Tue Feb 21 00:01:16 CET 2006
SVN commit 511802 by annma:
compile by adding ktoolbar include
linking: KPixmapIO is gone so I commented out a few lines. I added a FIXME note before any line I commented so youcan fix it
CCMAIL: kstars-devel at kde.org
CCMAIL=kstars at 30doradus.org
M +2 -1 ccdpreviewwg.cpp
M +2 -2 ccdpreviewwg.h
M +12 -9 fitsimage.cpp
M +2 -2 fitsimage.h
M +3 -1 imageviewer.cpp
M +2 -2 imageviewer.h
M +1 -0 kstarsactions.cpp
M +1 -0 kstarsinit.cpp
M +1 -0 skymap.cpp
M +2 -1 streamwg.cpp
M +2 -2 streamwg.h
--- trunk/KDE/kdeedu/kstars/kstars/ccdpreviewwg.cpp #511801:511802
@@ -410,7 +410,8 @@
{
if (streamImage->isNull()) return;
//qPix = kPixIO.convertToPixmap(*streamImage);/*streamImage->smoothScale(width(), height()));*/
- qPix = kPixIO.convertToPixmap(streamImage->scaled(width(), height(), Qt::KeepAspectRatio));
+ //FIXME commented out next line to build as KPixmapIO is gone -- annma 1006-02-20
+ //qPix = kPixIO.convertToPixmap(streamImage->scaled(width(), height(), Qt::KeepAspectRatio));
delete (streamImage);
streamImage = NULL;
}
--- trunk/KDE/kdeedu/kstars/kstars/ccdpreviewwg.h #511801:511802
@@ -18,7 +18,7 @@
#include <QResizeEvent>
#include <QPaintEvent>
#include <QCloseEvent>
-#include <kpixmapio.h>
+//#include <kpixmapio.h>
#include "ccdpreviewui.h"
@@ -98,7 +98,7 @@
QRgb *grayTable;
QImage *streamImage;
QPixmap qPix;
- KPixmapIO kPixIO;
+ //KPixmapIO kPixIO;
unsigned char *streamBuffer;
unsigned char *displayBuffer;
long streamBufferPos;
--- trunk/KDE/kdeedu/kstars/kstars/fitsimage.cpp #511801:511802
@@ -372,7 +372,8 @@
void FITSImage::convertImageToPixmap()
{
- qpix = kpix.convertToPixmap ( *(displayImage) );
+ //FIXME commented out next line to build as KPixmapIO is gone -- annma 1006-02-20
+ //qpix = kpix.convertToPixmap ( *(displayImage) );
}
void FITSImage::zoomToCurrent()
@@ -393,14 +394,16 @@
if (cwidth != displayImage->width() || cheight != displayImage->height())
{
- qpix = kpix.convertToPixmap (displayImage->smoothScale( (int) cwidth, (int) cheight));
+ //FIXME commented out next line to build as KPixmapIO is gone -- annma 1006-02-20
+ //qpix = kpix.convertToPixmap (displayImage->smoothScale( (int) cwidth, (int) cheight));
//imgFrame->resize( (int) width, (int) height);
viewportResizeEvent (NULL);
imgFrame->update();
}
else
{
- qpix = kpix.convertToPixmap ( *displayImage );
+ //FIXME commented out next line to build as KPixmapIO is gone -- annma 1006-02-20
+ //qpix = kpix.convertToPixmap ( *displayImage );
imgFrame->update();
}
@@ -418,8 +421,8 @@
currentHeight *= zoomFactor; //pow(zoomFactor, abs(currentZoom));
//kDebug() << "Current width= " << currentWidth << " -- Current height= " << currentHeight << endl;
-
- qpix = kpix.convertToPixmap (displayImage->smoothScale( (int) currentWidth, (int) currentHeight));
+ //FIXME commented out next line to build as KPixmapIO is gone -- annma 1006-02-20
+ //qpix = kpix.convertToPixmap (displayImage->smoothScale( (int) currentWidth, (int) currentHeight));
imgFrame->resize( (int) currentWidth, (int) currentHeight);
update();
@@ -436,8 +439,8 @@
currentWidth /= zoomFactor; //pow(zoomFactor, abs(currentZoom));
currentHeight /= zoomFactor;//pow(zoomFactor, abs(currentZoom));
-
- qpix = kpix.convertToPixmap (displayImage->smoothScale( (int) currentWidth, (int) currentHeight));
+ //FIXME commented out next line to build as KPixmapIO is gone -- annma 1006-02-20
+ //qpix = kpix.convertToPixmap (displayImage->smoothScale( (int) currentWidth, (int) currentHeight));
imgFrame->resize( (int) currentWidth, (int) currentHeight);
update();
@@ -454,8 +457,8 @@
currentZoom = 0;
currentWidth = width;
currentHeight = height;
-
- qpix = kpix.convertToPixmap (*displayImage);
+ //FIXME commented out next line to build as KPixmapIO is gone -- annma 1006-02-20
+ //qpix = kpix.convertToPixmap (*displayImage);
imgFrame->resize( (int) currentWidth, (int) currentHeight);
update();
--- trunk/KDE/kdeedu/kstars/kstars/fitsimage.h #511801:511802
@@ -33,7 +33,7 @@
#include <QResizeEvent>
#include <QPaintEvent>
-#include <kpixmapio.h>
+//#include <kpixmapio.h>
#include <kpixmap.h>
#include <kdialog.h>
#include <kmainwindow.h>
@@ -82,7 +82,7 @@
QImage *displayImage; /* FITS image that is displayed in the GUI */
QImage *templateImage; /* backup image for currentImage */
QPixmap qpix; /* Pixmap for drawing */
- KPixmapIO kpix; /* Pixmap IO for fast converting */
+ //KPixmapIO kpix; /* Pixmap IO for fast converting */
QRect currentRect; /* Current rectangle encapsulating the image */
int bitpix, bpp; /* bits per pixel and bytes per pixels for FITS */
int width, height; /* Original FITS dimensions */
--- trunk/KDE/kdeedu/kstars/kstars/imageviewer.cpp #511801:511802
@@ -31,6 +31,7 @@
#include <kaction.h>
#include <kaccel.h>
#include <kdebug.h>
+#include <ktoolbar.h>
#include "imageviewer.h"
#include <kapplication.h>
@@ -88,7 +89,8 @@
void ImageViewer::resizeEvent (QResizeEvent */*ev*/)
{
if ( !downloadJob ) // only if image is loaded
- pix = kpix.convertToPixmap ( image.smoothScale ( size().width() , size().height() - toolBar()->height() - statusBar()->height() ) ); // convert QImage to QPixmap (fastest method)
+ //FIXME commented out next line to build as KPixmapIO is gone -- annma 1006-02-20
+ //pix = kpix.convertToPixmap ( image.smoothScale ( size().width() , size().height() - toolBar()->height() - statusBar()->height() ) ); // convert QImage to QPixmap (fastest method)
update();
}
--- trunk/KDE/kdeedu/kstars/kstars/imageviewer.h #511801:511802
@@ -26,7 +26,7 @@
#include <QPaintEvent>
#include <QCloseEvent>
-#include <kpixmapio.h>
+//#include <kpixmapio.h>
#include <kio/job.h>
#include <ktempfile.h>
#include <kmainwindow.h>
@@ -105,7 +105,7 @@
QImage image;
QPixmap pix;
- KPixmapIO kpix;
+ //KPixmapIO kpix;
KTempFile tempfile;
QFile *file;
--- trunk/KDE/kdeedu/kstars/kstars/kstarsactions.cpp #511801:511802
@@ -41,6 +41,7 @@
#include <kstatusbar.h>
#include <kprocess.h>
#include <kdeversion.h>
+#include <ktoolbar.h>
#include "opscatalog.h"
#include "opsguides.h"
--- trunk/KDE/kdeedu/kstars/kstars/kstarsinit.cpp #511801:511802
@@ -29,6 +29,7 @@
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kdeversion.h>
+#include <ktoolbar.h>
#include "Options.h"
#include "kstars.h"
--- trunk/KDE/kdeedu/kstars/kstars/skymap.cpp #511801:511802
@@ -22,6 +22,7 @@
#include <kmessagebox.h>
#include <kaction.h>
#include <kstandarddirs.h>
+#include <ktoolbar.h>
#include <q3memarray.h>
#include <q3pointarray.h>
--- trunk/KDE/kdeedu/kstars/kstars/streamwg.cpp #511801:511802
@@ -236,7 +236,8 @@
{
if (streamImage->isNull()) return;
//qPix = kPixIO.convertToPixmap(*streamImage);/*streamImage->smoothScale(width(), height()));*/
- qPix = kPixIO.convertToPixmap(streamImage->scaled(width(), height(), Qt::KeepAspectRatio));
+ //FIXME commented out next line to build as KPixmapIO is gone -- annma 1006-02-20
+ //qPix = kPixIO.convertToPixmap(streamImage->scaled(width(), height(), Qt::KeepAspectRatio));
delete (streamImage);
streamImage = NULL;
}
--- trunk/KDE/kdeedu/kstars/kstars/streamwg.h #511801:511802
@@ -18,7 +18,7 @@
#include <QResizeEvent>
#include <QPaintEvent>
#include <QCloseEvent>
- #include <kpixmapio.h>
+ //#include <kpixmapio.h>
#include "streamformui.h"
#include "q3frame.h"
@@ -94,7 +94,7 @@
QRgb *grayTable;
QImage *streamImage;
QPixmap qPix;
- KPixmapIO kPixIO;
+ //KPixmapIO kPixIO;
protected:
void paintEvent(QPaintEvent *ev);
More information about the Kstars-devel
mailing list