Changeset 5119 for geovis/trunk/RendererCmd.cpp

Timestamp:

Mar 11, 2015, 3:11:07 AM (9 years ago)

Author:

ldelgass

Message:

Add legend option for blending against a background color

File:

• geovis/trunk/RendererCmd.cpp (modified) (2 diffs)

geovis/trunk/RendererCmd.cpp

@@ -743 +743 @@
           Tcl_Obj *const *objv)
 {
-    if (objc != 4) {
+    if (objc < 4) {
         Tcl_AppendResult(interp, "wrong # args: should be \"",
                 Tcl_GetString(objv[0]), " colormapName width height\"", (char*)NULL);
@@ -755 +755 @@
         return TCL_ERROR;
     }
-
     bool opaque = true;
+    if (objc > 4) {
+        if (GetBooleanFromObj(interp, objv[4], &opaque) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    }
     float bgColor[3];
-    memset(bgColor, 0, sizeof(float)*3);
+    if (objc > 5) {
+        if (GetFloatFromObj(interp, objv[5], &bgColor[0]) != TCL_OK ||
+            GetFloatFromObj(interp, objv[6], &bgColor[1]) != TCL_OK ||
+            GetFloatFromObj(interp, objv[7], &bgColor[2]) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    } else {
+        memset(bgColor, 0, sizeof(float)*3);
+    }
     osg::ref_ptr<osg::Image> imgData = new osg::Image();