Better open single picture

domi4484 · Oct 21, 2015 · a44ed6f · a44ed6f
1 parent eb3aded
commit a44ed6f
Show file tree

Hide file tree

Showing 23 changed files with 188 additions and 422 deletions.
diff --git a/Documentation/My_Skate_Map_stralciata.kml b/Documentation/My_Skate_Map_stralciata.kml
@@ -367,16 +367,13 @@ http://lh4.ggpht.com/_NFj9nTnRuuA/THlMnExCTOI/AAAAAAAAAN8/oyB0plBcpp0/s144/DSC00
 <![CDATA[From Drop Box (http://picasaweb.google.ch/lombardi.damiano/DropBox?authkey=Gv1sRgCNLegZrLgK6TpwE&feat=embedwebsite)]]>
 6.659367,46.831279
 
-Coira - Banca
-9.528907,46.851196
-
 Coira - Bank gigante
 9.508753,46.861453
 
 Coira - Curb in salita
 9.519299000000002,46.851453
 
-Coira - Curb storto
+Coira - Curb storto che non è piu storto
 9.530125,46.85117400000001
 
 Coira - Minihip

diff --git a/MobileClient/QtProject/MobileClientQml.pro b/MobileClient/QtProject/MobileClientQml.pro
@@ -31,9 +31,7 @@ SOURCES += src/cpp/main.cpp \
     src/cpp/WebApi/WebApiError.cpp \
     src/cpp/HelperClasses/Logger.cpp \
     src/cpp/HelperClasses/StringHelper.cpp \
-    src/cpp/WebApi/NewsModel.cpp \
     src/cpp/WebApi/PictureUploader.cpp \
-    src/cpp/WebApi/NearbySpotsModel.cpp \
     src/cpp/HelperClasses/PlateformDetail.cpp \
     src/cpp/HelperClasses/LocationManager.cpp \
     src/cpp/HelperClasses/PictureCacher.cpp \
@@ -62,9 +60,7 @@ HEADERS += \
     src/cpp/WebApi/WebApiError.h \
     src/cpp/HelperClasses/Logger.h \
     src/cpp/HelperClasses/StringHelper.h \
-    src/cpp/WebApi/NewsModel.h \
     src/cpp/WebApi/PictureUploader.h \
-    src/cpp/WebApi/NearbySpotsModel.h \
     src/cpp/HelperClasses/PlateformDetail.h \
     src/cpp/HelperClasses/LocationManager.h \
     src/cpp/HelperClasses/PictureCacher.h \

diff --git a/MobileClient/QtProject/src/Panel_Home.qml b/MobileClient/QtProject/src/Panel_Home.qml
@@ -14,7 +14,6 @@ import QtQuick 2.3
 import QtQuick.Controls 1.2
 
 // Project c++ imports ---------------------
-import NewsModel 1.0
 
 // Project qml imports ---------------------
 import "qrc:/"
@@ -23,17 +22,6 @@ import "qrc:/pages-spot/"
 
 Item {
 
-    NewsModel{
-        id: newsModel
-    }
-
-    // Signals -----------------------------
-    Component.onCompleted:
-    {
-        newsModel.getNewestSpots();
-    }
-
-
     // Gui ---------------------------------
 
     Navigator{
@@ -67,12 +55,15 @@ Item {
                          }
 
         initialItem: Page_PicturesList {
+            id: page_PicturesList
             width : parent.width
             height: parent.height
 
             navigation_Title: qsTr("News")
 
-            model: newsModel
+            Component.onCompleted: {
+                model.getNewestSpots();
+            }
 
             onUserClicked: {
                 stackView.push({item: Qt.resolvedUrl("qrc:/pages-user/Page_User.qml"),
@@ -88,10 +79,10 @@ Item {
                 stackView.push({item: Qt.resolvedUrl("qrc:/pages-spot/Page_Spot.qml"),
                                properties:{width            : stackView.width,
                                            height           : stackView.height,
-                                           navigation_Title : spotName,
+                                       navigation_Title : spotName,
                                            stackView        : stackView,
-                                           navigator        : navigator,
-                                           spotId           : spotId}});
+                                           navigator        : navigator}});
+                stackView.currentItem.model.getBy_SpotId(spotId);
             }
         }
     }

diff --git a/MobileClient/QtProject/src/Panel_NearbySpots.qml b/MobileClient/QtProject/src/Panel_NearbySpots.qml
@@ -14,16 +14,16 @@ import QtQuick 2.3
 import QtQuick.Controls 1.2
 
 // Project c++ imports ---------------------
-import NearbySpotsModel 1.0
+import SpotsModel 1.0
 
 // Project qml imports ---------------------
 import "qrc:/views"
 import "qrc:/pages-spot"
 
 Item {
 
-    NearbySpotsModel{
-        id: nearbySpotsModel
+    SpotsModel{
+        id: spotsModel
     }
 
     // Signals -----------------------------
@@ -39,7 +39,7 @@ Item {
                 // TODO display message cacca
             }
 
-            nearbySpotsModel.setLocation(hc_LocationManager.latitude(),
+            spotsModel.setLocation(hc_LocationManager.latitude(),
                                          hc_LocationManager.longitude(),
                                          150);
         }
@@ -51,7 +51,7 @@ Item {
             return;
 
         // Set current location (also if outdated)
-        nearbySpotsModel.setLocation(hc_LocationManager.latitude(),
+        spotsModel.setLocation(hc_LocationManager.latitude(),
                                      hc_LocationManager.longitude(),
                                      150);
 
@@ -93,16 +93,16 @@ Item {
 
             navigation_Title: qsTr('Nearby spots')
 
-            model: nearbySpotsModel
+            model: spotsModel
 
             onSpotClicked: {
                 stackView.push({item: Qt.resolvedUrl("qrc:/pages-spot/Page_Spot.qml"),
                                 properties:{width            : stackView.width,
                                             height           : stackView.height,
                                             navigation_Title : spotName,
                                             stackView        : stackView,
-                                            navigator        : navigator,
-                                            spotId           : spotId}});
+                                            navigator        : navigator}});
+                stackView.currentItem.model.getBy_SpotId(spotId);
             }
         }
     }

diff --git a/MobileClient/QtProject/src/cpp/WebApi/NearbySpotsModel.cpp b/MobileClient/QtProject/src/cpp/WebApi/NearbySpotsModel.cpp
diff --git a/MobileClient/QtProject/src/cpp/WebApi/NearbySpotsModel.h b/MobileClient/QtProject/src/cpp/WebApi/NearbySpotsModel.h
diff --git a/MobileClient/QtProject/src/cpp/WebApi/NewsModel.cpp b/MobileClient/QtProject/src/cpp/WebApi/NewsModel.cpp