Mercurial > hg > soniczoomios
comparison grid.cpp @ 1:23efe1f0cd8a
work on event logging
author | Robert Tubb <rt300@eecs.qmul.ac.uk> |
---|---|
date | Thu, 22 Nov 2012 17:59:13 +0000 |
parents | 307e5fb699fb |
children |
comparison
equal
deleted
inserted
replaced
0:307e5fb699fb | 1:23efe1f0cd8a |
---|---|
5 // Created by Robert Tubb on 03/10/2012. | 5 // Created by Robert Tubb on 03/10/2012. |
6 // | 6 // |
7 // | 7 // |
8 #include "ofMain.h" | 8 #include "ofMain.h" |
9 #include "grid.h" | 9 #include "grid.h" |
10 //#include "presetManager.h" | 10 #include "eventLogger.h" |
11 | 11 |
12 #include <sstream> | 12 #include <sstream> |
13 | 13 |
14 //extern PresetManager presetManager; | 14 //extern PresetManager presetManager; |
15 | 15 extern EventLogger eventLogger; |
16 //-------------------------------------------------------------- | 16 //-------------------------------------------------------------- |
17 Grid::Grid(){ | 17 Grid::Grid(){ |
18 | 18 |
19 } | 19 } |
20 //-------------------------------------------------------------- | 20 //-------------------------------------------------------------- |
405 TwoVector moveS; | 405 TwoVector moveS; |
406 moveS.setCoord(moveX * scale, moveY * scale); | 406 moveS.setCoord(moveX * scale, moveY * scale); |
407 | 407 |
408 topLeft = topLeft - moveS; // - because moving to the right means taking away from offset | 408 topLeft = topLeft - moveS; // - because moving to the right means taking away from offset |
409 centre = centre - moveS; | 409 centre = centre - moveS; |
410 | 410 eventLogger.logEvent(-1, centre, scale); |
411 viewWasChanged(); | 411 viewWasChanged(); |
412 } | 412 } |
413 //-------------------------------------------------------------- | 413 //-------------------------------------------------------------- |
414 void Grid::zoom(float factor){ | 414 void Grid::zoom(float factor){ |
415 if(maxZoom && factor > 1.0){ | 415 if(maxZoom && factor > 1.0){ |
431 // update view size using centre | 431 // update view size using centre |
432 // and scale... | 432 // and scale... |
433 size.x = size.x*factor; // zooming in, size gets SMALLER (view less) | 433 size.x = size.x*factor; // zooming in, size gets SMALLER (view less) |
434 size.y = size.y*factor; | 434 size.y = size.y*factor; |
435 | 435 |
436 | |
437 eventLogger.logEvent(-2, centre, scale); | |
436 viewWasChanged(); | 438 viewWasChanged(); |
437 | 439 |
438 } | 440 } |
439 //-------------------------------------------------------------- | 441 //-------------------------------------------------------------- |
440 void Grid::viewWasChanged(){ | 442 void Grid::viewWasChanged(){ |