8000 another test... · lineCode/opencv-python@72f3e5d · GitHub
[go: up one dir, main page]
Skip to content

Commit 72f3e5d

Browse files
skvarkskvark
committed
another test...
1 parent bf89f01 commit 72f3e5d

File tree

2 files changed

+470
-34
lines changed

2 files changed

+470
-34
lines changed

‎patches/patch1.patch

Lines changed: 48 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
--- opencv/modules/highgui/src/window_QT.h 2018-06-28 13:13:55.119434000 +0300
2-
+++ opencv/modules/highgui/src/window_QT_patched.h 2018-06-30 01:10:16.135894200 +0300
3-
@@ -46,43 +46,48 @@
2+
+++ opencv/modules/highgui/src/window_QT_patched.h 2018-06-30 16:11:10.233722700 +0300
3+
@@ -46,58 +46,64 @@
44
#define QT_NO_DEBUG_OUTPUT
55
#endif
66

7-
+#include <QApplication>
8-
+
9-
#if defined( HAVE_QT_OPENGL )
10-
#include <QtOpenGL>
11-
#include <QGLWidget>
12-
#endif
13-
7+
-#if defined( HAVE_QT_OPENGL )
8+
-#include <QtOpenGL>
9+
-#include <QGLWidget>
10+
-#endif
11+
-
1412
-#include <QAbstractEventDispatcher>
15-
-#include <QApplication>
13+
#include <QApplication>
1614
-#include <QFile>
17-
-#include <QPushButton>
15+
#include <QPushButton>
1816
-#include <QGraphicsView>
1917
-#include <QSizePolicy>
2018
-#include <QInputDialog>
@@ -25,7 +23,7 @@
2523
-#include <QWaitCondition>
2624
-#include <QKeyEvent>
2725
-#include <QMetaObject>
28-
-#include <QPointer>
26+
#include <QPointer>
2927
-#include <QSlider>
3028
-#include <QLabel>
3129
-#include <QIODevice>
@@ -38,17 +36,25 @@
3836
-#include <QToolBar>
3937
-
4038
-#include <QAction>
41-
-#include <QCheckBox>
42-
-#include <QRadioButton>
39+
#include <QCheckBox>
40+
+#include <QSlider>
41+
#include <QRadioButton>
4342
-#include <QButtonGroup>
4443
-#include <QMenu>
45-
-#include <QTest>
44+
+#include <QWidget>
45+
+#include <QGraphicsView>
46+
#include <QTest>
47+
+#include <QVarLengthArray>
48+
+
49+
+#if defined( HAVE_QT_OPENGL )
50+
+#include <QtOpenGL>
51+
+#include <QGLWidget>
52+
+#endif
53+
+
4654
+QT_BEGIN_NAMESPACE
4755
+
4856
+class QAbstractEventDispatcher;
4957
+class QFile;
50-
+class QPushButton;
51-
+class QGraphicsView;
5258
+class QSizePolicy;
5359
+class QInputDialog;
5460
+class QBoxLayout;
@@ -58,26 +64,45 @@
5864
+class QWaitCondition;
5965
+class QKeyEvent;
6066
+class QMetaObject;
61-
+class QPointer;
62-
+class QSlider;
6367
+class QLabel;
6468
+class QIODevice;
6569
+class QShortcut;
6670
+class QStatusBar;
67-
+class QVarLengthArray;
6871
+class QFileInfo;
6972
+class QDate;
7073
+class QFileDialog;
7174
+class QToolBar;
7275
+
7376
+class QAction;
74-
+class QCheckBox;
75-
+class QRadioButton;
7677
+class QButtonGroup;
7778
+class QMenu;
78-
+class QTest;
7979
+
8080
+QT_END_NAMESPACE
8181

8282
//start private enum
8383
enum { CV_MODE_NORMAL = 0, CV_MODE_OPENGL = 1 };
84+
85+
//we can change the keyboard shortcuts from here !
86+
-enum { shortcut_zoom_normal = Qt::CTRL + Qt::Key_Z,
87+
- shortcut_zoom_imgRegion = Qt::CTRL + Qt::Key_X,
88+
- shortcut_save_img = Qt::CTRL + Qt::Key_S,
89+
- shortcut_properties_win = Qt::CTRL + Qt::Key_P,
90+
- shortcut_zoom_in = Qt::CTRL + Qt::Key_Plus,//QKeySequence(QKeySequence::ZoomIn),
91+
- shortcut_zoom_out = Qt::CTRL + Qt::Key_Minus,//QKeySequence(QKeySequence::ZoomOut),
92+
- shortcut_panning_left = Qt::CTRL + Qt::Key_Left,
93+
- shortcut_panning_right = Qt::CTRL + Qt::Key_Right,
94+
- shortcut_panning_up = Qt::CTRL + Qt::Key_Up,
95+
- shortcut_panning_down = Qt::CTRL + Qt::Key_Down
96+
+enum { shortcut_zoom_normal = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Z,
97+
+ shortcut_zoom_imgRegion = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_X,
98+
+ shortcut_save_img = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_S,
99+
+ shortcut_properties_win = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_P,
100+
+ shortcut_zoom_in = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Plus,//QKeySequence(QKeySequence::ZoomIn),
101+
+ shortcut_zoom_out = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Minus,//QKeySequence(QKeySequence::ZoomOut),
102+
+ shortcut_panning_left = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Left,
103+
+ shortcut_panning_right = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Right,
104+
+ shortcut_panning_up = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Up,
105+
+ shortcut_panning_down = QT_NAMESPACE::CTRL + QT_NAMESPACE::Key_Down
106+
};
107+
//end enum
108+

0 commit comments

Comments
 (0)
0