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
27e99d1c
Commit
27e99d1c
authored
Sep 17, 2022
by
liulongfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 添加手动模式下的映射配置选择
parent
07377d47
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
279 additions
and
47 deletions
+279
-47
Lib/VIZ.Framework.Core.Navigation3D.dll
+0
-0
VIZ.H2V.Domain/ApplicationDomainEx.cs
+6
-0
VIZ.H2V.Domain/Model/Navigation3D/Navigation3DMappingGroupModel.cs
+43
-0
VIZ.H2V.Domain/VIZ.H2V.Domain.csproj
+1
-0
VIZ.H2V.Module/NDIView/Controller/Manual/ManualController.cs
+7
-3
VIZ.H2V.Module/Setup/Provider/AppSetup_InitCsv.cs
+2
-3
VIZ.H2V.Module/Setup/Provider/AppSetup_Navigation3DConfig.cs
+31
-24
VIZ.H2V.Module/SystemSetting/View/StyleSettingPanelView.xaml
+26
-3
VIZ.H2V.Module/SystemSetting/ViewModel/StyleSettingPanelViewModel.cs
+55
-1
VIZ.H2V.Module/VIZ.H2V.Module.csproj
+1
-1
VIZ.H2V.Storage/CSV/CsvContext.cs
+14
-6
VIZ.H2V.Storage/LiteDB/System/SystemConfig.cs
+8
-0
VIZ.H2V/App.xaml.cs
+2
-3
VIZ.H2V/MainWindow.xaml.cs
+1
-0
VIZ.H2V/VIZ.H2V.csproj
+18
-3
VIZ.H2V/config/navigation_3d_mapping/匀速_中等.csv
+4
-0
VIZ.H2V/config/navigation_3d_mapping/匀速_快.csv
+4
-0
VIZ.H2V/config/navigation_3d_mapping/匀速_慢.csv
+4
-0
VIZ.H2V/config/navigation_3d_mapping/变速_中等.csv
+0
-0
VIZ.H2V/config/navigation_3d_mapping/变速_快.csv
+26
-0
VIZ.H2V/config/navigation_3d_mapping/变速_慢.csv
+26
-0
No files found.
Lib/VIZ.Framework.Core.Navigation3D.dll
View file @
27e99d1c
No preview for this file type
VIZ.H2V.Domain/ApplicationDomainEx.cs
View file @
27e99d1c
...
...
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
using
VIZ.Framework.Core
;
using
VIZ.Framework.Domain
;
using
VIZ.H2V.Storage
;
...
...
@@ -22,5 +23,10 @@ namespace VIZ.H2V.Domain
/// CSV数据上下文
/// </summary>
public
static
CsvContext
CsvContext
{
get
;
set
;
}
/// <summary>
/// 3D鼠标映射配置
/// </summary>
public
static
List
<
Navigation3DMapping
>
Navigation3DMapping
{
get
;
set
;
}
}
}
VIZ.H2V.Domain/Model/Navigation3D/Navigation3DMappingGroupModel.cs
0 → 100644
View file @
27e99d1c
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
using
VIZ.Framework.Core
;
namespace
VIZ.H2V.Domain
{
/// <summary>
/// 3D鼠标映射分组模型
/// </summary>
public
class
Navigation3DMappingGroupModel
:
ModelBase
{
#
region
Name
--
名称
private
string
name
;
/// <summary>
/// 名称
/// </summary>
public
string
Name
{
get
{
return
name
;
}
set
{
name
=
value
;
this
.
RaisePropertyChanged
(
nameof
(
Name
));
}
}
#
endregion
#
region
Mappings
--
映射集合
private
List
<
Navigation3DMapping
>
mappings
;
/// <summary>
/// 映射集合
/// </summary>
public
List
<
Navigation3DMapping
>
Mappings
{
get
{
return
mappings
;
}
set
{
mappings
=
value
;
this
.
RaisePropertyChanged
(
nameof
(
Mappings
));
}
}
#
endregion
}
}
VIZ.H2V.Domain/VIZ.H2V.Domain.csproj
View file @
27e99d1c
...
...
@@ -77,6 +77,7 @@
<Compile Include="Model\Algorithm\AlgorithmProcessModel.cs" />
<Compile Include="Model\Algorithm\AlgorithmBorderScenceModel.cs" />
<Compile Include="Model\Algorithm\AlgorithmStrategyModel.cs" />
<Compile Include="Model\Navigation3D\Navigation3DMappingGroupModel.cs" />
<Compile Include="Model\NDI\NDIStreamInfoModel.cs" />
<Compile Include="Model\NDI\NDIStreamDelayInfoModel.cs" />
<Compile Include="Model\Video\VideoGroupModel.cs" />
...
...
VIZ.H2V.Module/NDIView/Controller/Manual/ManualController.cs
View file @
27e99d1c
...
...
@@ -60,11 +60,15 @@ namespace VIZ.H2V.Module
/// <returns>映射值</returns>
public
int
GetMappingValue
()
{
List
<
Navigation3DMapping
>
mappingList
=
ApplicationDomainEx
.
Navigation3DMapping
;
if
(
mappingList
==
null
)
return
1
;
int
symbol
=
Navigation3DManager
.
Info
.
rz
>=
0
?
1
:
-
1
;
int
value
=
Math
.
Abs
(
Navigation3DManager
.
Info
.
rz
);
Navigation3DMapping
first
=
ApplicationDomainEx
.
CsvContext
.
Navigation3DMappings
.
FirstOrDefault
();
Navigation3DMapping
last
=
ApplicationDomainEx
.
CsvContext
.
Navigation3DMappings
.
LastOrDefault
();
Navigation3DMapping
first
=
mappingList
.
FirstOrDefault
();
Navigation3DMapping
last
=
mappingList
.
LastOrDefault
();
if
(
value
==
0
||
value
<
first
.
MinValue
)
{
...
...
@@ -76,7 +80,7 @@ namespace VIZ.H2V.Module
return
last
.
MappingValue
*
symbol
;
}
Navigation3DMapping
mapping
=
ApplicationDomainEx
.
CsvContext
.
Navigation3DMappings
.
FirstOrDefault
(
p
=>
value
>=
p
.
MinValue
&&
value
<
p
.
MaxValue
);
Navigation3DMapping
mapping
=
mappingList
.
FirstOrDefault
(
p
=>
value
>=
p
.
MinValue
&&
value
<
p
.
MaxValue
);
if
(
mapping
==
null
)
return
0
;
...
...
VIZ.H2V.Module/Setup/Provider/AppSetup_InitCsv.cs
View file @
27e99d1c
...
...
@@ -37,15 +37,14 @@ namespace VIZ.H2V.Module
string
algorithm_strategy_path
=
System
.
IO
.
Path
.
Combine
(
AppDomain
.
CurrentDomain
.
BaseDirectory
,
"config"
,
"algorithm_strategy.csv"
);
string
algorithm_border_scence_path
=
System
.
IO
.
Path
.
Combine
(
AppDomain
.
CurrentDomain
.
BaseDirectory
,
"config"
,
"algorithm_border_scene.csv"
);
string
clip_system_path
=
System
.
IO
.
Path
.
Combine
(
AppDomain
.
CurrentDomain
.
BaseDirectory
,
"config"
,
"clip_system.csv"
);
string
navigation_3d_mapping_
path
=
System
.
IO
.
Path
.
Combine
(
AppDomain
.
CurrentDomain
.
BaseDirectory
,
"config"
,
"navigation_3d_mapping.csv
"
);
string
navigation_3d_mapping_
dir
=
System
.
IO
.
Path
.
Combine
(
AppDomain
.
CurrentDomain
.
BaseDirectory
,
"config"
,
"navigation_3d_mapping
"
);
// CSV配置
ApplicationDomainEx
.
CsvContext
=
new
CsvContext
();
ApplicationDomainEx
.
CsvContext
.
LoadAlgorithmStrategys
(
algorithm_strategy_path
);
ApplicationDomainEx
.
CsvContext
.
LoadAlgorithmBorderScenes
(
algorithm_border_scence_path
);
ApplicationDomainEx
.
CsvContext
.
LoadClipSystems
(
clip_system_path
);
ApplicationDomainEx
.
CsvContext
.
LoadNavigation3DMappings
(
navigation_3d_mapping_
path
);
ApplicationDomainEx
.
CsvContext
.
LoadNavigation3DMappings
(
navigation_3d_mapping_
dir
);
// 操作日志
ApplicationDomainEx
.
CsvContext
.
OpenLogOperations
();
...
...
VIZ.H2V.Module/Setup/Provider/AppSetup_Navigation3D
_TCP
.cs
→
VIZ.H2V.Module/Setup/Provider/AppSetup_Navigation3D
Config
.cs
View file @
27e99d1c
using
System
;
using
log4net
;
using
System
;
using
System.Collections.Generic
;
using
System.Diagnostics
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
using
log4net
;
using
System.Windows
;
using
System.Management
;
using
VIZ.Framework.Core
;
using
VIZ.Framework.Domain
;
using
VIZ.Framework.Connection
;
using
VIZ.Framework.Storage
;
using
System.Windows.Media
;
using
VIZ.Framework.Module
;
using
System.Net.Sockets
;
using
VIZ.H2V.Domain
;
using
VIZ.H2V.Storage
;
using
VIZ.H2V.Connection
;
namespace
VIZ.H2V.Module
{
/// <summary>
/// 应用程序启动 -- 3D鼠标
_TCP数据
/// 应用程序启动 -- 3D鼠标
配置
/// </summary>
public
class
AppSetup_Navigation3D
_TCP
:
AppSetupBase
public
class
AppSetup_Navigation3D
Config
:
AppSetupBase
{
/// <summary>
/// 日志
/// </summary>
private
static
ILog
log
=
LogManager
.
GetLogger
(
typeof
(
AppSetup_Navigation3D
_TCP
));
private
static
ILog
log
=
LogManager
.
GetLogger
(
typeof
(
AppSetup_Navigation3D
Config
));
/// <summary>
/// 描述
/// </summary>
public
override
string
Detail
{
get
;
}
=
"应用程序启动 -- 3D鼠标_TCP数据"
;
/// <summary>
/// 3D 鼠标TCP监听地址
/// </summary>
public
static
readonly
string
APPLICATION_3D_MOUSE_TCP_IP
=
ApplicationDomain
.
IniStorage
.
GetValue
<
ApplicationConfig
,
string
>(
p
=>
p
.
APPLICATION_3D_MOUSE_TCP_IP
);
/// <summary>
/// 3D 鼠标TCP监听端口
/// </summary>
public
static
readonly
int
APPLICATION_3D_MOUSE_TCP_PORT
=
ApplicationDomain
.
IniStorage
.
GetValue
<
ApplicationConfig
,
int
>(
p
=>
p
.
APPLICATION_3D_MOUSE_TCP_PORT
);
public
override
string
Detail
{
get
;
}
=
"应用程序启动 -- 3D鼠标配置"
;
/// <summary>
/// 执行启动
...
...
@@ -47,10 +38,26 @@ namespace VIZ.H2V.Module
/// <returns>是否成功执行</returns>
public
override
bool
Setup
(
AppSetupContext
context
)
{
Navigation3DTcpListener
listener
=
new
Navigation3DTcpListener
(
APPLICATION_3D_MOUSE_TCP_IP
,
APPLICATION_3D_MOUSE_TCP_PORT
,
ApplicationDomainEx
.
CsvContext
.
Navigation3DMappings
);
ConnectionManager
.
TcpConnectionListeners
[
Navigation3DTcpListener
.
LISTENER_KEY
]
=
listener
;
SystemConfig
config
=
ApplicationDomainEx
.
LiteDbContext
.
SystemConfig
.
FindAll
().
FirstOrDefault
();
if
(
config
==
null
)
return
false
;
listener
.
Start
();
// 首次启动没有3D鼠标映射配置
if
(
string
.
IsNullOrWhiteSpace
(
config
.
ManualNavigation3DMappingName
)
||
!
ApplicationDomainEx
.
CsvContext
.
Navigation3DMappingDic
.
ContainsKey
(
config
.
ManualNavigation3DMappingName
))
{
var
kv
=
ApplicationDomainEx
.
CsvContext
.
Navigation3DMappingDic
.
FirstOrDefault
();
if
(
kv
.
Value
==
null
)
return
false
;
config
.
ManualNavigation3DMappingName
=
kv
.
Key
;
ApplicationDomainEx
.
Navigation3DMapping
=
kv
.
Value
;
ApplicationDomainEx
.
LiteDbContext
.
SystemConfig
.
Update
(
config
);
return
true
;
}
ApplicationDomainEx
.
Navigation3DMapping
=
ApplicationDomainEx
.
CsvContext
.
Navigation3DMappingDic
[
config
.
ManualNavigation3DMappingName
];
return
true
;
}
...
...
@@ -61,7 +68,7 @@ namespace VIZ.H2V.Module
/// <param name="context">应用程序启动上下文</param>
public
override
void
Shutdown
(
AppSetupContext
context
)
{
ConnectionManager
.
TcpConnectionListeners
[
Navigation3DTcpListener
.
LISTENER_KEY
].
Dispose
();
}
}
}
VIZ.H2V.Module/SystemSetting/View/StyleSettingPanelView.xaml
View file @
27e99d1c
...
...
@@ -38,6 +38,7 @@
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<!-- 剪切框颜色 -->
...
...
@@ -82,9 +83,29 @@
<TextBlock Text="手动校准颜色" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<fcommon:ColorPickButton Grid.Column="1" Color="{Binding Path=ManualCorrectionColor,Mode=TwoWay}" Height="30" Grid.Row="2"></fcommon:ColorPickButton>
</Grid>
<!-- 裁切框移动 -->
<TextBlock Text="手动裁切框移动" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="4"></TextBlock>
<Grid Grid.Row="5">
<Rectangle Grid.Row="3" Height="1" VerticalAlignment="Bottom" Fill="#ff3d4758"></Rectangle>
<!-- 手动裁切框移动方案 -->
<Grid Grid.Row="4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="200"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<TextBlock Text="手动裁切框移动方案" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="2"></TextBlock>
<ComboBox Style="{StaticResource ComboBox_Setting}" Grid.Column="1" Height="40"
ItemsSource="{Binding Path=Navigation3DMappingGroupModelItems,Mode=OneWay}"
SelectedValue="{Binding Path=SelectedNavigation3DMappingGroupModel,Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate>
<Border Background="Transparent" IsHitTestVisible="False">
<TextBlock Text="{Binding Path=Name}" Foreground="White" FontSize="16"></TextBlock>
</Border>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</Grid>
<!-- 手动裁切框移动 -->
<TextBlock Text="手动裁切框移动" Foreground="White" FontSize="18" VerticalAlignment="Center" Grid.Row="5"></TextBlock>
<Grid Grid.Row="6">
<Grid.RowDefinitions>
<RowDefinition Height="30"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
...
...
@@ -106,6 +127,7 @@
MinValue="0.001" MaxValue="0.2" Interval="0.001"
Value="{Binding Path=ManualSmoothCoeff,Mode=TwoWay}"></fcommon:NumberBox>
</Grid>
</Grid>
</Border>
</UserControl>
\ No newline at end of file
VIZ.H2V.Module/SystemSetting/ViewModel/StyleSettingPanelViewModel.cs
View file @
27e99d1c
...
...
@@ -118,6 +118,34 @@ namespace VIZ.H2V.Module
#
endregion
#
region
Navigation3DMappingGroupModelItems
--
3D
鼠标映射分组模型集合
private
List
<
Navigation3DMappingGroupModel
>
navigation3DMappingGroupModelItems
;
/// <summary>
/// 3D鼠标映射分组模型集合
/// </summary>
public
List
<
Navigation3DMappingGroupModel
>
Navigation3DMappingGroupModelItems
{
get
{
return
navigation3DMappingGroupModelItems
;
}
set
{
navigation3DMappingGroupModelItems
=
value
;
this
.
RaisePropertyChanged
(
nameof
(
Navigation3DMappingGroupModelItems
));
}
}
#
endregion
#
region
SelectedNavigation3DMappingGroupModel
--
当前选中的
3D
鼠标映射分组模型
private
Navigation3DMappingGroupModel
selectedNavigation3DMappingGroupModel
;
/// <summary>
/// 当前选中的3D鼠标映射分组模型
/// </summary>
public
Navigation3DMappingGroupModel
SelectedNavigation3DMappingGroupModel
{
get
{
return
selectedNavigation3DMappingGroupModel
;
}
set
{
selectedNavigation3DMappingGroupModel
=
value
;
this
.
RaisePropertyChanged
(
nameof
(
SelectedNavigation3DMappingGroupModel
));
}
}
#
endregion
// ======================================================================================
// === Commond ===
// ======================================================================================
...
...
@@ -146,6 +174,28 @@ namespace VIZ.H2V.Module
this
.
ManualCorrectionColor
=
(
Color
)
ColorConverter
.
ConvertFromString
(
this
.
SystemConfig
.
ManualCorrectionColor
);
this
.
ManualSmoothCoeff
=
this
.
SystemConfig
.
ManualSmoothCoeff
;
// 加载3D鼠标映射模型
this
.
Load3DNavigationMapping
();
}
/// <summary>
/// 加载3D鼠标映射模型
/// </summary>
private
void
Load3DNavigationMapping
()
{
List
<
Navigation3DMappingGroupModel
>
items
=
new
List
<
Navigation3DMappingGroupModel
>();
foreach
(
var
kv
in
ApplicationDomainEx
.
CsvContext
.
Navigation3DMappingDic
)
{
Navigation3DMappingGroupModel
model
=
new
Navigation3DMappingGroupModel
();
model
.
Name
=
kv
.
Key
;
model
.
Mappings
=
kv
.
Value
;
items
.
Add
(
model
);
}
this
.
Navigation3DMappingGroupModelItems
=
items
;
this
.
SelectedNavigation3DMappingGroupModel
=
items
.
FirstOrDefault
(
p
=>
p
.
Name
==
this
.
SystemConfig
.
ManualNavigation3DMappingName
);
}
#
endregion
...
...
@@ -178,6 +228,9 @@ namespace VIZ.H2V.Module
if
(
this
.
ManualSmoothCoeff
!=
this
.
SystemConfig
.
ManualSmoothCoeff
)
return
true
;
if
(
this
.
SelectedNavigation3DMappingGroupModel
.
Name
!=
this
.
SystemConfig
.
ManualNavigation3DMappingName
)
return
true
;
return
false
;
}
...
...
@@ -194,6 +247,7 @@ namespace VIZ.H2V.Module
this
.
SystemConfig
.
BorderSceneColor
=
this
.
BorderSceneColor
.
ToString
();
this
.
SystemConfig
.
ManualCorrectionColor
=
this
.
ManualCorrectionColor
.
ToString
();
this
.
SystemConfig
.
ManualSmoothCoeff
=
this
.
ManualSmoothCoeff
;
this
.
SystemConfig
.
ManualNavigation3DMappingName
=
this
.
SelectedNavigation3DMappingGroupModel
.
Name
;
ApplicationDomainEx
.
LiteDbContext
.
SystemConfig
.
Update
(
this
.
SystemConfig
);
...
...
@@ -203,7 +257,7 @@ namespace VIZ.H2V.Module
p
.
LoadStyle
();
p
.
LoadClipBoxSmooth
(
this
.
ManualSmoothCoeff
);
});
//Navigation3DManager.Navigation3DModel.IsUseSmooth = this.IsManualUseSmooth
;
ApplicationDomainEx
.
Navigation3DMapping
=
this
.
SelectedNavigation3DMappingGroupModel
.
Mappings
;
// 返回
return
true
;
...
...
VIZ.H2V.Module/VIZ.H2V.Module.csproj
View file @
27e99d1c
...
...
@@ -247,10 +247,10 @@
<Compile Include="NDIView\VieweModel\NDIViewModel.Property.cs" />
<Compile Include="NDIView\VieweModel\NDIViewModel.cs" />
<Compile Include="NDIView\VieweModel\Part\NDIViewToolPartViewModel.cs" />
<Compile Include="Setup\Provider\AppSetup_Navigation3DConfig.cs" />
<Compile Include="Setup\Provider\AppSetup_Algorithm.cs" />
<Compile Include="Setup\Provider\AppSetup_Recording.cs" />
<Compile Include="Setup\Provider\AppSetup_InitUDP.cs" />
<Compile Include="Setup\Provider\AppSetup_Navigation3D_TCP.cs" />
<Compile Include="SystemSetting\ViewModel\HotkeySettingPanelViewModel.cs" />
<Compile Include="SystemSetting\ViewModel\AboutPanelViewModel.cs" />
<Compile Include="SystemSetting\ViewModel\ISystemSetting.cs" />
...
...
VIZ.H2V.Storage/CSV/CsvContext.cs
View file @
27e99d1c
...
...
@@ -40,7 +40,7 @@ namespace VIZ.H2V.Storage
/// 3D鼠标映射
/// </summary>
[
Csv
(
Scene
=
CsvScene
.
Read
)]
public
List
<
Navigation3DMapping
>
Navigation3DMappings
{
get
;
private
set
;
}
public
Dictionary
<
string
,
List
<
Navigation3DMapping
>>
Navigation3DMappingDic
{
get
;
private
set
;
}
=
new
Dictionary
<
string
,
List
<
Navigation3DMapping
>>();
/// <summary>
/// 操作日志
...
...
@@ -90,13 +90,21 @@ namespace VIZ.H2V.Storage
/// <summary>
/// 加载3D鼠标映射
/// </summary>
/// <param name="
path">文件
路径</param>
public
void
LoadNavigation3DMappings
(
string
path
)
/// <param name="
dir">配置文件所在文件夹
路径</param>
public
void
LoadNavigation3DMappings
(
string
dir
)
{
using
(
StreamReader
sr
=
new
StreamReader
(
path
,
Encoding
.
Default
))
using
(
CsvReader
reader
=
new
CsvReader
(
sr
,
CultureInfo
.
InvariantCulture
))
string
[]
files
=
Directory
.
GetFiles
(
dir
,
"*.csv"
);
foreach
(
string
file
in
files
)
{
this
.
Navigation3DMappings
=
reader
.
GetRecords
<
Navigation3DMapping
>()?.
ToList
();
using
(
StreamReader
sr
=
new
StreamReader
(
file
,
Encoding
.
Default
))
using
(
CsvReader
reader
=
new
CsvReader
(
sr
,
CultureInfo
.
InvariantCulture
))
{
string
name
=
Path
.
GetFileNameWithoutExtension
(
file
);
List
<
Navigation3DMapping
>
list
=
reader
.
GetRecords
<
Navigation3DMapping
>()?.
ToList
();
this
.
Navigation3DMappingDic
[
name
]
=
list
;
}
}
}
...
...
VIZ.H2V.Storage/LiteDB/System/SystemConfig.cs
View file @
27e99d1c
...
...
@@ -46,5 +46,13 @@ namespace VIZ.H2V.Storage
/// 手动裁切平滑系数
/// </summary>
public
double
ManualSmoothCoeff
{
get
;
set
;
}
=
0.07
;
/// <summary>
/// 手动裁切映射配置名称
/// </summary>
/// <remarks>
/// 手动裁切配置文件在 config/navigation_3d_mapping/ 文件夹下
/// </remarks>
public
string
ManualNavigation3DMappingName
{
get
;
set
;
}
}
}
VIZ.H2V/App.xaml.cs
View file @
27e99d1c
...
...
@@ -32,15 +32,14 @@ namespace VIZ.H2V
AppSetup
.
AppendSetup
(
new
AppSetup_Algorithm
());
// 初始化UDP
AppSetup
.
AppendSetup
(
new
AppSetup_InitUDP
());
// 初始化3D鼠标
//AppSetup.AppendSetup(new AppSetup_Navigation3D_TCP
());
// 初始化3D鼠标
配置
AppSetup
.
AppendSetup
(
new
AppSetup_Navigation3DConfig
());
// 初始化系统监控
AppSetup
.
AppendLoad
(
new
AppSetup_Monitor
());
// 初始化3D鼠标
AppSetup
.
AppendLoad
(
new
AppSetup_Navigation3D
());
// 执行启动流程
AppSetupContext
context
=
AppSetup
.
Setup
();
...
...
VIZ.H2V/MainWindow.xaml.cs
View file @
27e99d1c
...
...
@@ -42,6 +42,7 @@ namespace VIZ.H2V
if
(!
context
.
IsSuccess
)
{
MessageBox
.
Show
(
$"执行
{
context
.
ProviderDetail
}
失败"
);
Environment
.
Exit
(-
1
);
}
}
...
...
VIZ.H2V/VIZ.H2V.csproj
View file @
27e99d1c
...
...
@@ -152,9 +152,6 @@
<None Include="config\algorithm_strategy.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="config\navigation_3d_mapping.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="config\clip_system.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
...
...
@@ -164,6 +161,24 @@
<None Include="config\log.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="config\navigation_3d_mapping\匀速_快.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="config\navigation_3d_mapping\匀速_中等.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="config\navigation_3d_mapping\匀速_慢.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="config\navigation_3d_mapping\变速_快.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="config\navigation_3d_mapping\变速_中等.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="config\navigation_3d_mapping\变速_慢.csv">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
...
...
VIZ.H2V/config/navigation_3d_mapping/匀速_中等.csv
0 → 100644
View file @
27e99d1c
ID,MinValue,MaxValue,MappingValue
ID,MinValue,MaxValue,MappingValue
1,100,9999,10
\ No newline at end of file
VIZ.H2V/config/navigation_3d_mapping/匀速_快.csv
0 → 100644
View file @
27e99d1c
ID,MinValue,MaxValue,MappingValue
ID,MinValue,MaxValue,MappingValue
1,100,9999,30
\ No newline at end of file
VIZ.H2V/config/navigation_3d_mapping/匀速_慢.csv
0 → 100644
View file @
27e99d1c
ID,MinValue,MaxValue,MappingValue
ID,MinValue,MaxValue,MappingValue
1,100,9999,3
\ No newline at end of file
VIZ.H2V/config/navigation_3d_mapping.csv
→
VIZ.H2V/config/navigation_3d_mapping
/变速_中等
.csv
View file @
27e99d1c
File moved
VIZ.H2V/config/navigation_3d_mapping/变速_快.csv
0 → 100644
View file @
27e99d1c
ID,MinValue,MaxValue,MappingValue
ID,MinValue,MaxValue,MappingValue
1,100,200,1
2,200,300,2
3,300,400,3
4,400,500,4
5,500,600,5
6,600,700,6
7,700,800,7
8,800,900,8
9,900,1000,9
10,1000,1100,10
11,1100,1200,12
12,1200,1300,14
13,1300,1400,16
14,1400,1500,18
15,1500,1600,20
16,1600,1700,23
17,1700,1800,26
18,1800,1900,29
19,1900,2000,32
20,2000,2100,36
21,2100,2200,40
22,2200,2300,45
23,2300,2400,50
\ No newline at end of file
VIZ.H2V/config/navigation_3d_mapping/变速_慢.csv
0 → 100644
View file @
27e99d1c
ID,MinValue,MaxValue,MappingValue
ID,MinValue,MaxValue,MappingValue
1,100,200,1
2,200,300,2
3,300,400,3
4,400,500,4
5,500,600,5
6,600,700,6
7,700,800,7
8,800,900,8
9,900,1000,9
10,1000,1100,10
11,1100,1200,12
12,1200,1300,14
13,1300,1400,16
14,1400,1500,18
15,1500,1600,20
16,1600,1700,23
17,1700,1800,26
18,1800,1900,29
19,1900,2000,32
20,2000,2100,36
21,2100,2200,40
22,2200,2300,45
23,2300,2400,50
\ 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