Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • ped-dyn-emp/petrack
1 result
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
include/logoItem.h
View file @ 4e5be287
......@@ -19,44 +19,28 @@
#ifndef LOGOITEM_H
#define LOGOITEM_H
#include <QGraphicsItem>
#include <QGraphicsObject>
class Petrack;
class LogoItem;
class QPropertyAnimation;
class Fader : public QObject
{
Q_OBJECT
public:
Fader();
void fadeOut(LogoItem *gi, int frames);
private slots:
void fadeOutStep();
public:
LogoItem *mLogoItem;
int mFrames;
double mStep;
QTimer *mTimer;
};
class LogoItem : public QGraphicsItem
class LogoItem : public QGraphicsObject
{
public:
LogoItem(QWidget *wParent, QGraphicsItem *parent = nullptr);
QRectF boundingRect() const;
QRectF boundingRect() const override;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
inline float getOpacity() const { return mOpacity; }
inline void setOpacity(float o) { mOpacity = o; }
void fadeOut(int frames = 100);
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
void fadeOut();
void fadeIn();
private:
Petrack *mMainWindow;
QImage *mImage;
float mOpacity;
Fader fader;
Petrack *mMainWindow;
QImage *mImage;
QPropertyAnimation *mFadeAnimation;
static constexpr int mFadeDuration = 2'000; // in ms
};
#endif
src/imageItem.cpp
View file @ 4e5be287
......@@ -66,8 +66,16 @@ void ImageItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*opti
void ImageItem::setImage(QImage *img)
{
if(img->isNull())
{
mImage = nullptr;
setTransform(QTransform());
mMainWindow->updateSceneRect();
return;
}
mImage = img;
QTransform matrix;
matrix.translate(
1, 1); // FEHLER IN QT ????? noetig, damit trotz recognitionroiitem auch image auch ohne border komplett neu
......
src/logoItem.cpp
View file @ 4e5be287
......@@ -21,69 +21,14 @@
#include "petrack.h"
#include <QApplication>
#include <QGraphicsScene>
#include <QPainter>
#include <QTimer>
#include <ctime>
// minimale Zeit zwischen zwei Blendenstufen in Millisekunden
#define FRAME_INTERVAL 40
Fader::Fader()
LogoItem::LogoItem(QWidget *wParent, QGraphicsItem *parent) : QGraphicsObject(parent)
{
mTimer = nullptr;
}
void Fader::fadeOut(LogoItem *lI, int frames)
{
mLogoItem = lI;
if(frames < 1)
{
mFrames = 1;
}
else
{
mFrames = frames;
}
mStep = 1. / mFrames;
if(mTimer) // wenn fadeOut schon mal aufgerufen wurde; so wird nur ein QTimer maximal angelegt
{
delete mTimer;
}
mTimer = new QTimer(this);
connect(mTimer, SIGNAL(timeout()), this, SLOT(fadeOutStep()));
mTimer->start(FRAME_INTERVAL); // fuer 25fps
}
void Fader::fadeOutStep()
{
static clock_t lastTime = clock();
if(((double) (clock() - lastTime)) / CLOCKS_PER_SEC >
FRAME_INTERVAL * .001) // beschleunigen, wenn zu langsam ausgeblendet wird
{
mStep *= 2;
}
lastTime = clock();
if(mLogoItem->getOpacity() > 0.)
{
mLogoItem->setOpacity(mLogoItem->getOpacity() - mStep);
mLogoItem->scene()->update(); // ein neuzeichnen wird erwuenscht und irgendwann bei processEvents gemacht
qApp->processEvents();
}
else
{
mLogoItem->setVisible(false);
mTimer->stop();
}
}
LogoItem::LogoItem(QWidget *wParent, QGraphicsItem *parent) : QGraphicsItem(parent)
{
mOpacity = 1.0;
mMainWindow = (class Petrack *) wParent;
mImage = new QImage(":/logo"); // in icons.qrc definiert
mMainWindow = dynamic_cast<Petrack *>(wParent);
mImage = new QImage(":/logo"); // in icons.qrc definiert
mFadeAnimation = new QPropertyAnimation(this, "opacity", this);
}
QRectF LogoItem::boundingRect() const
......@@ -95,7 +40,7 @@ void LogoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*optio
{
int w;
int h;
if(mMainWindow->getImage())
if(mMainWindow->getImage() && !mMainWindow->getImage()->isNull())
{
w = (mMainWindow->getImage()->width()) / 2 - (mImage->width()) / 2 - mMainWindow->getImageBorderSize();
h = (mMainWindow->getImage()->height()) / 2 - (mImage->height()) / 2 - mMainWindow->getImageBorderSize();
......@@ -105,20 +50,23 @@ void LogoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*optio
w = 0;
h = 0;
}
painter->setOpacity(mOpacity);
painter->drawImage(w, h, *mImage);
}
// logo wird langsam ausgeblendet
// blendgeschw ist rechnergeschwindigkeitsabhaengig
// qtimer waere auch eine mgl
// so wie hier, wird fkt, die nicht uber events/slots abgewickelt wird,
// wird zB bei projekt import die titelleiste erst nach dem ausblenden aktualisiert
// frame = anzahl der bildupdates, bis logo verschwunden ist
// mit opengl fkt fade schlecht
void LogoItem::fadeOut(int frames)
void LogoItem::fadeOut()
{
mFadeAnimation->setStartValue(1);
mFadeAnimation->setEndValue(0);
mFadeAnimation->setDuration(mFadeDuration);
mFadeAnimation->start();
}
void LogoItem::fadeIn()
{
fader.fadeOut(this, frames);
mFadeAnimation->setStartValue(0);
mFadeAnimation->setEndValue(1);
mFadeAnimation->setDuration(mFadeDuration);
mFadeAnimation->start();
}
#include "moc_logoItem.cpp"
src/petrack.cpp
View file @ 4e5be287
......@@ -366,12 +366,17 @@ void Petrack::updateSceneRect()
{
double iW = 0, iH = 0, bS = 0;
if(mImage)
if(mImage && !mImage->isNull())
{
iW = mImage->width();
iH = mImage->height();
bS = getImageBorderSize();
}
else
{
mScene->setSceneRect(mScene->itemsBoundingRect());
return;
}
if(mControlWidget->getCalibCoordShow())
{
......@@ -558,9 +563,23 @@ void Petrack::openXml(QDomDocument &doc, bool openSeq)
// open koennte am schluss passieren, dann wuerde nicht erst unveraendertes bild angezeigt,
// dafuer koennte es aber sein, dass werte zb bei fx nicht einstellbar sind!
mSeqFileName = seq;
if(openSeq && (seq != ""))
if(openSeq)
{
openSequence(seq); // wenn leer, dann kommt abfrage hoch, welche datei; abbrechen, wenn aktuelle gewuenscht
if(seq != "")
{
openSequence(seq);
}
else
{
mAnimation->reset();
mImg = cv::Mat();
mImgFiltered = cv::Mat();
delete mImage;
mImage = nullptr;
updateSequence();
mLogoItem->ensureVisible();
mLogoItem->fadeIn();
}
}
mMissingFrames.setExecuted(missingFramesExecuted);
......@@ -926,14 +945,7 @@ void Petrack::openCameraLiveStream(int camID /* =-1*/)
updateSequence();
updateWindowTitle();
mPlayerWidget->setFPS(mAnimation->getFPS());
if(mOpenGLAct->isChecked())
{
mLogoItem->fadeOut(1);
}
else
{
mLogoItem->fadeOut(50);
}
mLogoItem->fadeOut();
updateCoord();
mPlayerWidget->play(PlayerState::FORWARD);
......@@ -1003,14 +1015,7 @@ void Petrack::openSequence(QString fileName) // default fileName = ""
updateSequence();
updateWindowTitle();
mPlayerWidget->setFPS(mAnimation->getFPS());
if(mOpenGLAct->isChecked())
{
mLogoItem->fadeOut(1);
}
else
{
mLogoItem->fadeOut(50);
}
mLogoItem->fadeOut();
updateCoord();
mMissingFrames.reset();
}
......@@ -1688,8 +1693,8 @@ void Petrack::antialias()
void Petrack::opengl()
{
mView->setViewport(mOpenGLAct->isChecked() ? new QGLWidget(QGLFormat(QGL::SampleBuffers)) : new QWidget);
// alten freigeben wegen new????
// need full viewport update for fade out animation of LogoItem to work
mView->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
}
void Petrack::reset()
{
......@@ -3550,22 +3555,35 @@ void Petrack::updateSequence()
QImage *oldImage = mImage;
QSize size = mAnimation->getSize();
size.setWidth(size.width() + 2 * getImageBorderSize()); // border is inside the mImage!
size.setHeight(size.height() + 2 * getImageBorderSize());
mImage = new QImage(size, QImage::Format_RGB888); // 32); //wird in updateImage gemacht
if(size != QSize{0, 0})
{
size.setWidth(size.width() + 2 * getImageBorderSize()); // border is inside the mImage!
size.setHeight(size.height() + 2 * getImageBorderSize());
}
mImage = new QImage(size, QImage::Format_RGB888);
// set roi for recognition if image size changes or roi is zero
// in oldImage steckt border drin, mIplImg->height zeigt noch auf altes ursprungsbild
// mRecognitionRoiItem->rect().width() != 0 && oldImage == NULL wenn projektdatei eingelesen wird!!!!!
if((mRecognitionRoiItem->rect().width() == 0) || // default while initialization, after that >= MIN_SIZE
(oldImage && ((oldImage->width() != mImage->width()) || (oldImage->height() != mImage->height()))))
if(size == QSize{0, 0})
{
mRecognitionRoiItem->setRect(-getImageBorderSize(), -getImageBorderSize(), mImage->width(), mImage->height());
// separate handling because border should currently be ignored
// will be applied when a sequence is loaded in
mRecognitionRoiItem->setRect(0, 0, 0, 0);
mTrackingRoiItem->setRect(0, 0, 0, 0);
}
if((mTrackingRoiItem->rect().width() == 0) ||
(oldImage && ((oldImage->width() != mImage->width()) || (oldImage->height() != mImage->height()))))
else
{
mTrackingRoiItem->setRect(-getImageBorderSize(), -getImageBorderSize(), mImage->width(), mImage->height());
const bool imageSizeChanged = oldImage && (oldImage->rect() != mImage->rect());
// set roi for recognition if image size changes or roi is zero
if((mRecognitionRoiItem->rect().width() == 0) || imageSizeChanged)
{
mRecognitionRoiItem->setRect(
-getImageBorderSize(), -getImageBorderSize(), mImage->width(), mImage->height());
}
if((mTrackingRoiItem->rect().width() == 0) || imageSizeChanged)
{
mTrackingRoiItem->setRect(-getImageBorderSize(), -getImageBorderSize(), mImage->width(), mImage->height());
}
}
cv::Size size2;
......