diff --git a/Makefile b/Makefile index 1d80dfe..5b3aebf 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ endif ############################## -all: bin/librtimv.so bin/rtimv +all: librtimv rtimv makefile.librtimv: librtimv.pro $(QMAKE) -makefile librtimv.pro @@ -26,13 +26,13 @@ makefile.librtimv: librtimv.pro makefile.rtimv: rtimv.pro $(QMAKE) -makefile rtimv.pro -bin/librtimv.so: makefile.librtimv +librtimv: makefile.librtimv $(MAKE) -f makefile.librtimv -bin/rtimv: makefile.rtimv +rtimv: makefile.rtimv $(MAKE) -f makefile.rtimv -install: makefile.librtimv makefile.rtimv bin/librtimv.so bin/rtimv +install: makefile.librtimv makefile.rtimv librtimv rtimv $(MAKE) -f makefile.librtimv install $(MAKE) -f makefile.rtimv install @@ -44,4 +44,4 @@ clean: rm -f bin/librtimv.so* rm -f bin/rtimv -.PHONY: all install clean +.PHONY: all install clean librtimv rtimv diff --git a/src/images/shmimImage.cpp b/src/images/shmimImage.cpp index 18439b4..2cc9a08 100644 --- a/src/images/shmimImage.cpp +++ b/src/images/shmimImage.cpp @@ -222,7 +222,7 @@ int shmimImage::update() if(cnt0 != m_lastCnt0) //Only redraw if it's actually a new image. { m_data = ((char *) (m_image.array.raw)) + curr_image*snx*sny*m_typeSize; - m_imageTime = m_image.md->atime.tv_sec + ((double) m_image.md->atime.tv_nsec)/1e9; + m_imageTime = m_image.md->writetime.tv_sec + ((double) m_image.md->writetime.tv_nsec)/1e9; m_lastCnt0 = cnt0; m_age_counter = 0; diff --git a/src/rtimvMainWindow.cpp b/src/rtimvMainWindow.cpp index f2b0925..6dccd6e 100644 --- a/src/rtimvMainWindow.cpp +++ b/src/rtimvMainWindow.cpp @@ -830,10 +830,14 @@ void rtimvMainWindow::updateAge() { ui.graphicsView->fpsGageText(m_images[0]->fpsEst()); } - else + else if(age < 86400*10000) //only if age is reasonable { ui.graphicsView->fpsGageText(age, true); - } + } + else + { + ui.graphicsView->fpsGageText(""); + } } for(size_t n=0;n