lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-18 10:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated gammaCorrection painting

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2008-02-09 13:42:06 +00:00
parent 59dde3057d
commit f7427367bd
3 changed files with 77 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/fgt/edit_quality/qualitymapperdialog.cpp
View File

@ -42,8 +42,10 @@ QualityMapperDialog::QualityMapperDialog(QWidget *parent, MeshModel *m, GLArea *
//connect(this, SIGNAL(closing()),gla,SLOT(endEdit()) );
// toggle Trackball button (?)
// connect(this, SIGNAL(suspendEditToggle()),gla,SLOT(suspendEditToggle()) );
// emit suspendEditToggle();
//connect(this, SIGNAL(suspendEditToggle()),gla,SLOT(suspendEditToggle()) );
//emit suspendEditToggle();
//gla->suspendEditToggle();
}
@ -310,8 +312,9 @@ void QualityMapperDialog::drawEqualizerHistogram()
// Nota: non è necessario connettere anche le spinbox (UCCIO)
//connect(ui.minSpinBox, SIGNAL(valueChanged(double)), this, SLOT(on_left_right_equalizerHistogram_handle_changed()));
//connect(ui.maxSpinBox, SIGNAL(valueChanged(double)), this, SLOT(on_left_right_equalizerHistogram_handle_changed()));
connect(_equalizerHandles[LEFT_HANDLE], SIGNAL(positionChanged()), this, SLOT(on_left_right_EQHandle_changed()));
connect(_equalizerHandles[RIGHT_HANDLE], SIGNAL(positionChanged()), this, SLOT(on_left_right_EQHandle_changed()));
connect(_equalizerHandles[LEFT_HANDLE], SIGNAL(positionChanged()), this, SLOT(on_EQHandle_moved()));
connect(_equalizerHandles[MID_HANDLE], SIGNAL(positionChanged()), this, SLOT(on_EQHandle_moved()));
connect(_equalizerHandles[RIGHT_HANDLE], SIGNAL(positionChanged()), this, SLOT(on_EQHandle_moved()));
// Connecting mid equalizerHistogram handle to gammaCorrectionLabel
connect(_equalizerHandles[MID_HANDLE], SIGNAL(positionChanged()), this, SLOT(drawGammaCorrection()) );
@ -331,10 +334,15 @@ void QualityMapperDialog::drawEqualizerHistogram()
}
/*
// Add histogramBars to destinationScene
void QualityMapperDialog::drawHistogramBars (QGraphicsScene& destinationScene, CHART_INFO *chartInfo, int minIndex, int maxIndex, QColor color)
{
if (&destinationScene == &(this->_transferFunctionScene))
{
this->drawHistogramBarsSTRETCHED(destinationScene, chartInfo, minIndex, maxIndex, color);
return;
}
// Questro controllo è necessario perché se si cerca in Histogram il valore minimo viene restituito l'indice -1. Forse deve essere corretto? (UCCIO)
if (minIndex<0)
minIndex = 0;
@ -346,7 +354,6 @@ void QualityMapperDialog::drawHistogramBars (QGraphicsScene& destinationScene, C
QBrush drawingBrush (color);
QPointF startBarPt;
QSizeF barSize;
//drawing histogram bars
QGraphicsItem *current_item = 0;
@ -356,17 +363,60 @@ void QualityMapperDialog::drawHistogramBars (QGraphicsScene& destinationScene, C
startBarPt.setX( chartInfo->leftBorder + ( barWidth * (i-minIndex) ) );
startBarPt.setY( (float)chartInfo->lowerBorder - barHeight );
barSize.setWidth(barWidth);
barSize.setHeight(barHeight);
//drawing histogram bar
current_item = destinationScene.addRect(startBarPt.x(), startBarPt.y(), barSize.width(), barSize.height(), drawingPen, drawingBrush);
current_item = destinationScene.addRect(startBarPt.x(), startBarPt.y(), barWidth, barHeight, drawingPen, drawingBrush);
current_item->setZValue(-1);
if ( &destinationScene == &_transferFunctionScene )
_transferFunctionBg << current_item;
}
}*/
// Add histogramBars to destinationScene with GAMMA-STRETCHING
void QualityMapperDialog::drawHistogramBars (QGraphicsScene& destinationScene, CHART_INFO *chartInfo, int minIndex, int maxIndex, QColor color)
{
// Questro controllo è necessario perché se si cerca in Histogram il valore minimo viene restituito l'indice -1. Forse deve essere corretto? (UCCIO)
if (minIndex<0)
minIndex = 0;
float barHeight = 0.0f; //initializing height of the histogram bars
float barWidth = chartInfo->chartWidth / (float)(maxIndex-minIndex); //processing width of the histogram bars (4\5 of dX)
// float barSeparator = dX - barWidth; //processing space between consecutive bars of the histogram bars (1\5 of dX)
int numberOfItems = maxIndex - minIndex;
float exp = log10(0.5f) / log10((float)_equalizerMidHandlePercentilePosition);
QPen drawingPen(color);
QBrush drawingBrush (color);
QPointF startBarPt;
//drawing histogram bars
QGraphicsItem *current_item = 0;
for (int i = minIndex; i < maxIndex; i++)
{
barHeight = (float)(chartInfo->chartHeight * _equalizer_histogram->H[i]) / (float)_histogram_info->maxRoundedY;
startBarPt.setY( (float)chartInfo->lowerBorder - barHeight );
//drawing histogram bar
if ( &destinationScene == &_transferFunctionScene )
{
startBarPt.setX( chartInfo->leftBorder + relative2AbsoluteValf(pow( absolute2RelativeValf(i-minIndex,numberOfItems ), exp ), chartInfo->chartWidth) );
current_item = destinationScene.addLine(startBarPt.x(), startBarPt.y(), startBarPt.x(), (float)chartInfo->lowerBorder, drawingPen);
_transferFunctionBg << current_item;
}
else
{
startBarPt.setX( chartInfo->leftBorder + ( barWidth * (i-minIndex) ) );
current_item = destinationScene.addRect(startBarPt.x(), startBarPt.y(), barWidth, barHeight, drawingPen, drawingBrush);
}
current_item->setZValue(-1);
}
}
void QualityMapperDialog::initTF()
{
assert(_transferFunction != 0);
@ -469,12 +519,17 @@ void QualityMapperDialog::initTF()
void QualityMapperDialog::drawGammaCorrection()
{
int width = 100;
int height = 100;
int width = ui.gammaCorrectionLabel->width();
int height = ui.gammaCorrectionLabel->height();
QPixmap *pixmap = new QPixmap(width, height);
QPainter painter(pixmap);
painter.setPen(QColor(128,128,128));
painter.drawLine(0,height-1,width-1,0);
painter.setPen(Qt::black);
painter.drawRect(0,0,width-1,height-1);
int c = _equalizerMidHandlePercentilePosition*width;
QPainterPath path;
path.moveTo(0, height);
@ -716,7 +771,7 @@ void QualityMapperDialog::moveAheadChannel( TF_CHANNELS channelCode )
}
void QualityMapperDialog::on_left_right_EQHandle_changed()
void QualityMapperDialog::on_EQHandle_moved()
{
if ( _transferFunction )

4
src/fgt/edit_quality/qualitymapperdialog.h
View File

@ -90,6 +90,8 @@ private:
void updateColorBand();
void drawTransferFunctionBG ();
void drawHistogramBars (QGraphicsScene&, CHART_INFO*, int minIndex, int maxIndex, QColor color = QColor(Qt::black));
//void drawHistogramBarsSTRETCHED (QGraphicsScene&, CHART_INFO*, int minIndex, int maxIndex, QColor color = QColor(Qt::black));
GRAPHICS_ITEMS_LIST *clearScene(QGraphicsScene *scene, int toClean=0);
GRAPHICS_ITEMS_LIST *clearItems(int itemsToClear);
@ -116,8 +118,8 @@ private slots:
void on_savePresetButton_clicked();
void on_addPointButton_clicked();
void on_EQHandle_moved();
void on_left_right_EQHandle_changed();
void on_handle_released();
void on_TfHandle_moved(TFHandle *sender);

6
src/fgt/edit_quality/qualitymapperdialog.ui
View File

@ -310,6 +310,12 @@
<height>100</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property name="text" >
<string>gama correction</string>
</property>