Changeset 6562


Ignore:
Timestamp:
Oct 25, 2016 12:39:17 AM (6 years ago)
Author:
ldelgass
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • geovis/trunk/RendererCmd.cpp

    r6553 r6562  
    26502650            return TCL_ERROR;
    26512651        }
    2652         bool removeDupes, declutter;
    2653         if (GetBooleanFromObj(interp, objv[20], &removeDupes) != TCL_OK ||
    2654             GetBooleanFromObj(interp, objv[21], &declutter) != TCL_OK) {
     2652        bool declutter;
     2653        if (GetBooleanFromObj(interp, objv[20], &declutter) != TCL_OK) {
    26552654            return TCL_ERROR;
    26562655        }
    26572656        osgEarth::Symbology::TextSymbol::Alignment alignment =
    2658             ParseTextAlignment(Tcl_GetString(objv[22]));
     2657            ParseTextAlignment(Tcl_GetString(objv[21]));
    26592658        int xoff, yoff;
    2660         if (Tcl_GetIntFromObj(interp, objv[23], &xoff) != TCL_OK ||
    2661             Tcl_GetIntFromObj(interp, objv[24], &yoff) != TCL_OK) {
     2659        if (Tcl_GetIntFromObj(interp, objv[22], &xoff) != TCL_OK ||
     2660            Tcl_GetIntFromObj(interp, objv[23], &yoff) != TCL_OK) {
    26622661            return TCL_ERROR;
    26632662        }
     
    26742673            ts->priority() = osgEarth::Symbology::NumericExpression(priority);
    26752674        }
    2676         ts->removeDuplicateLabels() = removeDupes;
    26772675        //ts->font() = "Arial";
    26782676        ts->size() = ftSize;
     
    26922690        geomOpts.minRange() = 0.f;
    26932691        geomOpts.maxRange() = FLT_MAX;
    2694         if (objc > 25) {
     2692        if (objc > 24) {
    26952693            float min, max;
    2696             if (GetFloatFromObj(interp, objv[25], &min) != TCL_OK ||
    2697                 GetFloatFromObj(interp, objv[26], &max) != TCL_OK) {
     2694            if (GetFloatFromObj(interp, objv[24], &min) != TCL_OK ||
     2695                GetFloatFromObj(interp, objv[25], &max) != TCL_OK) {
    26982696                return TCL_ERROR;
    26992697            }
Note: See TracChangeset for help on using the changeset viewer.