Text archives Help

---

Author: abe
Date: Mon Oct 24 04:25:49 2005
New Revision: 652

Modified:
   branches/itanium2/fox/FMantaImageFrame.cc
   branches/itanium2/fox/FMantaTrackballNav.cc
Log:

Fixed width/height problem in Trackball-- works now.

Removed debugging statements from ImageFrame. Fixed add cuttingplane problem.

(Guess that last check in had a lot of bugs.)

M    fox/FMantaTrackballNav.cc
M    fox/FMantaImageFrame.cc


Modified: branches/itanium2/fox/FMantaImageFrame.cc
==============================================================================
--- branches/itanium2/fox/FMantaImageFrame.cc   (original)
+++ branches/itanium2/fox/FMantaImageFrame.cc   Mon Oct 24 04:25:49 2005
@@ -53,7 +53,7 @@
 // Fox event on window resize.
 long FMantaImageFrame::onConfigure  ( FXObject *sender, FXSelector sel, void 
*data ) {
 
-  std::cerr << "ImageFrame resize" << std::endl;
+  // std::cerr << "ImageFrame resize" << std::endl;
 
   if (shown()) {
   
@@ -77,8 +77,11 @@
 
        // Check for a double click.
        if (event->click_count == 2) {
-               if (fox_target)
-                       return 
fox_target->handle(this,FXSEL(FXSELTYPE(sel),0),data);
+    // std::cerr << "Click count 2" << std::endl;
+               if (fox_target) {
+      // std::cerr << "Sending to fox_target" << std::endl;
+                       return 
fox_target->handle(this,FXSEL(FXSELTYPE(sel),ID_PIXEL_SELECT),data);
+    }
                return 0;
        }
 

Modified: branches/itanium2/fox/FMantaTrackballNav.cc
==============================================================================
--- branches/itanium2/fox/FMantaTrackballNav.cc (original)
+++ branches/itanium2/fox/FMantaTrackballNav.cc Mon Oct 24 04:25:49 2005
@@ -33,9 +33,14 @@
 
        FXEvent *event = (FXEvent *)data;
        FXushort sel_type = FXSELTYPE( sel );
-       
-       Real width  = ((FXComposite *)sender)->getWidth() * 0.5;
-       Real height = ((FXComposite *)sender)->getHeight() * 0.5;
+
+  // Determine the image resolution.
+  int xres, yres;
+  bool stereo;
+  manta_interface->getResolution( manta_channel, stereo, xres, yres );
+  
+       Real width  = (Real)xres * 0.5;
+       Real height = (Real)yres * 0.5;
        
        // Record mouse up and mouse down.
        switch (sel_type) {
@@ -54,7 +59,7 @@
        case SEL_RIGHTBUTTONPRESS:
                mouse_down[2] = true;
 
-    printf("Right button. state: 0x%x SHIFTMASK 0x%x\n", event->state, 
SHIFTMASK );
+    // printf("Right button. state: 0x%x SHIFTMASK 0x%x\n", event->state, 
SHIFTMASK );
     
                // Two clicks of the right button changes the lookat point.
                if ((event->state & SHIFTMASK) == SHIFTMASK) {
@@ -62,7 +67,7 @@
                        Point lookat;
                        Vector normal;
 
-      std::cerr << "Setting center of rotation. " << event->win_x << " " << 
event->win_y << std::endl;
+      // std::cerr << "Setting center of rotation. " << event->win_x << " " 
<< event->win_y << std::endl;
                        
                        if (manta_frame->shootOneRay( event->win_x, 
event->win_y, lookat, normal )) {
                                manta_interface->addTransaction("camera 
lookat",

---

• [MANTA] r652 - branches/itanium2/fox, abe, 10/24/2005

---

Archive powered by MHonArc 2.6.16.