olgamiller/SSTVEncoder2
1
0
Fork 0
mirror of https://github.com/olgamiller/SSTVEncoder2.git synced 2025-12-06 06:52:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved version from Label to LabelCollection

Browse source
This commit is contained in:
Olga Miller 2017-02-28 16:51:58 +01:00
parent 949eddfeed
commit 39c229434e
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/om/sstvencoder/TextOverlay/Label.java
View file

@ -20,7 +20,6 @@ import android.graphics.Color;
import java.io.Serializable; import java.io.Serializable;
public class Label implements Serializable { public class Label implements Serializable {
private final static int mVersion = 1;
private String mText; private String mText;
private float mTextSize; private float mTextSize;
private String mFamilyName; private String mFamilyName;
@ -37,10 +36,6 @@ public class Label implements Serializable {
mBackColor = Color.TRANSPARENT; mBackColor = Color.TRANSPARENT;
} }
public int getVersion() {
return mVersion;
}
public String getText() { public String getText() {
return mText; return mText;
} }

9
app/src/main/java/om/sstvencoder/TextOverlay/LabelCollection.java
View file

@ -41,6 +41,7 @@ public class LabelCollection {
} }
} }
private final int mVersion;
private final List<LabelContainer> mLabels; private final List<LabelContainer> mLabels;
private Size mScreenSize; private Size mScreenSize;
private float mTextSizeFactor; private float mTextSizeFactor;
@ -48,6 +49,7 @@ public class LabelCollection {
private float mPreviousX, mPreviousY; private float mPreviousX, mPreviousY;
public LabelCollection() { public LabelCollection() {
mVersion = 1;
mLabels = new LinkedList<>(); mLabels = new LinkedList<>();
mPreviousX = 0f; mPreviousX = 0f;
mPreviousY = 0f; mPreviousY = 0f;
@ -145,6 +147,7 @@ public class LabelCollection {
public void write(@NonNull IWriter writer) throws IOException { public void write(@NonNull IWriter writer) throws IOException {
writer.beginRootObject(); writer.beginRootObject();
{ {
writer.write("version", mVersion);
writer.write("width", mScreenSize.width()); writer.write("width", mScreenSize.width());
writer.write("height", mScreenSize.height()); writer.write("height", mScreenSize.height());
writer.write("factor", mTextSizeFactor); writer.write("factor", mTextSizeFactor);
@ -158,9 +161,12 @@ public class LabelCollection {
writer.endObject(); writer.endObject();
} }
public void read(@NonNull IReader reader) throws IOException { public boolean read(@NonNull IReader reader) throws IOException {
reader.beginRootObject(); reader.beginRootObject();
{ {
if (reader.readInt() != mVersion)
return false;
float w = reader.readFloat(); float w = reader.readFloat();
float h = reader.readFloat(); float h = reader.readFloat();
float textSizeFactor = reader.readFloat(); float textSizeFactor = reader.readFloat();
@ -176,5 +182,6 @@ public class LabelCollection {
update(w, h, textSizeFactor); update(w, h, textSizeFactor);
} }
reader.endObject(); reader.endObject();
return true;
} }
} }

2
app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java
View file

@ -97,7 +97,6 @@ class LabelContainer {
} }
private void writeLabel(IWriter writer, Label label) throws IOException { private void writeLabel(IWriter writer, Label label) throws IOException {
writer.write("version", label.getVersion());
writer.write("text", label.getText()); writer.write("text", label.getText());
writer.write("text_size", label.getTextSize()); writer.write("text_size", label.getTextSize());
writer.write("family_name", label.getFamilyName()); writer.write("family_name", label.getFamilyName());
@ -108,7 +107,6 @@ class LabelContainer {
} }
private void readLabel(IReader reader, Label label) throws IOException { private void readLabel(IReader reader, Label label) throws IOException {
reader.readInt();
label.setText(reader.readString()); label.setText(reader.readString());
label.setTextSize(reader.readFloat()); label.setTextSize(reader.readFloat());
label.setFamilyName(reader.readString()); label.setFamilyName(reader.readString());

3
app/src/main/java/om/sstvencoder/TextOverlayTemplate.java
View file

@ -163,8 +163,7 @@ class TextOverlayTemplate {
try { try {
InputStream in = new FileInputStream(file); InputStream in = new FileInputStream(file);
jsonReader = new JsonReader(new InputStreamReader(in, "UTF-8")); jsonReader = new JsonReader(new InputStreamReader(in, "UTF-8"));
labels.read(new LabelCollectionReader(jsonReader)); loaded = labels.read(new LabelCollectionReader(jsonReader));
loaded = true;
} catch (Exception ignore) { } catch (Exception ignore) {
} finally { } finally {
if (jsonReader != null) { if (jsonReader != null) {