Merge branch 'felix-schmidt-master'

src/main/java/de/thm/arsnova/dao/CouchDBDao.java

@@ -422,6 +422,8 @@ public class CouchDBDao implements IDatabaseDao {
 		q.put("gridLineColor", question.getGridLineColor());
 		q.put("numberOfDots", question.getNumberOfDots());
 		q.put("gridType", question.getGridType());
+		q.put("scaleFactor", question.getScaleFactor());
+		q.put("gridScaleFactor", question.getGridScaleFactor());
 		
 		return q;
 	}
@@ -459,6 +461,9 @@ public class CouchDBDao implements IDatabaseDao {
 			q.put("gridLineColor", question.getGridLineColor());
 			q.put("numberOfDots", question.getNumberOfDots());
 			q.put("gridType", question.getGridType());
+			q.put("scaleFactor", question.getScaleFactor());
+			q.put("gridScaleFactor", question.getGridScaleFactor());
+			
 			database.saveDocument(q);
 			question.set_rev(q.getRev());
 

src/main/java/de/thm/arsnova/entities/Question.java

@@ -63,6 +63,8 @@ public class Question {
 	private String gridLineColor;
 	private int numberOfDots;
 	private String gridType;
+	private String scaleFactor;
+	private String gridScaleFactor;
 
 	public final String getType() {
 		return type;
@@ -383,6 +385,22 @@ public class Question {
 	public void setGridType(String gridType) {
 		this.gridType = gridType;
 	}
+	
+	public void setScaleFactor(String scaleFactor) {
+		this.scaleFactor = scaleFactor;
+	}
+	
+	public String getScaleFactor() {
+		return this.scaleFactor;
+	}
+	
+	public void setGridScaleFactor(String scaleFactor) {
+		this.gridScaleFactor = scaleFactor;
+	}
+	
+	public String getGridScaleFactor() {
+		return this.gridScaleFactor;
+	}
 
 	@Override
 	public final String toString() {