Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
VIZ.H2V
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘龙飞
VIZ.H2V
Commits
5067ead6
Commit
5067ead6
authored
Aug 31, 2022
by
liulongfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
取消日志
parent
2d8be559
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
49 deletions
+9
-49
VIZ.H2V.ClipTestTool/ViewModel/MainViewModel.cs
+0
-5
VIZ.H2V.Connection/UDP/Algorithm/Provider/AlgorithmProvider__crop_roi..cs
+0
-8
VIZ.H2V.Connection/UDP/Clip/Sender/ClipSender.cs
+0
-5
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Manual_NDI.cs
+0
-14
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Message.cs
+0
-8
VIZ.H2V/config/navigation_3d_mapping.csv
+9
-9
No files found.
VIZ.H2V.ClipTestTool/ViewModel/MainViewModel.cs
View file @
5067ead6
...
@@ -280,11 +280,6 @@ namespace VIZ.H2V.ClipTestTool
...
@@ -280,11 +280,6 @@ namespace VIZ.H2V.ClipTestTool
info
.
SrcRect
=
new
SharpDX
.
Mathematics
.
Interop
.
RawRectangleF
(
this
.
ClipX
,
0
,
this
.
ClipX
+
810
,
e
.
Frame
.
Height
);
info
.
SrcRect
=
new
SharpDX
.
Mathematics
.
Interop
.
RawRectangleF
(
this
.
ClipX
,
0
,
this
.
ClipX
+
810
,
e
.
Frame
.
Height
);
view
.
video
.
UpdateClipBox
(
info
);
view
.
video
.
UpdateClipBox
(
info
);
#if DEBUG
//Debug.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fffffff")} MappingValue {Navigation3DTcpManager.MappingValue}");
//log.Debug($"【渲染视频帧】 时间: {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fffffff")} 帧时间戳:{e.Frame.TimeStamp}");
#endif
UdpEndpointManager
manager
=
conn
.
GetEndpointManager
(
"UDP"
);
UdpEndpointManager
manager
=
conn
.
GetEndpointManager
(
"UDP"
);
if
(
manager
==
null
)
if
(
manager
==
null
)
return
;
return
;
...
...
VIZ.H2V.Connection/UDP/Algorithm/Provider/AlgorithmProvider__crop_roi..cs
View file @
5067ead6
...
@@ -49,14 +49,6 @@ namespace VIZ.H2V.Connection
...
@@ -49,14 +49,6 @@ namespace VIZ.H2V.Connection
}
}
message
.
borderline
=
package
.
borderline
;
message
.
borderline
=
package
.
borderline
;
//#if DEBUG
// if (package.id.Contains(NDIViewKeys.CAM_1))
// {
// log.Debug($"【获取裁切框】 时间: {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fffffff")} 帧时间戳:{package.timecode} ------------");
// }
// //Debug.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fffffff")} MappingValue {Navigation3DTcpManager.MappingValue}");
//#endif
ApplicationDomainEx
.
MessageManager
.
Send
(
message
);
ApplicationDomainEx
.
MessageManager
.
Send
(
message
);
}
}
}
}
...
...
VIZ.H2V.Connection/UDP/Clip/Sender/ClipSender.cs
View file @
5067ead6
...
@@ -37,11 +37,6 @@ namespace VIZ.H2V.Connection
...
@@ -37,11 +37,6 @@ namespace VIZ.H2V.Connection
package
.
timecode
=
timeCode
;
package
.
timecode
=
timeCode
;
manager
.
SendJson
(
package
);
manager
.
SendJson
(
package
);
#if DEBUG
log
.
Debug
(
$"
{
Newtonsoft
.
Json
.
JsonConvert
.
SerializeObject
(
package
)}
||
{
DateTime
.
Now
.
ToString
(
"yyyy-MM-dd HH-mm-ss.fffffff"
)}
"
);
#endif
}
}
}
}
}
}
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Manual_NDI.cs
View file @
5067ead6
...
@@ -40,20 +40,6 @@ namespace VIZ.H2V.Module
...
@@ -40,20 +40,6 @@ namespace VIZ.H2V.Module
this
.
ClipBoxX
=
this
.
GetClipX
(
renderInfo
);
this
.
ClipBoxX
=
this
.
GetClipX
(
renderInfo
);
this
.
ManualController
.
Reset
(
this
.
ClipBoxX
.
Value
);
this
.
ManualController
.
Reset
(
this
.
ClipBoxX
.
Value
);
//if (this.ClipBoxX == null)
//{
// this.ClipBoxX = renderInfo.Frame.Width / 2d - this.CLIP_BOX_WIDTH / 2d;
//}
//double p = (renderInfo.Frame.Width - this.CLIP_BOX_WIDTH) / (2 * Navigation3DManager.Navigation3DModel.MaxX);
//double x = this.ClipBoxX.Value / p - Navigation3DManager.Navigation3DModel.MaxX;
//Navigation3DManager.Navigation3DModel.Reset((int)x);
//#if DEBUG
// Debug.WriteLine($"========== Reset3DMouse | ClipBoxX={this.ClipBoxX.Value} | x={x} ==========");
//#endif
}
}
/// <summary>
/// <summary>
...
...
VIZ.H2V.Module/NDIView/VieweModel/NDIViewModel.Message.cs
View file @
5067ead6
...
@@ -160,14 +160,6 @@ namespace VIZ.H2V.Module
...
@@ -160,14 +160,6 @@ namespace VIZ.H2V.Module
// 更新算法帧率统计
// 更新算法帧率统计
this
.
AlgorithmFPS
.
CalcFps
();
this
.
AlgorithmFPS
.
CalcFps
();
//#if DEBUG
// if (this.ViewKey == NDIViewKeys.CAM_1)
// {
// log.Debug($"【渲染裁切框】 时间: {DateTime.Now.ToString("yyyy*MM*dd HH:mm:ss.fffffff")} 帧时间戳:{msg.timecode} ************");
// }
// //Debug.WriteLine($"{DateTime.Now.ToString("yyyy*MM*dd HH:mm:ss.fffffff")} MappingValue {Navigation3DTcpManager.MappingValue}");
//#endif
}
}
/// <summary>
/// <summary>
...
...
VIZ.H2V/config/navigation_3d_mapping.csv
View file @
5067ead6
...
@@ -14,11 +14,11 @@ ID,MinValue,MaxValue,MappingValue
...
@@ -14,11 +14,11 @@ ID,MinValue,MaxValue,MappingValue
13,1300,1400,16
13,1300,1400,16
14,1400,1500,18
14,1400,1500,18
15,1500,1600,20
15,1500,1600,20
16,1600,1700,22
16,1600,1700,23
17,1700,1800,24
17,1700,1800,26
18,1800,1900,26
18,1800,1900,29
19,1900,2000,28
19,1900,2000,32
20,2000,2100,30
20,2000,2100,36
21,2100,2200,32
21,2100,2200,40
22,2200,2300,34
22,2200,2300,45
23,2300,2400,36
23,2300,2400,50
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment