Skip to content

Bug fix for event marker progress details for Consensys #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RuMolloy merged 1 commit into from
Jul 10, 2019
Merged

Bug fix for event marker progress details for Consensys #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ShimmerDriverPC/src/main/java/com/shimmerresearch/guiUtilities/plot/BasicPlotManagerPC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public class BasicPlotManagerPC extends AbstractPlotManager {
private boolean mIsDebugMode = false;
private boolean mIsTraceDataBuffered = false;
protected boolean isFirstPointOnFillTrace = true;
protected boolean isSingleEventMarkerTest = true;

public PlotCustomFeature pcf=null;

Expand Down Expand Up @@ -1948,7 +1949,8 @@ public void filterDataAndPlot(ObjectCluster ojc) throws Exception {

//prevent eventmarkers from plotting back in time
boolean eventMarker=false;
if (props[0].equals(mEventMarkerCheck) && shimmerName.equals(props[0])){

if (isEventMarkerData(shimmerName, props[0])){
if (xData>mCurrentXValue){
eventMarker=true;
}
Expand Down Expand Up @@ -2062,6 +2064,21 @@ else if(isXAxisFrequency){
}
}

public void setEventMarkerDataCheck(boolean isSingleEventMarkerTest) {
this.isSingleEventMarkerTest = isSingleEventMarkerTest;
}

private boolean isEventMarkerData(String shimmerName, String signalName) {
if(isSingleEventMarkerTest) {
// used for Consensys (CON-628)
return mEventMarkerCheck.equals(signalName);
}
else {
// used for NeuroLynQ
return mEventMarkerCheck.equals(signalName) && shimmerName.equals(signalName);
}
}

/**
* Method to add a dummy point as the first point in the trace if the line style is fill
* so that the chart doesn't plot from (0, 0), this method is overriden in PlotManagerPC
Expand Down