Skip to content

Commit 2e983cf

Browse files
committed
Debugged zooming in mmSceneApp
1 parent 4e840ac commit 2e983cf

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

libs/MoMa/scenes/oF/application/mmSceneApp.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,12 @@ void MoMa::SceneApp::mouseReleased( ofMouseEventArgs &mouse ) {
775775

776776
zoomHighBound = mouse.x;
777777

778+
if (zoomLowBound >= zoomHighBound) {
779+
780+
zoomHighBound = zoomLowBound;
781+
zoomLowBound = mouse.x;
782+
}
783+
778784
double newMin = ofMap( zoomLowBound, 0, ofGetWidth(), lowBound.time(), highBound.time() );
779785
double newMax = ofMap( zoomHighBound, 0, ofGetWidth(), lowBound.time(), highBound.time() );
780786

@@ -790,6 +796,12 @@ void MoMa::SceneApp::mouseReleased( ofMouseEventArgs &mouse ) {
790796

791797
zoomHighBound = mouse.x;
792798

799+
if (zoomLowBound >= zoomHighBound) {
800+
801+
zoomHighBound = zoomLowBound;
802+
zoomLowBound = mouse.x;
803+
}
804+
793805
double newMin = ofMap( zoomLowBound, 0, ofGetWidth(), lowBound.time(), highBound.time() );
794806
double newMax = ofMap( zoomHighBound, 0, ofGetWidth(), lowBound.time(), highBound.time() );
795807

@@ -1620,7 +1632,7 @@ void MoMa::SceneApp::zoom( double tMin, double tMax ) {
16201632

16211633
void MoMa::SceneApp::showAll( void ) {
16221634

1623-
lowBound.setTime( 0.0f, frameRate );
1635+
lowBound.setTime(minBound.time(), frameRate );
16241636
highBound.setTime( maxBound.time(), frameRate );
16251637

16261638
// highBound.index = maxBound.index-1;

0 commit comments

Comments
 (0)