Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c724d612
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c724d612
编写于
10月 21, 2016
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Fix for VTK6.2 issue."
This reverts commit
f45da986
.
上级
17398c1e
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
68 addition
and
167 deletion
+68
-167
modules/viz/src/vtk/vtkCocoaInteractorFix.mm
modules/viz/src/vtk/vtkCocoaInteractorFix.mm
+68
-167
未找到文件。
modules/viz/src/vtk/vtkCocoaInteractorFix.mm
浏览文件 @
c724d612
/*M///////////////////////////////////////////////////////////////////////////////////////
//
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
//
// By downloading, copying, installing or using the software you agree to this license.
// If you do not agree to this license, do not download, install,
// copy or use the software.
//
//
// License Agreement
// For Open Source Computer Vision Library
//
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
// Third party copyrights are property of their respective owners.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// * Redistribution's of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// * Redistribution's in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// * The name of the copyright holders may not be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// This software is provided by the copyright holders and contributors "as is" and
// any express or implied warranties, including, but not limited to, the implied
// warranties of merchantability and fitness for a particular purpose are disclaimed.
// In no event shall the Intel Corporation or contributors be liable for any direct,
// indirect, incidental, special, exemplary, or consequential damages
// (including, but not limited to, procurement of substitute goods or services;
// loss of use, data, or profits; or business interruption) however caused
// and on any theory of liability, whether in contract, strict liability,
// or tort (including negligence or otherwise) arising in any way out of
// the use of this software, even if advised of the possibility of such damage.
//
// Authors:
// * Anatoly Baksheev, Itseez Inc. myname.mysurname <> mycompany.com
//
// This workaround code was taken from PCL library(www.pointclouds.org)
//
// Modified by Jasper Shemilt to work with VTK 6.2
// The fix was needed because GetCocoaServer has been moved from
// vtkCocoaRenderWindowInteractor to vtkCocoaRenderWindow in VTK 6.2.
// This alteration to VTK happened almost a year ago according to the gitHub
// commit a3e9fc9.
//
//M*/
//
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
//
// By downloading, copying, installing or using the software you agree to this license.
// If you do not agree to this license, do not download, install,
// copy or use the software.
//
//
// License Agreement
// For Open Source Computer Vision Library
//
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
// Third party copyrights are property of their respective owners.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// * Redistribution's of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// * Redistribution's in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// * The name of the copyright holders may not be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// This software is provided by the copyright holders and contributors "as is" and
// any express or implied warranties, including, but not limited to, the implied
// warranties of merchantability and fitness for a particular purpose are disclaimed.
// In no event shall the Intel Corporation or contributors be liable for any direct,
// indirect, incidental, special, exemplary, or consequential damages
// (including, but not limited to, procurement of substitute goods or services;
// loss of use, data, or profits; or business interruption) however caused
// and on any theory of liability, whether in contract, strict liability,
// or tort (including negligence or otherwise) arising in any way out of
// the use of this software, even if advised of the possibility of such damage.
//
// Authors:
// * Anatoly Baksheev, Itseez Inc. myname.mysurname <> mycompany.com
//
// This workaround code was taken from PCL library(www.pointclouds.org)
//
//M*/
#import <Cocoa/Cocoa.h>
#include <vtkCocoaRenderWindow.h>
...
...
@@ -124,14 +118,14 @@
[
application
stop
:
application
];
NSEvent
*
event
=
[
NSEvent
otherEventWithType
:
NSApplicationDefined
location:
NSMakePoint
(
0.0
,
0.0
)
modifierFlags:
0
timestamp:
0
windowNumber:
-
1
context:
nil
subtype:
0
data1:
0
data2:
0
];
location:
NSMakePoint
(
0.0
,
0.0
)
modifierFlags:
0
timestamp:
0
windowNumber:
-
1
context:
nil
subtype:
0
data1:
0
data2:
0
];
[
application
postEvent
:
event
atStart
:
YES
];
}
...
...
@@ -160,121 +154,30 @@
//----------------------------------------------------------------------------
#if VTK_MAJOR_VERSION >= 6 && VTK_MINOR_VERSION >=2 || VTK_MAJOR_VERSION >=7
namespace
cv
{
namespace
viz
{
class
vtkCocoaRenderWindowInteractorFix
:
public
vtkCocoaRenderWindowInteractor
{
public:
static
vtkCocoaRenderWindowInteractorFix
*
New
();
vtkTypeMacro
(
vtkCocoaRenderWindowInteractorFix
,
vtkCocoaRenderWindowInteractor
)
virtual
void
Start
();
virtual
void
TerminateApp
();
protected:
vtkCocoaRenderWindowInteractorFix
()
{}
~
vtkCocoaRenderWindowInteractorFix
()
{}
private:
vtkCocoaRenderWindowInteractorFix
(
const
vtkCocoaRenderWindowInteractorFix
&
);
// Not implemented.
void
operator
=
(
const
vtkCocoaRenderWindowInteractorFix
&
);
// Not implemented.
};
vtkStandardNewMacro
(
vtkCocoaRenderWindowInteractorFix
)
vtkSmartPointer
<
vtkRenderWindowInteractor
>
vtkCocoaRenderWindowInteractorNew
();
class
vtkCocoaRenderWindowFix
:
public
vtkCocoaRenderWindow
{
public:
static
vtkCocoaRenderWindowFix
*
New
();
vtkTypeMacro
(
vtkCocoaRenderWindowFix
,
vtkCocoaRenderWindow
)
virtual
vtkCocoaServerFix
*
GetCocoaServer
();
virtual
void
SetCocoaServer
(
void
*
);
protected:
vtkCocoaRenderWindowFix
()
{}
~
vtkCocoaRenderWindowFix
()
{}
private:
vtkCocoaRenderWindowFix
(
const
vtkCocoaRenderWindowInteractorFix
&
);
// Not implemented.
void
operator
=
(
const
vtkCocoaRenderWindowFix
&
);
// Not implemented.
};
vtkStandardNewMacro
(
vtkCocoaRenderWindowFix
)
vtkSmartPointer
<
vtkRenderWindow
>
vtkCocoaRenderWindowNew
();
}}
vtkCocoaServerFix
*
cv
::
viz
::
vtkCocoaRenderWindowFix
::
GetCocoaServer
()
{
return
reinterpret_cast
<
vtkCocoaServerFix
*>
(
this
->
GetCocoaServer
());
}
void
cv
::
viz
::
vtkCocoaRenderWindowFix
::
SetCocoaServer
(
void
*
server
)
{
this
->
SetCocoaServer
(
server
);
}
void
cv
::
viz
::
vtkCocoaRenderWindowInteractorFix
::
Start
()
{
vtkCocoaRenderWindowFix
*
renWin
=
vtkCocoaRenderWindowFix
::
SafeDownCast
(
this
->
GetRenderWindow
());
if
(
renWin
!=
NULL
)
class
vtkCocoaRenderWindowInteractorFix
:
public
vtkCocoaRenderWindowInteractor
{
vtkCocoaServerFix
*
server
=
reinterpret_cast
<
vtkCocoaServerFix
*>
(
renWin
->
GetCocoaServer
());
if
(
!
renWin
->
GetCocoaServer
())
{
server
=
[
vtkCocoaServerFix
cocoaServerWithRenderWindow
:
renWin
];
renWin
->
SetCocoaServer
(
reinterpret_cast
<
void
*>
(
server
));
}
[
server
start
];
}
}
void
cv
::
viz
::
vtkCocoaRenderWindowInteractorFix
::
TerminateApp
()
{
vtkCocoaRenderWindowFix
*
renWin
=
vtkCocoaRenderWindowFix
::
SafeDownCast
(
this
->
RenderWindow
);
if
(
renWin
)
{
vtkCocoaServerFix
*
server
=
reinterpret_cast
<
vtkCocoaServerFix
*>
(
renWin
->
GetCocoaServer
());
[
server
stop
];
}
}
vtkSmartPointer
<
vtkRenderWindowInteractor
>
cv
::
viz
::
vtkCocoaRenderWindowInteractorNew
()
{
return
vtkSmartPointer
<
vtkCocoaRenderWindowInteractorFix
>::
New
();
}
#else
namespace
cv
{
namespace
viz
{
class
vtkCocoaRenderWindowInteractorFix
:
public
vtkCocoaRenderWindowInteractor
{
public:
static
vtkCocoaRenderWindowInteractorFix
*
New
();
vtkTypeMacro
(
vtkCocoaRenderWindowInteractorFix
,
vtkCocoaRenderWindowInteractor
)
public:
static
vtkCocoaRenderWindowInteractorFix
*
New
();
vtkTypeMacro
(
vtkCocoaRenderWindowInteractorFix
,
vtkCocoaRenderWindowInteractor
)
virtual
void
Start
();
virtual
void
TerminateApp
();
virtual
void
Start
();
virtual
void
TerminateApp
();
protected:
vtkCocoaRenderWindowInteractorFix
()
{}
~
vtkCocoaRenderWindowInteractorFix
()
{}
protected:
vtkCocoaRenderWindowInteractorFix
()
{}
~
vtkCocoaRenderWindowInteractorFix
()
{}
private:
vtkCocoaRenderWindowInteractorFix
(
const
vtkCocoaRenderWindowInteractorFix
&
);
// Not implemented.
void
operator
=
(
const
vtkCocoaRenderWindowInteractorFix
&
);
// Not implemented.
};
private:
vtkCocoaRenderWindowInteractorFix
(
const
vtkCocoaRenderWindowInteractorFix
&
);
// Not implemented.
void
operator
=
(
const
vtkCocoaRenderWindowInteractorFix
&
);
// Not implemented.
};
vtkStandardNewMacro
(
vtkCocoaRenderWindowInteractorFix
)
vtkStandardNewMacro
(
vtkCocoaRenderWindowInteractorFix
)
vtkSmartPointer
<
vtkRenderWindowInteractor
>
vtkCocoaRenderWindowInteractorNew
();
}}
vtkSmartPointer
<
vtkRenderWindowInteractor
>
vtkCocoaRenderWindowInteractorNew
();
}}
void
cv
::
viz
::
vtkCocoaRenderWindowInteractorFix
::
Start
()
{
...
...
@@ -306,5 +209,3 @@ vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteract
{
return
vtkSmartPointer
<
vtkCocoaRenderWindowInteractorFix
>::
New
();
}
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录