[Digikam-devel] extragear/graphics/digikam/libs
Gilles Caulier
caulier.gilles at free.fr
Wed Dec 14 12:19:52 GMT 2005
SVN commit 488428 by cgilles:
Digikam from trunk : removing old histogram constructors and methods.
CCMAIL: digikam-devel at kde.org
M +2 -2 imageproperties/imagepropertieshistogramtab.cpp
M +0 -47 widgets/histogramwidget.cpp
M +0 -31 widgets/histogramwidget.h
--- trunk/extragear/graphics/digikam/libs/imageproperties/imagepropertieshistogramtab.cpp #488427:488428
@@ -405,8 +405,8 @@
if (m_selectionArea)
{
m_imageSelection = m_image.copy(*m_selectionArea);
- m_histogramWidget->updateSelectionData((uint *)m_imageSelection.bits(), m_imageSelection.width(),
- m_imageSelection.height());
+ m_histogramWidget->updateSelectionData(m_imageSelection.bits(), m_imageSelection.width(),
+ m_imageSelection.height(), m_imageSelection.sixteenBit());
m_regionBG->show();
}
else
--- trunk/extragear/graphics/digikam/libs/widgets/histogramwidget.cpp #488427:488428
@@ -84,21 +84,6 @@
m_selectionHistogram = 0L;
}
-// Constructor without image selection.
-// FIXME : remove this constructor when all digiKam core will be ported to DImg
-HistogramWidget::HistogramWidget(int w, int h,
- uint *i_data, uint i_w, uint i_h,
- QWidget *parent, bool selectMode,
- bool blinkComputation, bool statisticsVisible)
- : QWidget(parent, 0, Qt::WDestructiveClose)
-{
- m_sixteenBits = false;
- setup(w, h, selectMode, blinkComputation, statisticsVisible);
-
- m_imageHistogram = new ImageHistogram((uchar*)i_data, i_w, i_h, false, this);
- m_selectionHistogram = 0L;
-}
-
// Constructor with image selection.
HistogramWidget::HistogramWidget(int w, int h,
@@ -116,23 +101,6 @@
m_selectionHistogram = new ImageHistogram(s_data, s_w, s_h, i_sixteenBits, this);
}
-
-// Constructor with image selection.
-// FIXME : remove this constructor when all digiKam core will be ported to DImg
-HistogramWidget::HistogramWidget(int w, int h,
- uint *i_data, uint i_w, uint i_h,
- uint *s_data, uint s_w, uint s_h,
- QWidget *parent, bool selectMode,
- bool blinkComputation, bool statisticsVisible)
- : QWidget(parent, 0, Qt::WDestructiveClose)
-{
- m_sixteenBits = false;
- setup(w, h, selectMode, blinkComputation, statisticsVisible);
-
- m_imageHistogram = new ImageHistogram((uchar*)i_data, i_w, i_h, false, this);
- m_selectionHistogram = new ImageHistogram((uchar*)s_data, s_w, s_h, false, this);
-}
-
HistogramWidget::~HistogramWidget()
{
m_blinkTimer->stop();
@@ -250,14 +218,6 @@
m_blinkTimer->stop();
}
-// FIXME : remove this constructor when all digiKam core will be ported to DImg
-void HistogramWidget::updateData(uint *i_data, uint i_w, uint i_h,
- uint *s_data, uint s_w, uint s_h,
- bool blinkComputation)
-{
- updateData((uchar*)i_data, i_w, i_h, false, (uchar*)s_data, s_w, s_h, blinkComputation);
-}
-
void HistogramWidget::updateData(uchar *i_data, uint i_w, uint i_h,
bool i_sixteenBits,
uchar *s_data, uint s_w, uint s_h,
@@ -282,13 +242,6 @@
m_selectionHistogram = 0L;
}
-// FIXME : remove this constructor when all digiKam core will be ported to DImg
-void HistogramWidget::updateSelectionData(uint *s_data, uint s_w, uint s_h,
- bool blinkComputation)
-{
- updateSelectionData((uchar*)s_data, s_w, s_h, false, blinkComputation);
-}
-
void HistogramWidget::updateSelectionData(uchar *s_data, uint s_w, uint s_h,
bool i_sixteenBits,
bool blinkComputation)
--- trunk/extragear/graphics/digikam/libs/widgets/histogramwidget.h #488427:488428
@@ -90,33 +90,16 @@
bool blinkComputation=true,
bool statisticsVisible=false);
- // FIXME : remove this constructor when all digiKam core will be ported to DImg
/** Constructor with image data and without image selection data.*/
HistogramWidget(int w, int h, // Widget size.
- uint *i_data, uint i_w, uint i_h, // Full image info.
- QWidget *parent=0, bool selectMode=true,
- bool blinkComputation=true,
- bool statisticsVisible=false);
-
- /** Constructor with image data and without image selection data.*/
- HistogramWidget(int w, int h, // Widget size.
uchar *i_data, uint i_w, uint i_h, // Full image info.
bool i_sixteenBits, // 8 or 16 bits image.
QWidget *parent=0, bool selectMode=true,
bool blinkComputation=true,
bool statisticsVisible=false);
- // FIXME : remove this constructor when all digiKam core will be ported to DImg
/** Constructor with image data and image selection data.*/
HistogramWidget(int w, int h, // Widget size.
- uint *i_data, uint i_w, uint i_h, // Full image info.
- uint *s_data, uint s_w, uint s_h, // Image selection info.
- QWidget *parent=0, bool selectMode=true,
- bool blinkComputation=true,
- bool statisticsVisible=false);
-
- /** Constructor with image data and image selection data.*/
- HistogramWidget(int w, int h, // Widget size.
uchar *i_data, uint i_w, uint i_h, // Full image info.
uchar *s_data, uint s_w, uint s_h, // Image selection info.
bool i_sixteenBits, // 8 or 16 bits image.
@@ -133,33 +116,19 @@
/** Stop current histogram computations.*/
void stopHistogramComputation(void);
- // FIXME : remove this constructor when all digiKam core will be ported to DImg
/** Update full image histogram data methods.*/
- void updateData(uint *i_data, uint i_w, uint i_h,
- uint *s_data=0, uint s_w=0, uint s_h=0,
- bool blinkComputation=true);
-
- /** Update full image histogram data methods.*/
void updateData(uchar *i_data, uint i_w, uint i_h,
bool i_sixteenBits, // 8 or 16 bits image.
uchar *s_data=0, uint s_w=0, uint s_h=0,
bool blinkComputation=true);
- // FIXME : remove this constructor when all digiKam core will be ported to DImg
/** Update image selection histogram data methods.*/
- void updateSelectionData(uint *s_data, uint s_w, uint s_h,
- bool blinkComputation=true);
-
- /** Update image selection histogram data methods.*/
void updateSelectionData(uchar *s_data, uint s_w, uint s_h,
bool i_sixteenBits, // 8 or 16 bits image.
bool blinkComputation=true);
void setHistogramGuideByColor(DColor color);
- // FIXME : remove this method when all digiKam core will be ported to DImg
- void setHistogramGuide(QColor ){};
-
void reset(void);
public:
More information about the Digikam-devel
mailing list