Commit 45c57b07936d9c8ac746a473c78e54f15835d550
1 parent
cfeecf4a
Ajustement TempRssi et Map
Showing
2 changed files
with
26 additions
and
18 deletions
Show diff stats
project/server_core/src/main/java/repository/Map.java
@@ -11,9 +11,9 @@ import java.io.Serializable; | @@ -11,9 +11,9 @@ import java.io.Serializable; | ||
11 | public class Map implements Serializable{ | 11 | public class Map implements Serializable{ |
12 | @Id @GeneratedValue | 12 | @Id @GeneratedValue |
13 | private int id; | 13 | private int id; |
14 | - private Integer px_width, px_height; | 14 | + private Double x_topLeft, y_topLeft; |
15 | private Byte[] content; | 15 | private Byte[] content; |
16 | - private Double m_width, m_height; | 16 | + private Double x_bottomRight, y_bottomRight; |
17 | 17 | ||
18 | public Map() { | 18 | public Map() { |
19 | } | 19 | } |
@@ -26,20 +26,20 @@ public class Map implements Serializable{ | @@ -26,20 +26,20 @@ public class Map implements Serializable{ | ||
26 | this.id = id; | 26 | this.id = id; |
27 | } | 27 | } |
28 | 28 | ||
29 | - public Integer getPx_width () { | ||
30 | - return px_width; | 29 | + public Double getX_topLeft () { |
30 | + return x_topLeft; | ||
31 | } | 31 | } |
32 | 32 | ||
33 | - public void setPx_width (final Integer px_width) { | ||
34 | - this.px_width = px_width; | 33 | + public void setX_topLeft (final Double x_topLeft) { |
34 | + this.x_topLeft = x_topLeft; | ||
35 | } | 35 | } |
36 | 36 | ||
37 | - public Integer getPx_height () { | ||
38 | - return px_height; | 37 | + public Double getY_topLeft () { |
38 | + return y_topLeft; | ||
39 | } | 39 | } |
40 | 40 | ||
41 | - public void setPx_height (final Integer px_height) { | ||
42 | - this.px_height = px_height; | 41 | + public void setY_topLeft (final Double y_topLeft) { |
42 | + this.y_topLeft = y_topLeft; | ||
43 | } | 43 | } |
44 | 44 | ||
45 | public Byte[] getContent () { | 45 | public Byte[] getContent () { |
@@ -50,19 +50,19 @@ public class Map implements Serializable{ | @@ -50,19 +50,19 @@ public class Map implements Serializable{ | ||
50 | this.content = content; | 50 | this.content = content; |
51 | } | 51 | } |
52 | 52 | ||
53 | - public Double getM_width () { | ||
54 | - return m_width; | 53 | + public Double getX_bottomRight () { |
54 | + return x_bottomRight; | ||
55 | } | 55 | } |
56 | 56 | ||
57 | - public void setM_width (final Double m_width) { | ||
58 | - this.m_width = m_width; | 57 | + public void setX_bottomRight (final Double x_bottomRight) { |
58 | + this.x_bottomRight = x_bottomRight; | ||
59 | } | 59 | } |
60 | 60 | ||
61 | - public Double getM_height () { | ||
62 | - return m_height; | 61 | + public Double getY_bottomRight () { |
62 | + return y_bottomRight; | ||
63 | } | 63 | } |
64 | 64 | ||
65 | - public void setM_height (final Double m_height) { | ||
66 | - this.m_height = m_height; | 65 | + public void setY_bottomRight (final Double y_bottomRight) { |
66 | + this.y_bottomRight = y_bottomRight; | ||
67 | } | 67 | } |
68 | } | 68 | } |
project/server_core/src/main/java/repository/TempRssi.java
@@ -20,6 +20,14 @@ public class TempRssi { | @@ -20,6 +20,14 @@ public class TempRssi { | ||
20 | 20 | ||
21 | public TempRssi () {} | 21 | public TempRssi () {} |
22 | 22 | ||
23 | + public TempRssi (final AccessPoint accessPoint, final String clientMacAddr, final double avg, | ||
24 | + final double stdDev) { | ||
25 | + ap = accessPoint; | ||
26 | + client_mac_addr = clientMacAddr; | ||
27 | + this.avg = avg; | ||
28 | + this.stdDev = stdDev; | ||
29 | + } | ||
30 | + | ||
23 | public AccessPoint getAp () { | 31 | public AccessPoint getAp () { |
24 | return ap; | 32 | return ap; |
25 | } | 33 | } |