Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions platform/qt/BadPixelFileHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,12 @@ void BadPixelFileHandler::crossesPrepareAll(mlvObject_t *pMlvObject, QVector<Cro
if( !ok ) continue;
uint32_t y = xy.at( 1 ).toUInt( &ok );
if( !ok ) continue;
if( x < pMlvObject->VIDF.cropPosX
|| y < pMlvObject->VIDF.cropPosY ) continue;
x = getPicX( pMlvObject, x );
y = getPicY( pMlvObject, y );
if( x >= (uint32_t)getMlvWidth( pMlvObject )
|| y >= (uint32_t)getMlvHeight( pMlvObject ) ) continue;
//paintCross( pMlvObject, pRawImage, x, y );

QPolygon poly;
Expand Down
2 changes: 2 additions & 0 deletions platform/qt/GradientElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ void GradientElement::createGradientElement( int scaledLength )
//Draw the element to a position, with length and angle
void GradientElement::redrawGradientElement(int sceneX, int sceneY, int picX, int picY)
{
if( picX <= 0 || picY <= 0 ) return;

m_pGradientGraphicsItem->blockSignals( true );
m_pGradientGraphicsItem->setPos( m_startX * sceneX / picX,
m_startY * sceneY / picY );
Expand Down
12 changes: 6 additions & 6 deletions platform/qt/MLVApp.pro
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ SOURCES += \
../../src/mlv/llrawproc/patternnoise.c \
../../src/mlv/llrawproc/chroma_smooth.c \
../../src/mlv/llrawproc/hist.c \
../../src/mlv/camid/camera_id.c \
../../src/mlv/camid/camera_id.c \
../../src/mlv/mcraw/mcraw.c \
../../src/mlv/mcraw/cJSON.c \
../../src/mlv/mcraw/RawData.cpp \
Expand Down Expand Up @@ -433,11 +433,11 @@ HEADERS += MainWindow.h \

jpeg2k_enabled {
HEADERS += \
../../src/mlv/OpenJPH/ojph_wrapper.h \
../../src/mlv/OpenJPH/openjph/*.h \
../../src/mlv/OpenJPH/codestream/*.h \
../../src/mlv/OpenJPH/coding/*.h \
../../src/mlv/OpenJPH/transform/*.h
$$files(../../src/mlv/OpenJPH/ojph_wrapper.h) \
$$files(../../src/mlv/OpenJPH/openjph/*.h) \
$$files(../../src/mlv/OpenJPH/codestream/*.h) \
$$files(../../src/mlv/OpenJPH/coding/*.h) \
$$files(../../src/mlv/OpenJPH/transform/*.h)

macx:equals(QT_ARCH, arm64) {
HEADERS += \
Expand Down
171 changes: 140 additions & 31 deletions platform/qt/MainWindow.cpp

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions platform/qt/MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,9 @@ private slots:
void on_actionDarkThemeModern_triggered(bool checked);

void on_comboBoxDebayer_currentIndexChanged( int index );
void on_horizontalSliderDebayerFalseColor_valueChanged( int value );
void on_horizontalSliderDebayerFalseColor_doubleClicked();
void on_labelDebayerFalseColorVal_doubleClicked();

void on_actionMarkRed_triggered();
void on_actionMarkYellow_triggered();
Expand All @@ -418,6 +421,7 @@ private slots:

void on_lineEditTransferFunction_textChanged(const QString &arg1);


private:
Ui::MainWindow *ui;
InfoDialog *m_pInfoDialog;
Expand Down
71 changes: 69 additions & 2 deletions platform/qt/MainWindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -1969,7 +1969,7 @@ QGroupBox::indicator:checked:disabled {
</widget>
</item>
<item row="27" column="0">
<layout class="QGridLayout" name="gridLayout_67">
<layout class="QGridLayout" name="gridLayoutDualIsoCorrections">
<property name="horizontalSpacing">
<number>5</number>
</property>
Expand Down Expand Up @@ -2902,7 +2902,7 @@ QGroupBox::indicator:checked:disabled {
<property name="horizontalSpacing">
<number>5</number>
</property>
<item row="0" column="0">
<item row="0" column="0" colspan="3">
<widget class="NoScrollComboBox" name="comboBoxDebayer">
<property name="font">
<font>
Expand Down Expand Up @@ -2962,6 +2962,73 @@ QGroupBox::indicator:checked:disabled {
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelDebayerFalseColor">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>False Color</string>
</property>
</widget>
</item>
<item row="1" column="1">
<spacer name="horizontalSpacerDebayerFalseColor">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2">
<widget class="DoubleClickLabel" name="labelDebayerFalseColorVal">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<widget class="NoScrollSlider" name="horizontalSliderDebayerFalseColor">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="maximum">
<number>5</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down
1 change: 1 addition & 0 deletions platform/qt/ReceiptSettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,6 @@ ReceiptSettings::ReceiptSettings()
m_cutOut = INT32_MAX;
m_lastPlaybackPosition = 0;
m_debayer = AMaZE;
m_debayerFalseColor = 0;
m_mark = 0;
}
3 changes: 3 additions & 0 deletions platform/qt/ReceiptSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ class ReceiptSettings
void setCutOut( uint32_t frame ) {m_cutOut = frame;}
void setLastPlaybackPosition( uint32_t pos ){m_lastPlaybackPosition = pos;}
void setDebayer( uint8_t algorithm ) {m_debayer = algorithm;}
void setDebayerFalseColor( int value ) {m_debayerFalseColor = value;}
void setMark( uint8_t mark ) {m_mark = mark;}

bool wasNeverLoaded( void ){return m_neverLoaded;}
Expand Down Expand Up @@ -234,6 +235,7 @@ class ReceiptSettings
QString exportFileName( void ){return m_exportFileName;}
uint32_t lastPlaybackPosition( void ){return m_lastPlaybackPosition;}
uint8_t debayer( void ){return m_debayer;}
int debayerFalseColor( void ){return m_debayerFalseColor;}
uint8_t mark( void ){return m_mark;}

private:
Expand Down Expand Up @@ -346,6 +348,7 @@ class ReceiptSettings
QString m_exportFileName;
uint32_t m_lastPlaybackPosition;
uint8_t m_debayer;
int m_debayerFalseColor;
uint8_t m_mark;
};

Expand Down
23 changes: 18 additions & 5 deletions platform/qt/SingleFrameExportDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,23 @@ void SingleFrameExportDialog::exportViaQt()

//Get frame from library
uint8_t *pRawImage = (uint8_t*)malloc( 3 * getMlvWidth(m_pMlvObject) * getMlvHeight(m_pMlvObject) * sizeof( uint8_t ) );
if( !pRawImage )
{
QMessageBox::critical( this, tr( "Frame export failed" ), tr( "Could not allocate image buffer." ) );
return;
}
getMlvProcessedFrame8( m_pMlvObject, m_frameNr, pRawImage, 1 );

int scaledWidth = getMlvWidth(m_pMlvObject) * stretchX;
int scaledHeight = getMlvHeight(m_pMlvObject) * stretchY;
uint8_t * imgBufferScaled8;
imgBufferScaled8 = ( uint8_t* )malloc( getMlvWidth(m_pMlvObject) * stretchX * getMlvHeight(m_pMlvObject) * stretchY * 3 * sizeof( uint8_t ) );
imgBufferScaled8 = ( uint8_t* )malloc( scaledWidth * scaledHeight * 3 * sizeof( uint8_t ) );
if( !imgBufferScaled8 )
{
QMessageBox::critical( this, tr( "Frame export failed" ), tr( "Could not allocate image buffer." ) );
free( pRawImage );
return;
}

avir_scale_thread_pool scaling_pool;
avir::CImageResizerVars vars; vars.ThreadPool = &scaling_pool;
Expand All @@ -119,15 +132,15 @@ void SingleFrameExportDialog::exportViaQt()
getMlvWidth(m_pMlvObject),
getMlvHeight(m_pMlvObject), 0,
imgBufferScaled8,
getMlvWidth(m_pMlvObject) * stretchX,
getMlvHeight(m_pMlvObject) * stretchY,
scaledWidth,
scaledHeight,
3, 0, &vars );

if( ui->comboBoxCodec->currentIndex() == 2 )
QImage( ( unsigned char *) imgBufferScaled8, getMlvWidth(m_pMlvObject) * stretchX, getMlvHeight(m_pMlvObject) * stretchY, QImage::Format_RGB888 )
QImage( ( unsigned char *) imgBufferScaled8, scaledWidth, scaledHeight, scaledWidth * 3, QImage::Format_RGB888 )
.save( fileName, "png", -1 );
else
QImage( ( unsigned char *) imgBufferScaled8, getMlvWidth(m_pMlvObject) * stretchX, getMlvHeight(m_pMlvObject) * stretchY, QImage::Format_RGB888 )
QImage( ( unsigned char *) imgBufferScaled8, scaledWidth, scaledHeight, scaledWidth * 3, QImage::Format_RGB888 )
.save( fileName, "jpg", -1 );

free( imgBufferScaled8 );
Expand Down
Loading