Commit a7e99166 authored by Jan Kremer's avatar Jan Kremer

Fixed histogram brushing selecting wrong points in 3D plot.

parent 7975630d
...@@ -56,9 +56,6 @@ DoubleClickTime=0.200000 ...@@ -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_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="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="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="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="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) +ActionMappings=(ActionName="ToggleInverted",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Zero)
...@@ -77,7 +74,7 @@ DoubleClickTime=0.200000 ...@@ -77,7 +74,7 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=NumPadEight) +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="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="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_MoveX",Scale=1.000000,Key=W)
+AxisMappings=(AxisName="NonVR_MoveY",Scale=-1.000000,Key=A) +AxisMappings=(AxisName="NonVR_MoveY",Scale=-1.000000,Key=A)
+AxisMappings=(AxisName="NonVR_Turn",Scale=1.000000,Key=MouseX) +AxisMappings=(AxisName="NonVR_Turn",Scale=1.000000,Key=MouseX)
......
...@@ -53,9 +53,6 @@ ActionMappings=(ActionName="SelectMode_OnePlane",bShift=False,bCtrl=False,bAlt=F ...@@ -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_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="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="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="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="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) 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, ...@@ -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="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="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="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_MoveX",Scale=1.000000,Key=W)
AxisMappings=(AxisName="NonVR_MoveY",Scale=-1.000000,Key=A) AxisMappings=(AxisName="NonVR_MoveY",Scale=-1.000000,Key=A)
AxisMappings=(AxisName="NonVR_Turn",Scale=1.000000,Key=MouseX) AxisMappings=(AxisName="NonVR_Turn",Scale=1.000000,Key=MouseX)
......
This diff is collapsed.
...@@ -54,7 +54,7 @@ void APlot3D::OnLoadStep(bool KeepBrushedIndexes) ...@@ -54,7 +54,7 @@ void APlot3D::OnLoadStep(bool KeepBrushedIndexes)
SetActorScale3D(FVector(Data->DataScaleFactor, Data->DataScaleFactor, Data->DataScaleFactor)); SetActorScale3D(FVector(Data->DataScaleFactor, Data->DataScaleFactor, Data->DataScaleFactor));
UpdateSpriteSize(false); UpdateSpriteSize(false);
UpdatePoints(KeepBrushedIndexes); UpdatePoints(KeepBrushedIndexes);
RebuildCloud(); // TODO needed? RebuildCloud();
} }
void APlot3D::UpdatePoints(bool KeepBrushedIndexes) void APlot3D::UpdatePoints(bool KeepBrushedIndexes)
...@@ -102,7 +102,7 @@ void APlot3D::BrushPoints(TArray<int32> BrushPoints, bool Rebuild) ...@@ -102,7 +102,7 @@ void APlot3D::BrushPoints(TArray<int32> BrushPoints, bool Rebuild)
{ {
for (int i = 0; i < BrushPoints.Num(); ++i) for (int i = 0; i < BrushPoints.Num(); ++i)
{ {
BrushPoint(BrushPoints[i], Data->IsBrushed[i]); BrushPoint(BrushPoints[i], Data->IsBrushed[BrushPoints[i]]);
} }
if (Rebuild) if (Rebuild)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment