// Callbacks.
////////////////////////////////////////////////////////////////////////
+/**
+ * User data for a GUI object.
+ */
+struct GUIInfo
+{
+ GUIInfo (FGDialog * d);
+ virtual ~GUIInfo ();
+
+ FGDialog * dialog;
+ vector <FGBinding *> bindings;
+};
+
+
/**
* Action callback.
*/
action_callback (puObject * object)
{
GUIInfo * info = (GUIInfo *)object->getUserData();
- NewGUI * gui =
- (NewGUI *)globals->get_subsystem_mgr()
- ->get_group(FGSubsystemMgr::INIT)->get_subsystem("gui");
- gui->setCurrentWidget(info->widget);
- for (int i = 0; i < info->bindings.size(); i++)
+ NewGUI * gui = (NewGUI *)globals->get_subsystem("gui");
+ gui->setActiveDialog(info->dialog);
+ int nBindings = info->bindings.size();
+ for (int i = 0; i < nBindings; i++) {
info->bindings[i]->fire();
- gui->setCurrentWidget(0);
+ if (gui->getActiveDialog() == 0)
+ break;
+ }
+ gui->setActiveDialog(0);
+}
+
+
+\f
+////////////////////////////////////////////////////////////////////////
+// Static helper functions.
+////////////////////////////////////////////////////////////////////////
+
+/**
+ * Copy a property value to a PUI object.
+ */
+static void
+copy_to_pui (SGPropertyNode * node, puObject * object)
+{
+ switch (node->getType()) {
+ case SGPropertyNode::BOOL:
+ case SGPropertyNode::INT:
+ case SGPropertyNode::LONG:
+ object->setValue(node->getIntValue());
+ break;
+ case SGPropertyNode::FLOAT:
+ case SGPropertyNode::DOUBLE:
+ object->setValue(node->getFloatValue());
+ break;
+ default:
+ object->setValue(node->getStringValue());
+ break;
+ }
+}
+
+
+static void
+copy_from_pui (puObject * object, SGPropertyNode * node)
+{
+ switch (node->getType()) {
+ case SGPropertyNode::BOOL:
+ case SGPropertyNode::INT:
+ case SGPropertyNode::LONG:
+ node->setIntValue(object->getIntegerValue());
+ break;
+ case SGPropertyNode::FLOAT:
+ case SGPropertyNode::DOUBLE:
+ node->setFloatValue(object->getFloatValue());
+ break;
+ default:
+ node->setStringValue(object->getStringValue());
+ break;
+ }
}
// Implementation of GUIInfo.
////////////////////////////////////////////////////////////////////////
-GUIInfo::GUIInfo (FGDialog * w)
- : widget(w)
+GUIInfo::GUIInfo (FGDialog * d)
+ : dialog(d)
{
}
// Implementation of FGDialog.
////////////////////////////////////////////////////////////////////////
-FGDialog::FGDialog (SGPropertyNode_ptr props)
+FGDialog::FGDialog (SGPropertyNode * props)
: _object(0)
{
display(props);
FGDialog::~FGDialog ()
{
- delete _object;
+ puDeleteObject(_object);
int i;
+
+ // Delete all the arrays we made
+ // and were forced to keep around
+ // because PUI won't do its own
+ // memory management.
+ for (i = 0; i < _char_arrays.size(); i++) {
+ for (int j = 0; _char_arrays[i][j] != 0; j++)
+ free(_char_arrays[i][j]); // added with strdup
+ delete _char_arrays[i];
+ }
+
+ // Delete all the info objects we
+ // were forced to keep around because
+ // PUI cannot delete its own user data.
for (i = 0; i < _info.size(); i++) {
- delete _info[i];
+ delete (GUIInfo *)_info[i];
_info[i] = 0;
}
+ // Finally, delete the property links.
for (i = 0; i < _propertyObjects.size(); i++) {
delete _propertyObjects[i];
_propertyObjects[i] = 0;
FGDialog::updateValue (const char * objectName)
{
for (int i = 0; i < _propertyObjects.size(); i++) {
- if (_propertyObjects[i]->name == objectName)
- _propertyObjects[i]->object
- ->setValue(_propertyObjects[i]->node->getStringValue());
+ const string &name = _propertyObjects[i]->name;
+ if (name == objectName)
+ copy_to_pui(_propertyObjects[i]->node,
+ _propertyObjects[i]->object);
}
}
{
for (int i = 0; i < _propertyObjects.size(); i++) {
if (_propertyObjects[i]->name == objectName)
- _propertyObjects[i]->node
- ->setStringValue(_propertyObjects[i]
- ->object->getStringValue());
+ copy_from_pui(_propertyObjects[i]->object,
+ _propertyObjects[i]->node);
}
}
void
FGDialog::updateValues ()
{
- for (int i = 0; i < _propertyObjects.size(); i++) {
- puObject * object = _propertyObjects[i]->object;
- SGPropertyNode_ptr node = _propertyObjects[i]->node;
- object->setValue(node->getStringValue());
- }
+ for (int i = 0; i < _propertyObjects.size(); i++)
+ copy_to_pui(_propertyObjects[i]->node, _propertyObjects[i]->object);
}
void
FGDialog::applyValues ()
{
- for (int i = 0; i < _propertyObjects.size(); i++) {
- puObject * object = _propertyObjects[i]->object;
- SGPropertyNode_ptr node = _propertyObjects[i]->node;
- node->setStringValue(object->getStringValue());
- }
+ for (int i = 0; i < _propertyObjects.size(); i++)
+ copy_from_pui(_propertyObjects[i]->object,
+ _propertyObjects[i]->node);
}
void
-FGDialog::display (SGPropertyNode_ptr props)
+FGDialog::display (SGPropertyNode * props)
{
if (_object != 0) {
SG_LOG(SG_GENERAL, SG_ALERT, "This widget is already active");
string type = props->getName();
if (type == "")
- type = props->getStringValue("type");
- if (type == "") {
- SG_LOG(SG_GENERAL, SG_ALERT, "No type specified for GUI object");
- return 0;
- }
+ type = "dialog";
if (type == "dialog") {
puPopup * dialog;
puText * text = new puText(x, y);
setupObject(text, props);
return text;
+ } else if (type == "checkbox") {
+ puButton * b;
+ b = new puButton(x, y, x + width, y + height, PUBUTTON_CIRCLE);
+ setupObject(b, props);
+ return b;
} else if (type == "button") {
puButton * b;
const char * legend = props->getStringValue("legend", "[none]");
b = new puButton(x, y, legend);
setupObject(b, props);
return b;
+ } else if (type == "combo") {
+ vector<SGPropertyNode_ptr> value_nodes = props->getChildren("value");
+ char ** entries = make_char_array(value_nodes.size());
+ for (int i = 0, j = value_nodes.size() - 1;
+ i < value_nodes.size();
+ i++, j--)
+ entries[i] = strdup((char *)value_nodes[i]->getStringValue());
+ puComboBox * combo =
+ new puComboBox(x, y, x + width, y + height, entries,
+ props->getBoolValue("editable", false));
+ setupObject(combo, props);
+ return combo;
+ } else if (type == "slider") {
+ bool vertical = props->getBoolValue("vertical", false);
+ puSlider * slider = new puSlider(x, y, (vertical ? height : width));
+ slider->setMinValue(props->getFloatValue("min", 0.0));
+ slider->setMaxValue(props->getFloatValue("max", 1.0));
+ setupObject(slider, props);
+ return slider;
+ } else if (type == "dial") {
+ puDial * dial = new puDial(x, y, width);
+ dial->setMinValue(props->getFloatValue("min", 0.0));
+ dial->setMaxValue(props->getFloatValue("max", 1.0));
+ dial->setWrap(props->getBoolValue("wrap", true));
+ setupObject(dial, props);
+ return dial;
} else {
return 0;
}
name = "";
const char * propname = props->getStringValue("property");
SGPropertyNode_ptr node = fgGetNode(propname, true);
- object->setValue(node->getStringValue());
+ copy_to_pui(node, object);
if (name != 0)
_propertyObjects.push_back(new PropertyObject(name, object, node));
}
group->close();
}
+char **
+FGDialog::make_char_array (int size)
+{
+ char ** list = new char*[size+1];
+ for (int i = 0; i <= size; i++)
+ list[i] = 0;
+ _char_arrays.push_back(list);
+ return list;
+}
+
\f
////////////////////////////////////////////////////////////////////////
projects / flightgear.git / blobdiff