Changeset 6562

Timestamp:

Oct 25, 2016, 12:39:17 AM (8 years ago)

Author:

ldelgass

Message:

Remove unused removeDupes setting (doesn't exist in OE trunk)

File:

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

geovis/trunk/RendererCmd.cpp

@@ -2650 +2650 @@
             return TCL_ERROR;
         }
-        bool removeDupes, declutter;
-        if (GetBooleanFromObj(interp, objv[20], &removeDupes) != TCL_OK ||
-            GetBooleanFromObj(interp, objv[21], &declutter) != TCL_OK) {
+        bool declutter;
+        if (GetBooleanFromObj(interp, objv[20], &declutter) != TCL_OK) {
             return TCL_ERROR;
         }
         osgEarth::Symbology::TextSymbol::Alignment alignment =
-            ParseTextAlignment(Tcl_GetString(objv[22]));
+            ParseTextAlignment(Tcl_GetString(objv[21]));
         int xoff, yoff;
-        if (Tcl_GetIntFromObj(interp, objv[23], &xoff) != TCL_OK ||
-            Tcl_GetIntFromObj(interp, objv[24], &yoff) != TCL_OK) {
+        if (Tcl_GetIntFromObj(interp, objv[22], &xoff) != TCL_OK ||
+            Tcl_GetIntFromObj(interp, objv[23], &yoff) != TCL_OK) {
             return TCL_ERROR;
         }
@@ -2674 +2673 @@
             ts->priority() = osgEarth::Symbology::NumericExpression(priority);
         }
-        ts->removeDuplicateLabels() = removeDupes;
         //ts->font() = "Arial";
         ts->size() = ftSize;
@@ -2692 +2690 @@
         geomOpts.minRange() = 0.f;
         geomOpts.maxRange() = FLT_MAX;
-        if (objc > 25) {
+        if (objc > 24) {
             float min, max;
-            if (GetFloatFromObj(interp, objv[25], &min) != TCL_OK ||
-                GetFloatFromObj(interp, objv[26], &max) != TCL_OK) {
+            if (GetFloatFromObj(interp, objv[24], &min) != TCL_OK ||
+                GetFloatFromObj(interp, objv[25], &max) != TCL_OK) {
                 return TCL_ERROR;
             }