fixed data filter dialog bug

Author: rtv

libstage/canvas.cc

@@ -1004,15 +1004,15 @@ void Canvas::renderFrame()
     colorstack.Pop();
 
     // ENERGY BOX
-    if (PowerPack::global_capacity > 0) {
-      colorstack.Push(0.8, 1.0, 0.8, 0.85); // pale green
-      glRectf(0, height, width, 90);
-      colorstack.Push(0, 0, 0); // black
-      Gl::draw_string_multiline(margin, height + margin, width, 50, world->EnergyString().c_str(),
-                                (Fl_Align)(FL_ALIGN_LEFT | FL_ALIGN_BOTTOM));
-      colorstack.Pop();
-      colorstack.Pop();
-    }
+    // if (PowerPack::global_capacity > 0) {
+    //   colorstack.Push(0.8, 1.0, 0.8, 0.85); // pale green
+    //   glRectf(0, height, width, 90);
+    //   colorstack.Push(0, 0, 0); // black
+    //   Gl::draw_string_multiline(margin, height + margin, width, 50, world->EnergyString().c_str(),
+    //                             (Fl_Align)(FL_ALIGN_LEFT | FL_ALIGN_BOTTOM));
+    //   colorstack.Pop();
+    //   colorstack.Pop();
+    // }
 
     glEnable(GL_DEPTH_TEST);
     glPopMatrix();

libstage/options_dlg.cc

@@ -55,7 +55,10 @@ void OptionsDlg::updateChecks()
   scroll->begin();
   for (unsigned int i = 0; i < options.size(); i++) {
     Fl_Check_Button *check =
-        new Fl_Check_Button(0, boxH * (i + 1) + vm, scroll->w(), boxH, options[i]->name().c_str());
+      new Fl_Check_Button(0, boxH * (i + 1) + vm, scroll->w(), boxH, "foo" );//options[i]->name().c_str());
+
+    // must copy the text for the label! fixes yukky bug.
+    check->copy_label( options[i]->name().c_str() );
     if (options[i]->val())
       check->set();
     check->callback(checkChanged, this);
@@ -74,7 +77,7 @@ void OptionsDlg::setOptions(const std::set<Option *> &opts)
 void OptionsDlg::showAllOpt(Option *opt)
 {
   showAll = opt;
-  showAllCheck->label(opt->name().c_str());
+  showAllCheck->copy_label(opt->name().c_str());
   showAllCheck->value(opt->val());
 }
 

libstage/world.cc

@@ -186,7 +186,7 @@ void World::DestroySuperRegion(SuperRegion *sr)
 
 void World::Run()
 {
-  // first check wheter there is a single gui world
+  // first check whether there is a single gui world
   bool found_gui = false;
   FOR_EACH (world_it, world_set) {
     found_gui |= (*world_it)->IsGUI();
@@ -1110,7 +1110,7 @@ void World::RemovePowerPack(PowerPack *pp)
 
 /// Register an Option for pickup by the GUI
 void World::RegisterOption(Option *opt)
-{
+{  
   assert(opt);
   option_table.insert(opt);
 }

libstage/worldgui.cc

@@ -195,6 +195,8 @@ WorldGui::WorldGui(int width, int height, const char *caption)
       real_time_interval(sim_interval), real_time_now(RealTimeNow()),
       real_time_recorded(real_time_now), timing_interval(20)
 {
+  Fl::lock(); // start FLTK's thread safe behaviour
+
   Fl::scheme("");
   resizable(canvas);
   caption_prefix = caption ? std::string(caption) : std::string(PROJECT) + " v" + Stg::Version();
@@ -416,8 +418,8 @@ std::string WorldGui::ClockString() const
 
   const double localratio = (double)sim_interval / (double)(real_time_interval / timing_interval);
 
-  char buf[32];
-  snprintf(buf, 32, " [%.1f]", localratio);
+  char buf[64];
+  snprintf(buf, 64, " [%.1f]", localratio);
   str += buf;
 
   if (paused == true)
@@ -443,12 +445,13 @@ void WorldGui::RemoveChild(Model *mod)
 std::string WorldGui::EnergyString() const
 {
   char str[512];
-  snprintf(str, 255, "Energy\n  stored:   %.0f / %.0f KJ\n  input:    %.0f "
-                     "KJ\n  output:   %.0f KJ at %.2f KW\n",
+  snprintf(str, 512,
+	   "Energy\n  stored:   %.0f / %.0f KJ\n  input:    %.0f "
+	   "KJ\n  output:   %.0f KJ at %.2f KW\n",
            PowerPack::global_stored / 1e3, PowerPack::global_capacity / 1e3,
            PowerPack::global_input / 1e3, PowerPack::global_dissipated / 1e3,
            (PowerPack::global_dissipated / (sim_time / 1e6)) / 1e3);
-
+  
   return std::string(str);
 }