Refactor Playuver into Calyp
commit 1fd9cf34f06ba2a156919b5c9b73c31d4c6c6257 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Mon Mar 12 18:06:39 2018 +0000 Remove code style commit 165588840126a7ab35b32e5be47f00c613829ef3 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Mon Mar 12 18:06:25 2018 +0000 Update Mainpage.dox commit 5b1a2773c48697346c7b0b64519b81a5aecc0150 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Mon Feb 19 03:46:24 2018 +0000 Re-add CalypPixel.cpp but keep include with frame class commit 2343be49ff4906c3171d2df7791e3cf34494eb21 Author: Joao Santos <joaompssantos@gmail.com> Date: Sun Feb 18 21:06:57 2018 +0000 Fixed several things: - Removed unused define - Added: #include <cassert> to MainWindow.cpp - Fixed compilation issue when USE_FFMPEG is OFF on CalypStream.cpp commit 8d1d64bac828a6bcdfa6af977a5d17d0792acb69 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 15 02:14:13 2018 +0000 Fix several things: - Fix examples - Improve code formatting script - Change generated cmake config file commit ea1d0265f1e9300f76fd3f0c8ca03d110ec13eaa Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 15 01:28:50 2018 +0000 Fix dump of the module list: remove the use of char arrays commit b4d19dda169715113a74713ca62d05f5a18fd0b5 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 23:20:56 2018 +0000 Increase linesize of tools help commit 8b3eab54e376863276b0d7e032f9e1de8aaf90e5 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 23:20:35 2018 +0000 Fix CalypPixel commit 1c6ba03c379518acf5fc6f1fdf328ca740a8851d Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 22:24:10 2018 +0000 Enums CalypPixelFormats and CalypColorSpace are now class independent commit 5dcc35e1716a70095e1720b01823c2e3a3980576 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 02:04:31 2018 +0000 Change functions input and return types commit 5514e3e24f9b428d5db71156561b2d8b6f61dd23 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 02:04:31 2018 +0000 Change functions input and return types commit fae7a9a91e1899e7a2833c634221f970d44b8fb6 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 01:39:14 2018 +0000 Replace custom types with std ones commit 0c3b62b8ea01903e213d9e8dd73a5b49c7c8c36e Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 14 00:37:18 2018 +0000 Refactoring entries with Playuver name with Calyp Replace number of frames and add CLP tag into public definitions commit e8cd8d7a219446513a5dda2c183dd892ec25a6f1 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Sat Feb 10 14:42:15 2018 +0000 Fix min opencv version and missing ffmpeg module commit 1233598af8ac15c88fa84569942cc6f865325452 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Sat Feb 10 03:10:12 2018 +0000 Change version to 0.999.0 untill finishing refactoring commit 1fe0cac8f0e70f352bf6c63b8cb2e06ab43fb633 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Sat Feb 10 00:21:47 2018 +0000 Change project library commit 44e9d330bc63b8b8a1687a14ff0be05af0bf2eb5 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Fri Feb 9 01:42:58 2018 +0000 Change doxygen files and upload new ico commit 0d6f3408a2682cfac1533a57a2f1b4e2cc1f0f29 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 8 21:25:31 2018 +0000 Fix logos - different when it is icon or the full logo commit 9f3561acd4b51c7de5f21d63d7e8f2b43c253148 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 8 01:25:39 2018 +0000 fix install files commit 832154e3e40f17a863898a77c929a6c6850ffded Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 8 01:21:23 2018 +0000 rename calip to calyp commit 341b32bfcc0133fdbceea9b8390d59190e495b79 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 8 00:58:29 2018 +0000 Refactor lib, modules and tools commit b4b988cf80052fdcfe0e1f9099d5435ef7945584 Author: Joao Carreira <jfmcarreira@gmail.com> Date: Thu Feb 8 00:02:33 2018 +0000 Refactor classes and filename in app commit 6b4ab728202531ad00db1e6299ee69a01f3594ba Author: Joao Carreira <jfmcarreira@gmail.com> Date: Wed Feb 7 17:49:53 2018 +0000 Refactor about dialog and background logo commit d5c954d39fb89d735c4feddf62f529077840ab6c Author: João Santos <joaompssantos@gmail.com> Date: Wed Feb 7 15:05:19 2018 +0000 Added the misteriously missing new logo. commit f40d81f765bfdd2dc89c0647cf5f4a80eef845c7 Author: João Santos <joaompssantos@gmail.com> Date: Wed Feb 7 14:45:08 2018 +0000 Added new logo to resource folder. commit 52dc6d60d6590995d32de33f8199e954e0a6e120 Author: João Santos <joaompssantos@gmail.com> Date: Wed Feb 7 14:41:13 2018 +0000 Added new logo where it was previously forgotten. commit 6d8e064c3154e5202f01b1b10ba6ab3637383ecd Author: João Santos <joaompssantos@gmail.com> Date: Tue Feb 6 17:44:11 2018 +0000 About window no longer resizable. Added new logo.
This commit is contained in:
157 files changed
+16532
-17759
No files matched your search
+23
-23
@@ -1,4 +1,4 @@
|
||||
/* This file is a part of PlaYUVer project
|
||||
/* This file is a part of Calyp project
|
||||
* Copyright (C) 2014-2018 by Joao Carreira (jfmcarreira@gmail.com)
|
||||
* Luis Lucas (luisfrlucas@gmail.com)
|
||||
*
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
/**
|
||||
* \file SubWindowAbstract.h
|
||||
* \ingroup PlaYUVerApp PlaYUVerApp_Subwindow
|
||||
* \ingroup CalypApp CalypApp_Subwindow
|
||||
* \brief Abstract class to handle subwindows
|
||||
*
|
||||
* @defgroup PlaYUVerApp_Subwindow SubWindow definition
|
||||
* @defgroup CalypApp_Subwindow SubWindow definition
|
||||
* @{
|
||||
* \ingroup PlaYUVerApp
|
||||
* \ingroup CalypApp
|
||||
*
|
||||
* Different SubWindow may be found in the PlaYUVerApp
|
||||
* Different SubWindow may be found in the CalypApp
|
||||
* Each one provide different functionality and serve
|
||||
* different purposes, ( e.g., displaying a video stream
|
||||
* or displaying a quality plot)
|
||||
@@ -41,14 +41,14 @@
|
||||
#include <QSize>
|
||||
#include <QString>
|
||||
#include <QWidget>
|
||||
#include "PlaYUVerAppDefs.h"
|
||||
#include "CommonDefs.h"
|
||||
#include "config.h"
|
||||
|
||||
class QHBoxLayout;
|
||||
class QFocusEvent;
|
||||
class QCloseEvent;
|
||||
|
||||
class PlaYUVerMdiSubWindow;
|
||||
class MdiSubWindow;
|
||||
|
||||
class SubWindowAbstract : public QWidget
|
||||
{
|
||||
@@ -56,10 +56,10 @@ class SubWindowAbstract : public QWidget
|
||||
|
||||
private:
|
||||
QHBoxLayout* m_pcLayout;
|
||||
UInt m_uiCategory;
|
||||
unsigned int m_uiCategory;
|
||||
QString m_cWindowName;
|
||||
|
||||
PlaYUVerMdiSubWindow* m_cSubWindow;
|
||||
MdiSubWindow* m_cSubWindow;
|
||||
|
||||
public:
|
||||
enum SubWindowCategory
|
||||
@@ -72,35 +72,35 @@ public:
|
||||
};
|
||||
Q_DECLARE_FLAGS( SubWindowCategories, SubWindowCategory )
|
||||
|
||||
SubWindowAbstract( QWidget*, UInt );
|
||||
SubWindowAbstract( QWidget*, unsigned int );
|
||||
~SubWindowAbstract();
|
||||
|
||||
/**
|
||||
* Show the image at its original size
|
||||
*/
|
||||
virtual Void refreshSubWindow() = 0;
|
||||
virtual void refreshSubWindow() = 0;
|
||||
|
||||
/**
|
||||
* Show the image at its original size
|
||||
*/
|
||||
virtual Void normalSize() = 0;
|
||||
virtual void normalSize() = 0;
|
||||
/**
|
||||
* Scale the image (zoomed in or out) to fit on the window.
|
||||
*/
|
||||
virtual Void zoomToFit() = 0;
|
||||
virtual void zoomToFit() = 0;
|
||||
/**
|
||||
* Scale the image (zoomed in or out) to speficied absolute zoom value (1.0 =
|
||||
* original size).
|
||||
*/
|
||||
virtual Void zoomToFactor( Double factor, QPoint center = QPoint() ) = 0;
|
||||
virtual void zoomToFactor( double factor, QPoint center = QPoint() ) = 0;
|
||||
/**
|
||||
* Scale the image by a given factor
|
||||
* @param factor factor of scale. Ex: 1.2 scale the image up by 20% and
|
||||
* 0.8 scale the image down by 25%
|
||||
*/
|
||||
virtual Void scaleView( Double, QPoint center = QPoint() ) = 0;
|
||||
virtual void scaleView( double, QPoint center = QPoint() ) = 0;
|
||||
|
||||
virtual Double getScaleFactor() = 0;
|
||||
virtual double getScaleFactor() = 0;
|
||||
|
||||
/**
|
||||
* Size related functions
|
||||
@@ -112,10 +112,10 @@ public:
|
||||
* Window name
|
||||
*/
|
||||
|
||||
Void setWindowName( QString );
|
||||
void setWindowName( QString );
|
||||
QString getWindowName();
|
||||
|
||||
virtual Bool mayClose();
|
||||
virtual bool mayClose();
|
||||
|
||||
/**
|
||||
* Get category of the SubWindow
|
||||
@@ -123,22 +123,22 @@ public:
|
||||
* @note This function should be used with enum SubWindowCategories
|
||||
* with an & operation and it may belong to several categories
|
||||
*/
|
||||
UInt getCategory() { return m_uiCategory; }
|
||||
unsigned int getCategory() { return m_uiCategory; }
|
||||
/**
|
||||
* Check category of the SubWindow
|
||||
* @param checkCateory SubWindow category to check against;
|
||||
* it should be enum SubWindowCategories type
|
||||
* @return true when SubWindow belong to checkCateory
|
||||
*/
|
||||
Bool checkCategory( UInt checkCateory ) { return m_uiCategory & checkCateory; }
|
||||
Void setSubWindow( PlaYUVerMdiSubWindow* subWindow ) { m_cSubWindow = subWindow; }
|
||||
Void closeSubWindow();
|
||||
bool checkCategory( unsigned int checkCateory ) { return m_uiCategory & checkCateory; }
|
||||
void setSubWindow( MdiSubWindow* subWindow ) { m_cSubWindow = subWindow; }
|
||||
void closeSubWindow();
|
||||
|
||||
protected:
|
||||
void focusInEvent( QFocusEvent* event );
|
||||
virtual void closeEvent( QCloseEvent* event );
|
||||
|
||||
Void setWidget( QWidget* widget );
|
||||
void setWidget( QWidget* widget );
|
||||
|
||||
Q_SIGNALS:
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user