From 2c109c834ce53da289c11f624906a642773ce9c2 Mon Sep 17 00:00:00 2001
From: Felix Schmidt <felix.schmidt@mni.thm.de>
Date: Thu, 26 Jun 2014 10:38:08 +0200
Subject: [PATCH] CouchDBDao und Quesion-Entity um neue Werte fuer Planquadrate
erweitert.
---
.../java/de/thm/arsnova/dao/CouchDBDao.java | 14 +++++
.../de/thm/arsnova/entities/Question.java | 63 +++++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index bcb8ea1b3..669e3d9f6 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -270,6 +270,13 @@ public class CouchDBDao implements IDatabaseDao {
q.put("offsetX", question.getOffsetX());
q.put("offsetY", question.getOffsetY());
q.put("zoomLvl", question.getZoomLvl());
+ q.put("gridOffsetX", question.getGridOffsetX());
+ q.put("gridOffsetY", question.getGridOffsetY());
+ q.put("gridZoomLvl", question.getGridZoomLvl());
+ q.put("gridSizeX", question.getGridSizeX());
+ q.put("gridSizeY", question.getGridSizeY());
+ q.put("gridIsHidden", question.getGridIsHidden());
+ q.put("imgRotation", question.getImgRotation());
return q;
}
@@ -293,6 +300,13 @@ public class CouchDBDao implements IDatabaseDao {
q.put("offsetX", question.getOffsetX());
q.put("offsetY", question.getOffsetY());
q.put("zoomLvl", question.getZoomLvl());
+ q.put("gridOffsetX", question.getGridOffsetX());
+ q.put("gridOffsetY", question.getGridOffsetY());
+ q.put("gridZoomLvl", question.getGridZoomLvl());
+ q.put("gridSizeX", question.getGridSizeX());
+ q.put("gridSizeY", question.getGridSizeY());
+ q.put("gridIsHidden", question.getGridIsHidden());
+ q.put("imgRotation", question.getImgRotation());
database.saveDocument(q);
question.set_rev(q.getRev());
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index f8cbbadb9..764baa65c 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -49,6 +49,13 @@ public class Question {
private int offsetX;
private int offsetY;
private int zoomLvl;
+ private int gridOffsetX;
+ private int gridOffsetY;
+ private int gridZoomLvl;
+ private int gridSizeX;
+ private int gridSizeY;
+ private boolean gridIsHidden;
+ private int imgRotation;
public final String getType() {
return type;
@@ -257,6 +264,62 @@ public class Question {
public void setZoomLvl(final int zoomLvl) {
this.zoomLvl = zoomLvl;
}
+
+ public int getGridOffsetX() {
+ return gridOffsetX;
+ }
+
+ public void setGridOffsetX(int gridOffsetX) {
+ this.gridOffsetX = gridOffsetX;
+ }
+
+ public int getGridOffsetY() {
+ return gridOffsetY;
+ }
+
+ public void setGridOffsetY(int gridOffsetY) {
+ this.gridOffsetY = gridOffsetY;
+ }
+
+ public int getGridZoomLvl() {
+ return gridZoomLvl;
+ }
+
+ public void setGridZoomLvl(int gridZoomLvl) {
+ this.gridZoomLvl = gridZoomLvl;
+ }
+
+ public int getGridSizeX() {
+ return gridSizeX;
+ }
+
+ public void setGridSizeX(int gridSizeX) {
+ this.gridSizeX = gridSizeX;
+ }
+
+ public int getGridSizeY() {
+ return gridSizeY;
+ }
+
+ public void setGridSizeY(int gridSizeY) {
+ this.gridSizeY = gridSizeY;
+ }
+
+ public boolean getGridIsHidden() {
+ return gridIsHidden;
+ }
+
+ public void setGridIsHidden(boolean gridIsHidden) {
+ this.gridIsHidden = gridIsHidden;
+ }
+
+ public int getImgRotation() {
+ return imgRotation;
+ }
+
+ public void setImgRotation(int imgRotation) {
+ this.imgRotation = imgRotation;
+ }
@Override
public final String toString() {
--
GitLab