Text archives Help

---

Author: abe
Date: Fri Aug 19 13:23:56 2005
New Revision: 483

Modified:
   branches/itanium2/Engine/Control/RTRT_register.cc
   branches/itanium2/fox/FMantaWindow.cc
   branches/itanium2/fox/FMantaWindow.h
Log:
Added/merged support for dissolvedtiled image traverser from trunk

Modified: branches/itanium2/Engine/Control/RTRT_register.cc
==============================================================================
--- branches/itanium2/Engine/Control/RTRT_register.cc   (original)
+++ branches/itanium2/Engine/Control/RTRT_register.cc   Fri Aug 19 13:23:56 
2005
@@ -8,6 +8,7 @@
 #include <Engine/ImageTraversers/FramelessImageTraverser.h>
 #include <Engine/ImageTraversers/AFImageTraverser.h>
 #include <Engine/ImageTraversers/DissolveImageTraverser.h>
+#include <Engine/ImageTraversers/DissolveTiledImageTraverser.h>
 #include <Engine/LoadBalancers/CyclicLoadBalancer.h>
 #include <Engine/LoadBalancers/SimpleLoadBalancer.h>
 #include <Engine/LoadBalancers/WQLoadBalancer.h>
@@ -56,6 +57,7 @@
     rtrt->registerComponent("frameless", &FramelessImageTraverser::create);
     rtrt->registerComponent("afr", &AFImageTraverser::create);
     rtrt->registerComponent("dissolve", &DissolveImageTraverser::create);
+    rtrt->registerComponent("dissolvetiled", 
&DissolveTiledImageTraverser::create);
 
     // Register image types
     rtrt->registerComponent("null", &NullImage::create);

Modified: branches/itanium2/fox/FMantaWindow.cc
==============================================================================
--- branches/itanium2/fox/FMantaWindow.cc       (original)
+++ branches/itanium2/fox/FMantaWindow.cc       Fri Aug 19 13:23:56 2005
@@ -56,9 +56,10 @@
        FXMAPFUNC(SEL_COMMAND, FMantaWindow::ID_TEXT_SAMPLER,    
FMantaWindow::onPixelSamplerText ),
 
        // Traversers
-  FXMAPFUNC(SEL_COMMAND, FMantaWindow::ID_TILED_TRAVERSER, 
FMantaWindow::onTraverser ),
+  FXMAPFUNC(SEL_COMMAND, FMantaWindow::ID_TILED_TRAVERSER,           
FMantaWindow::onTraverser ),
   FXMAPFUNC(SEL_COMMAND, FMantaWindow::ID_FRAMELESS_TRAVERSER,       
FMantaWindow::onTraverser ),
-       FXMAPFUNC(SEL_COMMAND, FMantaWindow::ID_TEXT_TRAVERSER,  
FMantaWindow::onTraverserText ),
+  FXMAPFUNC(SEL_COMMAND, FMantaWindow::ID_DISSOLVETILED_TRAVERSER,   
FMantaWindow::onTraverser ),
+       FXMAPFUNC(SEL_COMMAND, FMantaWindow::ID_TEXT_TRAVERSER,            
FMantaWindow::onTraverserText ),
 
        // Cutting planes.
        FXMAPFUNC(SEL_LEFTBUTTONPRESS, FMantaImageFrame::ID_PIXEL_SELECT, 
FMantaWindow::onAddCuttingPlane ),
@@ -115,7 +116,8 @@
        traverser_menu = new FXMenuPane( this );
   new FXMenuCommand( traverser_menu, "Tiled", 0, this, ID_TILED_TRAVERSER );
   new FXMenuCommand( traverser_menu, "Frameless", 0, this, 
ID_FRAMELESS_TRAVERSER );
-       new FXMenuCommand( traverser_menu, "Enter Text...", 0, this,  
ID_TEXT_TRAVERSER );
+  new FXMenuCommand( traverser_menu, "Dissolve Tiled", 0, this, 
ID_DISSOLVETILED_TRAVERSER );
+  new FXMenuCommand( traverser_menu, "Enter Text...", 0, this,  
ID_TEXT_TRAVERSER );
        new FXMenuTitle( menu_bar, "Traversers", 0, traverser_menu );
 
        // Options menu.
@@ -389,6 +391,10 @@
                        manta_interface->addTransaction("Image Traverser.",
                                
Callback::create(this,&FMantaWindow::mantaTraverser,string("frameless")));
                        break;
+    case ID_DISSOLVETILED_TRAVERSER:
+                       manta_interface->addTransaction("Image Traverser.",
+                               
Callback::create(this,&FMantaWindow::mantaTraverser,string("dissolvetiled( 
-tilesize 8x8 )")));
+                       break;
        }
        
        return 1;
@@ -628,7 +634,7 @@
                }
        }
        catch (IllegalArgument e) {
-               std::cout << "Caught IllegalArgument exception" << std::endl;
+               std::cout << "Caught IllegalArgument exception" << 
e.message() << std::endl;
        };
 }
 

Modified: branches/itanium2/fox/FMantaWindow.h
==============================================================================
--- branches/itanium2/fox/FMantaWindow.h        (original)
+++ branches/itanium2/fox/FMantaWindow.h        Fri Aug 19 13:23:56 2005
@@ -100,6 +100,7 @@
                        // Image traverser options.
       ID_TILED_TRAVERSER,
       ID_FRAMELESS_TRAVERSER,
+      ID_DISSOLVETILED_TRAVERSER,
                        ID_TEXT_TRAVERSER,
                        
                        // Cutting planes.

---

• [MANTA] r483 - in branches/itanium2: Engine/Control fox, abe, 08/19/2005

---

Archive powered by MHonArc 2.6.16.