Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
ufdvw
ImmersiveAnalytics
Commits
a7e99166
Commit
a7e99166
authored
Apr 24, 2019
by
Jan Kremer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed histogram brushing selecting wrong points in 3D plot.
parent
7975630d
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
11 deletions
+5
-11
Config/DefaultInput.ini
Config/DefaultInput.ini
+1
-4
Content/BP_PawnBase.uasset
Content/BP_PawnBase.uasset
+0
-0
Content/W_MainMenu.uasset
Content/W_MainMenu.uasset
+0
-0
Intermediate/Config/CoalescedSourceConfigs/Input.ini
Intermediate/Config/CoalescedSourceConfigs/Input.ini
+1
-4
Saved/Config/Windows/Editor.ini
Saved/Config/Windows/Editor.ini
+1
-1
Source/ImmersiveAnalytics/Plot3D.cpp
Source/ImmersiveAnalytics/Plot3D.cpp
+2
-2
No files found.
Config/DefaultInput.ini
View file @
a7e99166
...
...
@@ -56,9 +56,6 @@ DoubleClickTime=0.200000
+
ActionMappings
=
(ActionName="SelectMode_TwoPlanes",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_Thumbstick_Left)
+
ActionMappings
=
(ActionName="SelectMode_Sphere",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_Thumbstick_Up)
+
ActionMappings
=
(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=BackSpace)
+
ActionMappings
=
(ActionName="ToggleAdditive",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_FaceButton1)
+
ActionMappings
=
(ActionName="ToggleInverted",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_FaceButton2)
+
ActionMappings
=
(ActionName="NewScatterPlot",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=N)
+
ActionMappings
=
(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger)
+
ActionMappings
=
(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger)
+
ActionMappings
=
(ActionName="ToggleInverted",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Zero)
...
...
@@ -77,7 +74,7 @@ DoubleClickTime=0.200000
+
ActionMappings
=
(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=NumPadEight)
+
ActionMappings
=
(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=NumPadFive)
+
ActionMappings
=
(ActionName="ToggleMainMenu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Enter)
+
ActionMappings
=
(ActionName="
NewHistogram
",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=
M
)
+
ActionMappings
=
(ActionName="
SelectMode_Box
",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=
Four
)
+
AxisMappings
=
(AxisName="NonVR_MoveX",Scale=1.000000,Key=W)
+
AxisMappings
=
(AxisName="NonVR_MoveY",Scale=-1.000000,Key=A)
+
AxisMappings
=
(AxisName="NonVR_Turn",Scale=1.000000,Key=MouseX)
...
...
Content/BP_PawnBase.uasset
View file @
a7e99166
No preview for this file type
Content/W_MainMenu.uasset
View file @
a7e99166
No preview for this file type
Intermediate/Config/CoalescedSourceConfigs/Input.ini
View file @
a7e99166
...
...
@@ -53,9 +53,6 @@ ActionMappings=(ActionName="SelectMode_OnePlane",bShift=False,bCtrl=False,bAlt=F
ActionMappings
=
(ActionName="SelectMode_TwoPlanes",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_Thumbstick_Left)
ActionMappings
=
(ActionName="SelectMode_Sphere",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_Thumbstick_Up)
ActionMappings
=
(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=BackSpace)
ActionMappings
=
(ActionName="ToggleAdditive",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_FaceButton1)
ActionMappings
=
(ActionName="ToggleInverted",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_FaceButton2)
ActionMappings
=
(ActionName="NewScatterPlot",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=N)
ActionMappings
=
(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_LeftTrigger)
ActionMappings
=
(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightTrigger)
ActionMappings
=
(ActionName="ToggleInverted",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Zero)
...
...
@@ -74,7 +71,7 @@ ActionMappings=(ActionName="ToggleMainMenu",bShift=False,bCtrl=False,bAlt=False,
ActionMappings
=
(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=NumPadEight)
ActionMappings
=
(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=NumPadFive)
ActionMappings
=
(ActionName="ToggleMainMenu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Enter)
ActionMappings
=
(ActionName="
NewHistogram
",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=
M
)
ActionMappings
=
(ActionName="
SelectMode_Box
",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=
Four
)
AxisMappings
=
(AxisName="NonVR_MoveX",Scale=1.000000,Key=W)
AxisMappings
=
(AxisName="NonVR_MoveY",Scale=-1.000000,Key=A)
AxisMappings
=
(AxisName="NonVR_Turn",Scale=1.000000,Key=MouseX)
...
...
Saved/Config/Windows/Editor.ini
View file @
a7e99166
This diff is collapsed.
Click to expand it.
Source/ImmersiveAnalytics/Plot3D.cpp
View file @
a7e99166
...
...
@@ -54,7 +54,7 @@ void APlot3D::OnLoadStep(bool KeepBrushedIndexes)
SetActorScale3D
(
FVector
(
Data
->
DataScaleFactor
,
Data
->
DataScaleFactor
,
Data
->
DataScaleFactor
));
UpdateSpriteSize
(
false
);
UpdatePoints
(
KeepBrushedIndexes
);
RebuildCloud
();
// TODO needed?
RebuildCloud
();
}
void
APlot3D
::
UpdatePoints
(
bool
KeepBrushedIndexes
)
...
...
@@ -102,7 +102,7 @@ void APlot3D::BrushPoints(TArray<int32> BrushPoints, bool Rebuild)
{
for
(
int
i
=
0
;
i
<
BrushPoints
.
Num
();
++
i
)
{
BrushPoint
(
BrushPoints
[
i
],
Data
->
IsBrushed
[
i
]);
BrushPoint
(
BrushPoints
[
i
],
Data
->
IsBrushed
[
BrushPoints
[
i
]
]);
}
if
(
Rebuild
)
...
...
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