Skip to content
Snippets Groups Projects
Commit afc2ac4b authored by Céline  TREBEAU's avatar Céline TREBEAU
Browse files

Bug fix

- serialization
parent c7b55136
No related branches found
No related tags found
1 merge request!31Gui modifications
...@@ -157,10 +157,11 @@ public class ConstructionController< T extends RealType< T > & NativeType< T > > ...@@ -157,10 +157,11 @@ public class ConstructionController< T extends RealType< T > & NativeType< T > >
public void setParameters( ZelligeParameters parameters ) public void setParameters( ZelligeParameters parameters )
{ {
st1.setValue( parameters.getSt1() ); st1.setValue( parameters.getSt1() );
r1.setValue( parameters.getC1() ); r1.setValue( parameters.getR1() );
c1.setValue( parameters.getR1() ); c1.setValue( parameters.getC1() );
st2.setValue( parameters.getSt2() ); st2.setValue( parameters.getSt2() );
r2.setValue( parameters.getC2() ); r2.setValue( parameters.getR2() );
c2.setValue( parameters.getR2() ); c2.setValue( parameters.getC2() );
surfaceSize.setValue( parameters.getSurfaceSize() );
} }
} }
...@@ -20,7 +20,7 @@ public class ZelligeParameters ...@@ -20,7 +20,7 @@ public class ZelligeParameters
//construction //construction
private final double c1; private final double c1;
private final int r1; private final int r1;
private final double st11; private final double st1;
private final double c2; private final double c2;
private final int r2; private final int r2;
private final double st2; private final double st2;
...@@ -46,7 +46,7 @@ public class ZelligeParameters ...@@ -46,7 +46,7 @@ public class ZelligeParameters
// construction // construction
c1 = constructionModel.c1Property().doubleValue(); c1 = constructionModel.c1Property().doubleValue();
r1 = constructionModel.r1Property().intValue(); r1 = constructionModel.r1Property().intValue();
st11 = constructionModel.st1Property().doubleValue(); st1 = constructionModel.st1Property().doubleValue();
c2 = constructionModel.c2Property().doubleValue(); c2 = constructionModel.c2Property().doubleValue();
r2 = constructionModel.r2Property().intValue(); r2 = constructionModel.r2Property().intValue();
st2 = constructionModel.st2Property().doubleValue(); st2 = constructionModel.st2Property().doubleValue();
...@@ -122,7 +122,7 @@ public class ZelligeParameters ...@@ -122,7 +122,7 @@ public class ZelligeParameters
public double getSt1() public double getSt1()
{ {
return st11; return st1;
} }
public double getC2() public double getC2()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment