Changeset 2553 for trunk/map

Timestamp:

09/29/05 22:07:33 (5 years ago)

Author:

marius

Message:

sdl zeugs

Location:

trunk/map

Files:

• configure (modified) (3 diffs, 1 prop)
• include/pimp.h (modified) (5 diffs, 1 prop)
• src/pimp.cpp (modified) (6 diffs, 1 prop)
• src/test.cpp (modified) (5 diffs, 1 prop)

trunk/map/configure

@@ -22 +22 @@
 
 SRCDIRS="src"
-LIBS=""
-LIBLIBS=""
-INCLUDES="-I \$(TOPDIR)/include/"
+LIBS=-lpthread
+LIBLIBS="-L/sw/lib/ -liwear_core -liwear_output -lSDL -lSDL_mixer"
+INCLUDES="-I/sw/include/ -I \$(TOPDIR)/include/"
 
 EXTRACLEANFILES="test doxygen.log libiw*"
@@ -43 +43 @@
 MIN_GCC="3.3.0"
 MIN_GPP="3.3.1"
+
+MIN_SDL_BASE="1.2.7"
+MIN_SDL_MIX="1.2.6"
 
 #
@@ -228 +231 @@
 fi
 
+#####################################################################
+# Perform SDL checks
+#####################################################################
+
+check_SDL $MIN_SDL_BASE
+if [ $BAIL == "yes" ]
+then
+    cleanup; exit 1
+fi
+
 check_doxygen
 

trunk/map/include/pimp.h

@@ -50 +50 @@
 namespace map{
 
-class Directory {
+/*class Directory {
+
 public:
     Directory(const char *name);//Konstruktor uebergebene Parameter ist der Pfad
@@ -58 +59 @@
     const string &operator()() const;//gibt den Namen der aktuellen Datei zurueck
     Directory& operator++();// Objekt zeigt anschliessend auf die naechste Datei/Verzeichnis
+
 private:
     DIR* dir;
     string here;
 };
-
+*/
 class FileStatus {
  public:
@@ -79 +81 @@
 
 // number of instances of this module
-//static int num_of_uids = 0;
+static int num_of_uids = 0;
     
 struct point_coords { /*{{{*/
@@ -596 +598 @@
                 *divers bulidings in the vicinity.
                 */
-                PoI get_poi(int i);
+                PoI * get_poi(int i);
                 
     };
@@ -663 +665 @@
 /**
  * $Log$
+ * Revision 1.20  2005/09/29 20:07:33  marius
+ * sdl zeugs
+ *
  * Revision 1.19  2005/09/26 14:01:16  marius
  * updates bugfixes

trunk/map/src/pimp.cpp

@@ -183 +183 @@
     // (4215,-2345)==(8,82481,53,08435)
     
-//    Pimp::Pimp() { /*{{{*/
-//      num_of_uids++;
-//      uid = num_of_uids;
-//      } /*}}}*/
-        
-//    Pimp::~Pimp(void) { /*{{{*/
-//      num_of_uids--;
-//    } /*}}}*/
+    Pimp::Pimp() { /*{{{*/
+                num_of_uids++;
+                uid = num_of_uids;
+        } /*}}}*/
+        
+    Pimp::~Pimp(void) { /*{{{*/
+                num_of_uids--;
+    } /*}}}*/
 
 void View::refresh_degree()
@@ -206 +206 @@
         double my_x=compass.current_pos_x();
                 double my_y=compass.current_pos_y();
-                double x=pimp.get_poi(i).x;
-                double y=pimp.get_poi(i).y;
+                double x=pimp.get_poi(i)->x;
+                double y=pimp.get_poi(i)->y;
                 double a=(my_x-x);
                 double b=(my_y-y);
@@ -391 +391 @@
 void Pimp::delOldfiles()
 {
-    Directory dir("./temp");
+   /* Directory dir("./temp");
     string name = dir(); 
     FileStatus file(name); 
@@ -411 +411 @@
                 exec_cmd(params[0], params);
                 }
-        }
+        }*/
 }
 /*=====================*/
@@ -499 +499 @@
 /*}}}*/
 
+PoI * Pimp::get_poi(int i)
+{
+        return poi[i];
+}
+
+double Compass::get_news()
+{
+        return 90;
+}
+
+double Compass::current_pos_x()
+{
+        return 10;
+}
+
+double Compass::current_pos_y()
+{
+        return 10;
+}
+
 } // namespace iwearmap
 } // namespace iwear
@@ -504 +524 @@
 /**
  * $Log$
+ * Revision 1.18  2005/09/29 20:07:33  marius
+ * sdl zeugs
+ *
  * Revision 1.17  2005/09/26 14:01:16  marius
  * updates bugfixes

trunk/map/src/test.cpp

@@ -28 +28 @@
 #include <unistd.h>
 #include "iwear-iwearmap/pimp.h"
- 
+#include "/usr/include/SDL/SDL.h" 
+
+
 using namespace std;
 using namespace iwear;
@@ -44 +46 @@
             params[0] = "wget";
             params[1] = "-O";
+            //sprintf(params[2], "%s/%s", tempdir, filename)
             params[2] = filename;
     
@@ -72 +75 @@
 
 int main() { /*{{{*/
-
-    cout << "Testklasse f�itag" << endl;
+        MapTest * test = new MapTest();
+        
+        test->set_tempdir("~/temp");
+        test->set_mapserver("http://www.siriusdd.de/cgi-bin/mapserver-4.2.3");
+        test->set_mapserver_options("mode=map&map=/srv/www/htdocs/mapserver/hb.map&layers=uni1+uni2+uni3+uni4");
+        test->get_tile(5800.0, 0.0, 6600.0, 800.0, 640, 480, "test.jpg");
+        
+        SDL_Surface * screen;
+        
+        if (SDL_Init(SDL_INIT_VIDEO) == -1 )
+        {
+                cout << "fehler";
+                exit(-1);
+        }
+        
+        screen = SDL_SetVideoMode(640, 480, 8, SDL_SWSURFACE);
+        if (screen == NULL)
+        {
+                cout << "Fehler keine Graphik";
+                exit(-1);
+        }
+        
+        SDL_Surface * image;
+        
+        image = SDL_LoadBMP("test.jpg");
+        if (image == NULL)
+        {
+                cout << "Fehler kein Bild";
+                exit(-1);
+        }
+        
+        if (image->format->palette && screen->format->palette)
+        {
+                SDL_SetColors(screen, image->format->palette->colors, 0, image->format->palette->ncolors);
+        }
+        
+        if (SDL_BlitSurface(image, NULL, screen, NULL) < 0)
+        {
+                cout << "Fehler blid Surface";
+                exit(-1);
+        }
+        
+        SDL_UpdateRect(screen, 0, 0, image->w, image->h);
+        
+        SDL_FreeSurface(image);
+        
+        SDL_Quit();
+        exit(0);
+        
+    /*cout << "Testklasse f�itag" << endl;
     cout << "Geben Sie einen Betrachtungswinkel ein, in dessen Richtung sie schauen." << endl;
     cout << "0 Grad ist Norden, 90 Grad ist Osten, 180 Grad ist S�nd 270 Grad ist Westen." << endl;
@@ -83 +134 @@
          cin >> a;       
        }
-
+*/
 } /*}}}*/
 
@@ -89 +140 @@
 /**
  * $Log$
+ * Revision 1.6  2005/09/29 20:07:33  marius
+ * sdl zeugs
+ *
  * Revision 1.5  2005/09/26 14:01:16  marius
  * updates bugfixes