WebSVN – public – Diff – /sportwatcher/trunk/src/sportwatcherwidget.cpp

 #include "sportwatcherwidget.h"
 #include "settingswidget.h"
 #include "progresswidget.h"
 #include "wmsbase.h"
 #include "coordinateswidget.h"
+#include "shapewidget.h"
 #include <string.h>
 #include <iostream>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #endif
 #include "garmin.h"
 #include "transform.h"
 #include "import.h"
+#include "render.h"
 //#define DEBUG	1
 using std::cout;
 using std::cerr;
 	   coordinatesWidget *idlg = new coordinatesWidget(this);
 	   idlg->exec();
 	   delete idlg;
 	   return;
+	}
-	if (MapType != MPT_WMS)
+	if (MapType == MPT_WMS)
+	{
+	   wmsbase *dlg = new wmsbase(this);
+	   dlg->exec();
+	   delete dlg;
+	}
+	if (MapType == MPT_SHP)
+	{
+	   shapeWidget *dlg = new shapeWidget(this);
+	   dlg->exec();
+	   delete dlg;
+	}
+	if (MapType != MPT_WMS && MapType != MPT_SHP)
+	{
 	   KMessageBox::detailedSorry(this,
-	      i18n("You have not choosen a WMS tag file!"),
+	      i18n("You have not choosen a WMS tag file or shape file directory!"),
-	      i18n("This dialog is especialy to set WMS specific parameters. ") +
+	      i18n("This dialog is especialy to set map specific parameters. ") +
 	      i18n("Therefore this dialog is temporary disabled. It will be ") +
-	      i18n("available again, as soon as you choose \"WMS server\" as ") +
+	      i18n("available again, as soon as you choose \"WMS server\" or ") +
-	      i18n("your map type."));
+	      i18n("Shape file as your map type."));
 	      return;
+	}
-	wmsbase *dlg = new wmsbase(this);
-	dlg->exec();
-	delete dlg;
 #else
 	KMessageBox::detailedSorry(this,
 	   i18n("This function was disabled at compile time because of missing GDAL v1.5.x!"),
 	   i18n("Sportwatcher needs GDAL v1.5.x to enable this function.\n") +
 	   i18n("If you like this to be working, install GDAL version 1.5.x and recompile the source!"));
 		    KMessageBox::error(this, i18n("There is no shape file in directory ") + MAP);
 		    Fgeo = false;
+		 }
 		 else
+		 {
-		 OGRDataSource *poDS = 0;
-		 OGRLayer *poLy;
+		 SRender rd;
-		 OGRFeature *poFeat;
-		 OGRFeatureDefn *poFDefn;
-		 OGRFieldDefn *poFieldDefn;
-		 OGRGeometry *poGeometry;
-		 OGRPoint *poPoint;
-		 int nLayers, iField;
-		 QString sfn;
-		    OGRRegisterAll ();
-		    // read all shape files and put them together
-		    for (a = 0; (uint)a < shpd.count(); a++)
-		    {
-		       sfn = MAP + shpd[a];
-		       poDS = OGRSFDriverRegistrar::Open(sfn.toAscii().data(), false);
-		       if (!poDS)
-		       {
-			  cerr << "Error opening the file " << sfn.toAscii().data() << "!" << endl;
-			  break;
-		       }
-		       nLayers = poDS->GetLayerCount ();
-		       // Read all layers of a shape file
-		       for (int j = 0; j< nLayers; j++)
-		       {
-			  if ((poLy = poDS->GetLayer (j)) == NULL)
-			  {
-			     cerr << "Error getting layer " << j << "!" << endl;
-			     continue;
+		    paint.end();
-			  }
-			  poLy->SetSpatialFilterRect (geoRect.llon, geoRect.llat, geoRect.rlon, geoRect.rlat);
-			  // Read all features of a layer and get the fields
+		    rd.setDrawArea(*ui_sportwatcherWidgetBase.imgMap);
-			  // of the features
-			  poLy->ResetReading();
-			  while ((poFeat = poLy->GetNextFeature()) != NULL)
+		    rd.getMap(posLXY.lat, posLXY.lon, posRXY.lat, posRXY.lon);
-			  {
-			     if ((poFDefn = poLy->GetLayerDefn()) == NULL)
-			     {
-			        cerr << "Error getting a layer defination!" << endl;
+		    pmMap = *ui_sportwatcherWidgetBase.imgMap->pixmap();
-			        continue;
+		    paint.begin(&pmMap);
-			     }
-			     poGeometry = poFeat->GetGeometryRef();
-			     if (poGeometry != NULL && wkbFlatten (poGeometry->getGeometryType()) == wkbPoint)
-			     {
-			        poPoint = (OGRPoint *) poGeometry;
-			        cout << "pointX: " << poPoint->getX() << ", pointY: " << poPoint->getY() << endl;
-			     }
-			     for (iField = 0; iField < poFDefn->GetFieldCount(); iField++)
-			     {
-			        poFieldDefn = poFDefn->GetFieldDefn (iField);
-				if (poFieldDefn->GetType() == OFTInteger)
-				   cout << "Layer: " << j << " int: " << poFeat->GetFieldAsInteger (iField) << endl;
-				else if (poFieldDefn->GetType() == OFTReal)
-				   cout << "Layer: " << j << " float: " << poFeat->GetFieldAsDouble (iField) << endl;
-				else if (poFieldDefn->GetType() == OFTString)
-				   cout << "Layer: " << j << " string: " << poFeat->GetFieldAsString (iField) << endl;
-				else
-				   cout << "Layer: " << j << " Unkn.: " << poFeat->GetFieldAsString (iField) << endl;
-			     }
-			     cout << "----------------------------" << endl;
-        		  }
-        		  OGRFeature::DestroyFeature (poFeat);
-		       }
-		       OGRDataSource::DestroyDataSource(poDS);
-		    }
+		 }
+	      }
 	      else
+	      {
 		 KMessageBox::error(this, i18n("Error opening map file!"));
 QPainter ptHR, ptElevation, ptSpeed;
 int width, height, wdHR, htHR, wdElev, htElev, wdSpeed, htSpeed;
 int i, secs, cuType;
 int lineHeight, margin_left, margin_right, margin_bottom;
 int x1, y1, x2, y2;		// Coordinates
-bool meter, meterHR, meterElev, meterSpeed;
+bool meterHR;
 double maxHeight, minHeight, maxSpeed, minSpeed;
 int maxHr, minHr, rh, rhHR, rhElev, rhSpeed;
 POINT *point;
 RUN_NODE *rn;
 LAP *lp;

Subversion Repositories public

(root)/sportwatcher/trunk/src/sportwatcherwidget.cpp – Rev 251 → 274