Changeset 4354 for trunk/packages

Timestamp:

May 8, 2014, 12:36:24 PM (10 years ago)

Author:

ldelgass

Message:

Set screen number from DISPLAY in geovis

File:

• trunk/packages/vizservers/geovis/Renderer.cpp (modified) (5 diffs)

trunk/packages/vizservers/geovis/Renderer.cpp

@@ -67 +67 @@
     _scaleBarUnits(UNITS_METERS)
 {
+    TRACE("Enter");
+
     _bgColor[0] = 0;
     _bgColor[1] = 0;
@@ -247 +249 @@
 void Renderer::finalizeViewer() {
     initViewer();
+    int screen = 0;
+    const char *displayEnv = getenv("DISPLAY");
+    if (displayEnv != NULL) {
+        // 3 parts: host, display, screen
+        int part = 0;
+        for (size_t c = 0; c < strlen(displayEnv); c++) {
+            if (displayEnv[c] == ':') {
+                part = 1;
+            } else if (part == 1 && displayEnv[c] == '.') {
+                part = 2;
+            } else if (part == 2) {
+                screen = atoi(&displayEnv[c]);
+                break;
+            }
+        }
+    }
     if (!_viewer->isRealized()) {
 #ifdef USE_OFFSCREEN_RENDERING
@@ -294 +312 @@
         _captureCallback = new ScreenCaptureCallback(texture2D);
         _viewer->getCamera()->setFinalDrawCallback(_captureCallback.get());
-        _viewer->setUpViewInWindow(0, 0, _windowWidth, _windowHeight);
+        _viewer->setUpViewInWindow(0, 0, _windowWidth, _windowHeight, screen);
 #endif
 #else
@@ -300 +318 @@
         _viewer->getCamera()->setFinalDrawCallback(_captureCallback.get());
         //_viewer->getCamera()->getDisplaySettings()->setDoubleBuffer(false);
-        _viewer->setUpViewInWindow(0, 0, _windowWidth, _windowHeight);
+        _viewer->setUpViewInWindow(0, 0, _windowWidth, _windowHeight, screen);
 #endif
         _viewer->realize();
@@ -1633 +1651 @@
     }
         break;
-    case UNITS_US_SURVEY_FEET:
+    case UNITS_US_SURVEY_FEET: {
+        double feet = meters * 3937.0/1200.0;
+        scale = feet / pixelWidth;
+        feet = normalizeScaleFeet(feet);
+        pixelWidth = feet / scale;
+        if (_scaleLabel.valid()) {
+            if (feet >= 5280) {
+                _scaleLabel->setText(osgEarth::Stringify()
+                                     << feet / 5280.0
+                                     << " miUS");
+             } else {
+                _scaleLabel->setText(osgEarth::Stringify()
+                                     << feet
+                                     << " ftUS");
+            }
+        }
+    }
+        break;
     case UNITS_INTL_FEET: {
-        double feet;
-        if (_scaleBarUnits == UNITS_US_SURVEY_FEET) {
-            feet = meters * 3937.0/1200.0;
-        } else {
-            feet = 5280.0 * meters / 1609.344;
-        }
+        double feet = 5280.0 * meters / 1609.344;
         scale = feet / pixelWidth;
         feet = normalizeScaleFeet(feet);