Ver código fonte

Added the data dir. Created the qrc.

Rafael Arce Nazario 9 anos atrás
pai
commit
2b462a41b1
6 arquivos alterados com 59 adições e 2 exclusões
  1. 1
    0
      data/cityLimitsPR.json
  2. 37
    0
      data/pr.txt
  3. 10
    0
      data/pr10.txt
  4. 2
    2
      map.cpp
  5. 4
    0
      prMap.pro
  6. 5
    0
      prmap.qrc

+ 1
- 0
data/cityLimitsPR.json
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


+ 37
- 0
data/pr.txt Ver arquivo

@@ -0,0 +1,37 @@
1
+San_Juan 18.4516666667 -66.0688888889
2
+Ponce 18.0 -66.6167
3
+Vieques 18.1269 -65.4239
4
+Bayamon 18.3833 -66.15
5
+Mayaguez 18.2011111111 -67.1397222222
6
+Culebra 18.3169 -65.29
7
+Carolina 18.4112152674 -65.9710121155
8
+Caguas 18.2342 -66.0486
9
+Aguadilla 18.43 -67.1544
10
+Arecibo 18.4705555556 -66.7208333333
11
+Dorado 18.4589 -66.2678
12
+Fajardo 18.3258 -65.6525
13
+Rincon 18.3402777778 -67.2516666667
14
+Guaynabo 18.1144444444 -66.1680555556
15
+Humacao 18.1497 -65.8275
16
+Cidra 18.1758333333 -66.1613888889
17
+Guayama 17.9936 -66.1308
18
+Santurce 18.4408333333 -66.0472222222
19
+Cayey 18.1144 -66.1681
20
+Utuado 18.2656 -66.7006
21
+Rio_Grande 18.3803 -65.8314
22
+Barceloneta 18.4506 -66.5386
23
+Yauco 18.0369444444 -66.8502777778
24
+Jayuya 18.2186 -66.5917
25
+Vega_Baja 18.4461111111 -66.3875
26
+Trujillo_Alto 18.3628 -66.0175
27
+Juana_Diaz 18.0525 -66.5067
28
+Yabucoa 18.0506 -65.8794
29
+Toa_Baja 18.4439 -66.2597
30
+Rio_Piedras 18.3997222222 -66.05
31
+Gurabo 18.2544 -65.9731
32
+Canovanas 18.3792 -65.9014
33
+Catano 18.4414 -66.1183
34
+Arroyo 17.9658 -66.0614
35
+Anasco 18.2818442291 -67.1422576904
36
+Toa_Alta 18.3883 -66.2483
37
+Levittown 18.45 -66.1817

+ 10
- 0
data/pr10.txt Ver arquivo

@@ -0,0 +1,10 @@
1
+Arroyo 17.9658 -66.0614
2
+Bayamon 18.3833 -66.15
3
+Caguas 18.2342 -66.0486
4
+Dorado 18.4589 -66.2678
5
+Fajardo 18.3258 -65.6525
6
+Guayama 17.9936 -66.1308
7
+Humacao 18.1497 -65.8275
8
+Jayuya 18.2186 -66.5917
9
+Mayaguez 18.2011111111 -67.1397222222
10
+Ponce 18.0 -66.6167

+ 2
- 2
map.cpp Ver arquivo

@@ -11,7 +11,7 @@ Map::Map(QWidget *parent) :
11 11
 
12 12
 
13 13
     myCountry = new Country;
14
-    myCountry->readInfoFromJSON("/Users/rarce/Dropbox/CCOM3033/2014S/qt/prMap/data/cityLimitsPR.json");
14
+    myCountry->readInfoFromJSON(":/data/cityLimitsPR.json");
15 15
 
16 16
     cityColorMap = NULL;
17 17
     gisLocations = NULL;
@@ -163,7 +163,7 @@ void Map::paintEvent(QPaintEvent *event) {
163 163
     int cX, cY, pX, pY;
164 164
     cX = cY = pX = pY = -1;
165 165
 
166
-    qDebug() << "gisLocations:" << gisLocations << endl;
166
+    //qDebug() << "gisLocations:" << gisLocations << endl;
167 167
 
168 168
     if(gisLocations) {
169 169
         myPen.setWidth(2);

+ 4
- 0
prMap.pro Ver arquivo

@@ -11,6 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
11 11
 TARGET = prMap
12 12
 TEMPLATE = app
13 13
 
14
+CONFIG += c++11
14 15
 
15 16
 SOURCES += main.cpp\
16 17
         mainwindow.cpp \
@@ -30,3 +31,6 @@ HEADERS  += mainwindow.h \
30 31
     gispoi.h
31 32
 
32 33
 FORMS    += mainwindow.ui
34
+
35
+RESOURCES += \
36
+    prmap.qrc

+ 5
- 0
prmap.qrc Ver arquivo

@@ -0,0 +1,5 @@
1
+<RCC>
2
+    <qresource prefix="/">
3
+        <file>data/cityLimitsPR.json</file>
4
+    </qresource>
5
+</RCC>