Skip to content

Commit 5a017d8

Browse files
author
Kaspar Schmid
committed
beta.2 release
1 parent 960ce5c commit 5a017d8

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

ImagePlay/include/ImageViewerWindow.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ private slots:
127127
IPLCoordinatePickHandler* _coordinatePickHandler;
128128
QColor _currentColor;
129129
QPoint _currentPosition;
130+
bool _ignoreZoomEvents;
131+
130132

131133
// QWidget interface
132134
protected:

ImagePlay/include/MainWindow.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737

3838
#include "IPL_plugininterface.h"
3939

40-
#define IMAGEPLAY_VERSION "6.0.0-beta.1"
41-
#define IMAGEPLAY_BUILDNUMBER "20150318"
40+
#define IMAGEPLAY_VERSION "6.0.0-beta.2"
41+
#define IMAGEPLAY_BUILDNUMBER "20150402"
4242

4343
namespace Ui {
4444
class MainWindow;

ImagePlay/src/ImageViewerWindow.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ ImageViewerWindow::ImageViewerWindow(MainWindow *mainWindow) :
1919
_colorPickHandler = NULL;
2020
_coordinatePickHandler = NULL;
2121

22+
_ignoreZoomEvents = false;
23+
2224
// setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog);
2325

2426
QPalette darkPalette;
@@ -332,6 +334,9 @@ ImageViewerWindow::zoomAllViewers
332334
*/
333335
void ImageViewerWindow::zoomAllViewers(ZoomAction action)
334336
{
337+
if(_ignoreZoomEvents)
338+
return;
339+
335340
// apply zoom and scroll position to all viewers
336341
// int horizontalScroll = ((IPImageViewer*) ui->tabWidget->currentWidget())->horizontalScrollBar()->value();
337342
// int verticalScroll = ((IPImageViewer*) ui->tabWidget->currentWidget())->verticalScrollBar()->value();
@@ -355,8 +360,10 @@ void ImageViewerWindow::zoomAllViewers(ZoomAction action)
355360

356361
zoomFactor = it.value()->zoomFactor();
357362

363+
//_ignoreZoomEvents = true;
358364
it.value()->horizontalScrollBar()->setValue(_horizontalScrollValue);
359365
it.value()->verticalScrollBar()->setValue(_verticalScrollValue);
366+
//_ignoreZoomEvents = false;
360367
}
361368
catch(std::exception& e)
362369
{
@@ -623,11 +630,10 @@ void ImageViewerWindow::on_btnZoomReset_clicked()
623630
//-----------------------------------------------------------------------------
624631
/*!
625632
ImageViewerWindow::on_scrollBarsChanged
626-
627-
@TODO scrollbars currently don't work
628633
*/
629634
void ImageViewerWindow::on_scrollBarsChanged(int horizontal, int vertical)
630635
{
636+
//qDebug() << "on_scrollBarsChanged: " << horizontal << "," << vertical;
631637
_horizontalScrollValue = horizontal;
632638
_verticalScrollValue = vertical;
633639

changelog.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# Change Log
22

3-
## 6.0.0-beta.2 - 2015-04-01
3+
## 6.0.0-beta.2 - 2015-04-02
44
### Added
55
- A first version of the plugin SDK is supplied in /plugin_development/
66
- To set up your plugin, use "ImagePlay -> Tools -> Generate Plugin Code"
7-
- Keyboard shortcut for quickly searching in the process library: [CTRL + F]
7+
- Keyboard shortcut for quickly searching in the process library: [CTRL + F] or [CMD + F]
88
- New property widgets: IPL_WIDGET_SLIDER_ODD and IPL_WIDGET_SLIDER_EVEN
99
- OpenCV implementation for 2D convolutions
10+
- FFT, Filtering and IFFT
1011

1112
### Changed
1213
- Switched the property GUI code to RTTI based dynamic_cast calls
@@ -19,6 +20,8 @@
1920
### Known Issues
2021
- Mac OS X: Building ImagePlay may produce errors after macdeployqt ../_bin/Release/macx/ImagePlay.app/ -dmg
2122
- those errors only affect the creation of the dmg file, you can still run ImagePlay.app
23+
- Histogram and Zoom might not update correctly. Histogram channels don't workd yet (RGB, etc...)
24+
- While using a IPLCamera, the UI can be pretty unresponsive. Pause to adjust the UI.
2225
- The application may still be unstable, expect crashes (please report them on https://github.com/cpvrlab/ImagePlay/issues)
2326

2427

0 commit comments

Comments
 (0)