Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:camillol/cs424p3

Conflicts:
	Screenshots/ByAirportDistanceGraph.png
	Screenshots/ByTimeGraph.png
	Screenshots/ByYearGraph.png
	Screenshots/DensityPopulationGraph.png
	Screenshots/SightingDetails.png
	data/ufo.db
  • Loading branch information...
commit 373a7156566b2477cc28d4b63cf54fc69527f961 2 parents 6674d42 + 7006fd5
Eugene Magdel jenikm authored
Showing with 17 additions and 10 deletions.
  1. +1 −1  MapView.pde
  2. +15 −9 Sighting.pde
  3. +1 −0  Utils.pde
2  MapView.pde
View
@@ -1,4 +1,4 @@
-import processing.opengl.*;
+//import processing.opengl.*;
import com.modestmaps.*;
import com.modestmaps.core.*;
import com.modestmaps.geo.*;
24 Sighting.pde
View
@@ -338,16 +338,22 @@ class SQLiteDataSource implements DataSource {
String dbname = "ufo.db";
String dbpath = null;
- dbpath = dataPath(dbname);
- File dbf = new File(dbpath);
- if (!dbf.exists()) {
- dbpath = savePath(dbname);
- dbf = new File(dbpath);
+ if (sketchPath == null) {
+ /* applet - what now!? */
+ println("applets can't access files!");
+ dbpath = "/Users/camillo/test.py";
+ } else {
+ dbpath = dataPath(dbname);
+ File dbf = new File(dbpath);
if (!dbf.exists()) {
- stopWatch();
- print("extracting database...");
- saveStream(dbpath, createInput(dbname));
- println(stopWatch());
+ dbpath = savePath(dbname);
+ dbf = new File(dbpath);
+ if (!dbf.exists()) {
+ stopWatch();
+ print("extracting database...");
+ saveStream(dbpath, createInput(dbname));
+ println(stopWatch());
+ }
}
}
1  Utils.pde
View
@@ -60,6 +60,7 @@ void popClip()
dataPath(""): /Users/camillo/UIC/CS424 visualization/p3/cs424p3/application.macosx/data/
applet: sketchPath: null
+ dataPath(""): null
*/
/* data utilities */
Please sign in to comment.
Something went wrong with that request. Please try again.