In January 2021 we will introduce a 10 GB quota for project repositories. Higher limits for individual projects will be available on request. Please see https://doku.lrz.de/display/PUBLIC/GitLab for more information.

Commit 4b9008ff authored by Christina's avatar Christina

Merge branch 'close_frame_mesh'

parents 53e0e85d 0a16c872
Pipeline #310014 passed with stages
in 147 minutes and 25 seconds
......@@ -77,7 +77,8 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesMeshProcessor",
"attributes" : {
"measurementAreaId" : 1,
"edgeLength" : 1.5
"edgeLength" : 1.5,
"displayMesh" : false
}
} ],
"isTimestamped" : true,
......
......@@ -77,7 +77,8 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesMeshProcessor",
"attributes" : {
"measurementAreaId" : 1,
"edgeLength" : 1.5
"edgeLength" : 1.5,
"displayMesh" : false
}
} ],
"isTimestamped" : true,
......@@ -350,4 +351,4 @@
},
"stimulusInfos" : [ ]
}
}
}
\ No newline at end of file
......@@ -142,7 +142,8 @@ public class MeshProcessor extends NoDataKeyProcessor<IMesh<PVertex, PHalfEdge,
var meshRenderer = new MeshRenderer<>(meshImprover.getMesh(), f -> false, f -> Color.WHITE, e -> Color.GRAY);
var meshPanel = new PMeshPanel(meshRenderer, 300, 300);
meshPanel.display();
if (getAttributes().isDisplayMesh()) meshPanel.display();
}
@Override
......
......@@ -3,6 +3,7 @@ package org.vadere.state.attributes.processor;
public class AttributesMeshProcessor extends AttributesProcessor {
private int measurementAreaId = -1;
private double edgeLength = 1.0;
private boolean displayMesh = true;
public int getMeasurementAreaId() {
return this.measurementAreaId;
......@@ -21,4 +22,13 @@ public class AttributesMeshProcessor extends AttributesProcessor {
checkSealed();
this.edgeLength = edgeLength;
}
public boolean isDisplayMesh() {
return displayMesh;
}
public void setDisplayMesh(boolean displayMesh) {
checkSealed();
this.displayMesh = displayMesh;
}
}
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