From afc2ac4bb6e93c73f81ca72ec7a109b627cc09f3 Mon Sep 17 00:00:00 2001
From: ctrebeau <ctrebeau@pasteur.fr>
Date: Thu, 21 Apr 2022 23:09:01 +0200
Subject: [PATCH] Bug fix - serialization
---
.../pasteur/ida/zellige/gui/ConstructionController.java | 9 +++++----
.../fr/pasteur/ida/zellige/gui/ZelligeParameters.java | 6 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/fr/pasteur/ida/zellige/gui/ConstructionController.java b/src/main/java/fr/pasteur/ida/zellige/gui/ConstructionController.java
index 4421c5e8..36598971 100644
--- a/src/main/java/fr/pasteur/ida/zellige/gui/ConstructionController.java
+++ b/src/main/java/fr/pasteur/ida/zellige/gui/ConstructionController.java
@@ -157,10 +157,11 @@ public class ConstructionController< T extends RealType< T > & NativeType< T > >
public void setParameters( ZelligeParameters parameters )
{
st1.setValue( parameters.getSt1() );
- r1.setValue( parameters.getC1() );
- c1.setValue( parameters.getR1() );
+ r1.setValue( parameters.getR1() );
+ c1.setValue( parameters.getC1() );
st2.setValue( parameters.getSt2() );
- r2.setValue( parameters.getC2() );
- c2.setValue( parameters.getR2() );
+ r2.setValue( parameters.getR2() );
+ c2.setValue( parameters.getC2() );
+ surfaceSize.setValue( parameters.getSurfaceSize() );
}
}
diff --git a/src/main/java/fr/pasteur/ida/zellige/gui/ZelligeParameters.java b/src/main/java/fr/pasteur/ida/zellige/gui/ZelligeParameters.java
index 700881c0..c5fb2a29 100644
--- a/src/main/java/fr/pasteur/ida/zellige/gui/ZelligeParameters.java
+++ b/src/main/java/fr/pasteur/ida/zellige/gui/ZelligeParameters.java
@@ -20,7 +20,7 @@ public class ZelligeParameters
//construction
private final double c1;
private final int r1;
- private final double st11;
+ private final double st1;
private final double c2;
private final int r2;
private final double st2;
@@ -46,7 +46,7 @@ public class ZelligeParameters
// construction
c1 = constructionModel.c1Property().doubleValue();
r1 = constructionModel.r1Property().intValue();
- st11 = constructionModel.st1Property().doubleValue();
+ st1 = constructionModel.st1Property().doubleValue();
c2 = constructionModel.c2Property().doubleValue();
r2 = constructionModel.r2Property().intValue();
st2 = constructionModel.st2Property().doubleValue();
@@ -122,7 +122,7 @@ public class ZelligeParameters
public double getSt1()
{
- return st11;
+ return st1;
}
public double getC2()
--
GitLab