Commit 5bab7504 authored by Jan Kremer's avatar Jan Kremer
Browse files

Working on 2D plots. Brushing, Linking, histogram, etc.

parent 40550007
......@@ -58,7 +58,7 @@ DoubleClickTime=0.200000
+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="New2DPlot",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=N)
+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)
......@@ -71,7 +71,13 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="InterfaceClickRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_FaceButton1)
+ActionMappings=(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_Trigger)
+ActionMappings=(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_Trigger)
+ActionMappings=(ActionName="New2DPlot",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_Special_Right)
+ActionMappings=(ActionName="InterfaceClickLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Z)
+ActionMappings=(ActionName="InterfaceClickRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X)
+ActionMappings=(ActionName="ToggleMainMenu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_Special_Right)
+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)
+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)
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -55,7 +55,7 @@ ActionMappings=(ActionName="SelectMode_Sphere",bShift=False,bCtrl=False,bAlt=Fal
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="New2DPlot",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=N)
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)
......@@ -68,7 +68,13 @@ ActionMappings=(ActionName="InterfaceClickLeft",bShift=False,bCtrl=False,bAlt=Fa
ActionMappings=(ActionName="InterfaceClickRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_FaceButton1)
ActionMappings=(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Left_Trigger)
ActionMappings=(ActionName="Brush",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MotionController_Right_Trigger)
ActionMappings=(ActionName="New2DPlot",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_Special_Right)
ActionMappings=(ActionName="InterfaceClickLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Z)
ActionMappings=(ActionName="InterfaceClickRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X)
ActionMappings=(ActionName="ToggleMainMenu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_Special_Right)
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)
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)
......
This diff is collapsed.
......@@ -50,12 +50,4 @@ bHQBuffer=False
bHQDistortion=False
bUpdateOnRT=True
[WindowsApplication.Accessibility]
StickyKeysHotkey=False
ToggleKeysHotkey=False
FilterKeysHotkey=False
StickyKeysConfirmation=False
ToggleKeysConfirmation=False
FilterKeysConfirmation=False
// Fill out your copyright notice in the Description page of Project Settings.
#include "MyObject.h"
// Fill out your copyright notice in the Description page of Project Settings.
#pragma once
#include "CoreMinimal.h"
#include "UObject/NoExportTypes.h"
#include "MyObject.generated.h"
UENUM(BlueprintType) //"BlueprintType" is essential to include
enum class EAxisType : uint8
{
X, Y, Z, U, V, W, LengthUVW, Count
};
/**
*
*/
UCLASS()
class IMMERSIVEANALYTICS_API UMyObject : public UObject
{
GENERATED_BODY()
};
......@@ -40,6 +40,9 @@ void APlot3D::InitPoints()
{
Num = X.Num();
}
IsBrushed = TArray<bool>();
IsBrushed.Init(false, Num);
for (int32 i = 0; i < Num; i++)
{
......@@ -138,6 +141,7 @@ void APlot3D::BrushPoint(int32 PointIndex, bool Add)
}
Points[PointIndex].SetEnabled(!Add);
IsBrushed[PointIndex] = Add;
/*
if (Add)
......@@ -229,7 +233,7 @@ void APlot3D::AddFilter_Planes(FVector NormalRight, FVector LocationRight, bool
BrushPoints(Indexes, Add, Rebuild);
}
void APlot3D::AddFilter_ValueRange(EAxisType XType, float XMin, float XMax, EAxisType YType, float YMin, float YMax, bool Add, bool Rebuild)
void APlot3D::AddFilter_ValueRange(EAxisType XType, float XMin, float XMax, EAxisType YType, float YMin, float YMax, bool Add, bool Rebuild, bool UseTwoValues)
{
TArray<float> * XArray = nullptr;
TArray<float> * YArray = nullptr;
......@@ -301,7 +305,7 @@ void APlot3D::AddFilter_ValueRange(EAxisType XType, float XMin, float XMax, EAxi
for (int i = 0; i < Points.Num(); ++i)
{
if ((*XArray)[i] >= XMin && (*XArray)[i] <= XMax && (*YArray)[i] >= YMin && (*YArray)[i] <= YMax)
if ((*XArray)[i] >= XMin && (*XArray)[i] <= XMax && ( !UseTwoValues || ((*YArray)[i] >= YMin && (*YArray)[i] <= YMax) ) )
{
Indexes.Emplace(i);
}
......
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