Skip to content

GitLab

Notice to GitKraken users: A vulnerability has been found in the SSH key generation of GitKraken versions 7.6.0 to 8.0.0 (https://www.gitkraken.com/blog/weak-ssh-key-fix). If you use GitKraken and have generated a SSH key using one of these versions, please remove it both from your local workstation and from your LRZ GitLab profile.

21.10.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 5f7ad726 authored by Daniel Lehmberg's avatar Daniel Lehmberg
Browse files

Merge remote-tracking branch 'origin/master'

parents b3a7ac31 a18789b5
Pipeline #164978 passed with stages
in 140 minutes and 3 seconds
Hide whitespace changes
Inline Side-by-side
VadereGui/src/org/vadere/gui/postvisualization/view/AdjustPanel.java
View file @ 5f7ad726
...@@ -114,7 +114,7 @@ public class AdjustPanel extends JPanel implements Observer { ...@@ -114,7 +114,7 @@ public class AdjustPanel extends JPanel implements Observer {
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {
synchronized (model) { synchronized (model) {
// update view // update view
slider.setValueIsAdjusting(true); //slider.setValueIsAdjusting(true);
if(model.hasOutputChanged()) { if(model.hasOutputChanged()) {
slider.setMaximum(model.getLastStep()); slider.setMaximum(model.getLastStep());
slider.setMinimum(model.getFirstStep()); slider.setMinimum(model.getFirstStep());
...@@ -126,7 +126,7 @@ public class AdjustPanel extends JPanel implements Observer { ...@@ -126,7 +126,7 @@ public class AdjustPanel extends JPanel implements Observer {
sVisTimeStepLength.setValue(model.getVisTimeStepLength()); sVisTimeStepLength.setValue(model.getVisTimeStepLength());
sTime.setValue(model.getSimTimeInSec()); sTime.setValue(model.getSimTimeInSec());
//((SpinnerNumberModel)sModelTime).setStepSize(model.getSimTimeInSec()); //((SpinnerNumberModel)sModelTime).setStepSize(model.getSimTimeInSec());
slider.setValueIsAdjusting(false); //slider.setValueIsAdjusting(false);
} }
}); });
} }
......
VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestFMMEikMesh.java
View file @ 5f7ad726
...@@ -53,8 +53,8 @@ public class TestFMMEikMesh { ...@@ -53,8 +53,8 @@ public class TestFMMEikMesh {
MeshPolyWriter<PVertex, PHalfEdge, PFace> meshPolyWriter = new MeshPolyWriter<>(); MeshPolyWriter<PVertex, PHalfEdge, PFace> meshPolyWriter = new MeshPolyWriter<>();
System.out.println(meshPolyWriter.to2DPoly(triangulation.getMesh(), 1, i -> "potential", v -> false)); //System.out.println(meshPolyWriter.to2DPoly(triangulation.getMesh(), 1, i -> "potential", v -> false));
//System.out.println(mesh.toPythonTriangulation(v -> triangulation.getMesh().getDoubleData(v, "potential"))); System.out.println(mesh.toPythonTriangulation(v -> triangulation.getMesh().getDoubleData(v, "potential")));
} }
} }
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