Changeset 2498

Timestamp:

Sep 8, 2011 9:16:13 PM (13 years ago)

Author:

ldelgass

Message:

Fix legend command for when RENDER_TARGA is enabled. Turn down syslog spam.

Location:

branches/vtkvis_threaded

Files:

• ResponseQueue.cpp (modified) (1 diff)
• RpVtkRenderServer.cpp (modified) (2 diffs)
• RpVtkRendererCmd.cpp (modified) (3 diffs)

branches/vtkvis_threaded/ResponseQueue.cpp

@@ -42 +42 @@
     }   
     /* Examine the list and remove any queued responses of the same type. */
-    INFO("before # of elements is %d\n", _list.size());
+    TRACE("before # of elements is %d\n", _list.size());
     for (std::list<Response *>::iterator itr = _list.begin();
          itr != _list.end(); ++itr) {

branches/vtkvis_threaded/RpVtkRenderServer.cpp

@@ -243 +243 @@
     Tcl_Interp *interp;
 
-    INFO("starting reader thread");
+    TRACE("starting reader thread");
     interp = (Tcl_Interp *)queue->clientData();
     vtkSmartPointer<vtkUnsignedCharArray> imgData = 
@@ -271 +271 @@
     ResponseQueue *queue = (ResponseQueue *)clientData;
 
-    INFO("starting writer thread");
+    TRACE("starting writer thread");
     for (;;) {
         Response *response;

branches/vtkvis_threaded/RpVtkRendererCmd.cpp

@@ -2695 +2695 @@
 
 #ifdef DEBUG
+# ifdef RENDER_TARGA
     writeTGAFile("/tmp/legend.tga", imgData->GetPointer(0), width, height,
                  TARGA_BYTES_PER_PIXEL);
+# else
+    writeTGAFile("/tmp/legend.tga", imgData->GetPointer(0), width, height,
+                 TARGA_BYTES_PER_PIXEL, true);
+# endif
 #else
     char cmd[256];
     snprintf(cmd, sizeof(cmd), "nv>legend {%s} {%s} %g %g",
              colorMapName, title.c_str(), range[0], range[1]);
-#ifdef RENDER_TARGA
-    writeTGA(g_fdOut, cmd, imgData->GetPointer(0), width, height,
-                 TARGA_BYTES_PER_PIXEL);
-#else
-#ifdef USE_THREADS
+
+# ifdef USE_THREADS
+#  ifdef RENDER_TARGA
+    ResponseQueue *queue = (ResponseQueue *)clientData;
+    queueTGA(queue, cmd, imgData->GetPointer(0), width, height,
+             TARGA_BYTES_PER_PIXEL);
+#  else
     ResponseQueue *queue = (ResponseQueue *)clientData;
     queuePPM(queue, cmd, imgData->GetPointer(0), width, height);
-#else
+#  endif
+# else
+#  ifdef RENDER_TARGA
+    writeTGA(g_fdOut, cmd, imgData->GetPointer(0), width, height,
+             TARGA_BYTES_PER_PIXEL);
+#  else
     writePPM(g_fdOut, cmd, imgData->GetPointer(0), width, height);
-#endif /*USE_THREADS*/
-#endif /*RENDER_TARGA*/
-#endif /*DEBUG*/
+#  endif
+# endif // USE_THREADS
+#endif // DEBUG
     return TCL_OK;
 }
@@ -4872 +4884 @@
  * \brief Execute commands from client in Tcl interpreter
  * 
- *      In this threaded model, the select call is for event compression.  We
- *      want to execute render server commands as long as they keep coming.  
- *      The lets us execute a stream of many commands but render once.  This 
- *      benefits camera movements, screen resizing, and opacity changes 
- *      (using a slider on the client).  The down side is you don't render
- *      until there's a lull in the command stream.  If the client needs an
- *      image, it can issue a "ppmflush" command.  That breaks us out of the
- *      read loop.
+ * In this threaded model, the select call is for event compression.  We
+ * want to execute render server commands as long as they keep coming.  
+ * This lets us execute a stream of many commands but render once.  This 
+ * benefits camera movements, screen resizing, and opacity changes 
+ * (using a slider on the client).  The down side is you don't render
+ * until there's a lull in the command stream.  If the client needs an
+ * image, it can issue a "ppmflush" command.  That breaks us out of the
+ * read loop.
  */
 int
@@ -4956 +4968 @@
 {
     Tcl_MakeSafe(interp);
-    Tcl_CreateObjCommand(interp, "axis",      AxisCmd,        clientData, NULL);
-    Tcl_CreateObjCommand(interp, "camera",    CameraCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "colormap",  ColorMapCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "contour2d", Contour2DCmd,   clientData, NULL);
-    Tcl_CreateObjCommand(interp, "contour3d", Contour3DCmd,   clientData, NULL);
-    Tcl_CreateObjCommand(interp, "dataset",   DataSetCmd,     clientData, NULL);
-    Tcl_CreateObjCommand(interp, "glyphs",    GlyphsCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "heightmap", HeightMapCmd,   clientData, NULL);
-    Tcl_CreateObjCommand(interp, "legend",    LegendCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "lic",       LICCmd,         clientData, NULL);
-    Tcl_CreateObjCommand(interp, "molecule",  MoleculeCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "polydata",  PolyDataCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "ppmflush",  PpmFlushCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "pseudocolor", PseudoColorCmd, clientData, 
-        NULL);
-    Tcl_CreateObjCommand(interp, "renderer",  RendererCmd,    clientData, NULL);
-    Tcl_CreateObjCommand(interp, "screen",    ScreenCmd,      clientData, NULL);
-    Tcl_CreateObjCommand(interp, "streamlines", StreamlinesCmd, clientData, 
-        NULL);
-    Tcl_CreateObjCommand(interp, "volume",    VolumeCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "axis",        AxisCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "camera",      CameraCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "colormap",    ColorMapCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "contour2d",   Contour2DCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "contour3d",   Contour3DCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "dataset",     DataSetCmd,     clientData, NULL);
+    Tcl_CreateObjCommand(interp, "glyphs",      GlyphsCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "lic",         LICCmd,         clientData, NULL);
+    Tcl_CreateObjCommand(interp, "molecule",    MoleculeCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "polydata",    PolyDataCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "imgflush",    PpmFlushCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "pseudocolor", PseudoColorCmd, clientData, NULL);
+    Tcl_CreateObjCommand(interp, "renderer",    RendererCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "streamlines", StreamlinesCmd, clientData, NULL);
+    Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      clientData, NULL);
 }