- remove unused classes lat_label and lon_label (it's the instr_label

[flightgear.git] / src / Cockpit / panel_io.cxx

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index 40963f3d0c67c5c2908464aec43543c6614f1877..16e148ba56b2cb843c18fe6b5973071bd2a4024a 100644 (file)
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -11,10 +11,10 @@
 //  WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 //  General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 //  $Id$
 
@@ -22,7 +22,7 @@
 #  include <config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H          
+#ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif
 
@@ -175,7 +175,7 @@ readAction (const SGPropertyNode * node, float w_scale, float h_scale)
   SGPropertyNode *binding;
   vector<SGPropertyNode_ptr>bindings = node->getChildren("binding");
 
-  // button-less actions are fired initially, then fogotten
+  // button-less actions are fired initially
   if (!node->hasValue("w") || !node->hasValue("h")) {
     for (i = 0; i < bindings.size(); i++) {
       FGBinding b(bindings[i]);
@@ -289,7 +289,7 @@ readTransformation (const SGPropertyNode * node, float w_scale, float h_scale)
     SG_LOG( SG_COCKPIT, SG_INFO, "Found interpolation table with "
             << trans_table->nChildren() << "children" );
     t->table = new SGInterpTable();
-    for(int i = 0; i < trans_table->nChildren(); i++) {
+    for (int i = 0; i < trans_table->nChildren(); i++) {
       const SGPropertyNode * node = trans_table->getChild(i);
       if (!strcmp(node->getName(), "entry")) {
        double ind = node->getDoubleValue("ind", 0.0);
@@ -439,6 +439,7 @@ readLayer (const SGPropertyNode * node, float w_scale, float h_scale)
   string type = node->getStringValue("type");
   int w = node->getIntValue("w", -1);
   int h = node->getIntValue("h", -1);
+  bool emissive = node->getBoolValue("emissive", false);
   if (w != -1)
     w = int(w * w_scale);
   if (h != -1)
@@ -457,6 +458,11 @@ readLayer (const SGPropertyNode * node, float w_scale, float h_scale)
   if (type == "texture") {
     FGCroppedTexture texture = readTexture(node->getNode("texture"));
     layer = new FGTexturedLayer(texture, w, h);
+    if (emissive) {
+      FGTexturedLayer *tl=(FGTexturedLayer*)layer;
+      tl->setEmissive(true);
+    }
+
   }
 
                                // A group of sublayers.
@@ -485,7 +491,7 @@ readLayer (const SGPropertyNode * node, float w_scale, float h_scale)
     tlayer->setPointSize(pointSize);
 
                                // Set the font.
-    string fontName = node->getStringValue("font", "default");
+    string fontName = node->getStringValue("font", "Helvetica");
     tlayer->setFontName(fontName);
 
     const SGPropertyNode * chunk_group = node->getNode("chunks");
@@ -763,10 +769,10 @@ readPanel (const SGPropertyNode * root)
         FGPanelInstrument * instrument = readInstrument(node);
         if (instrument != 0)
           panel->addInstrument(instrument);
-      } else if(!strcmp(node->getName(), "special-instrument")) {
+      } else if (!strcmp(node->getName(), "special-instrument")) {
         //cout << "Special instrument found in instruments section!\n";
         const string name = node->getStringValue("name");
-        if(name == "KLN89 GPS") {
+        if (name == "KLN89 GPS") {
           //cout << "Special instrument is KLN89\n";
           
           int x = node->getIntValue("x", -1);
@@ -798,7 +804,7 @@ readPanel (const SGPropertyNode * root)
           // Warning - hardwired size!!!
           RenderArea2D* instrument = new RenderArea2D(158, 40, 158, 40, x, y);
           KLN89* gps = (KLN89*)globals->get_subsystem("kln89");
-                 if(gps == NULL) {
+                 if (gps == NULL) {
                          gps = new KLN89(instrument);
                          globals->add_subsystem("kln89", gps);
                  }