Changeset 1754

Timestamp:

01/13/10 19:14:50 (2 years ago)

Author:

andreas

Message:

modified CreateInfo? to take string as data input instead as filename of dtd file / added some convenience funcions in info / wrapped InfoVisitor? to enable subclassing from python

Files:

• branches/qt_gui/src/info/lib/info_handle.cc (modified) (1 diff)
• branches/qt_gui/src/info/lib/info_handle.hh (modified) (1 diff)
• branches/qt_gui/src/info/lib/info_impl.cc (modified) (1 diff)
• branches/qt_gui/src/info/lib/info_impl.hh (modified) (1 diff)
• branches/qt_gui/src/info/lib/info_item.cc (modified) (1 diff)
• branches/qt_gui/src/info/lib/info_item.hh (modified) (1 diff)
• branches/qt_gui/src/info/pymod/wrap_info.cc (modified) (3 diffs)

branches/qt_gui/src/info/lib/info_handle.cc

@@ -29 +29 @@
-  return InfoHandle(RootPtr(new detail::InfoImpl()));
-}
-dtdfile
+text
-{
-dtdfile
+text
-}
-

branches/qt_gui/src/info/lib/info_handle.hh

@@ -45 +45 @@
-class DLLEXPORT InfoHandle {
-  friend InfoHandle CreateInfo();
-
+ text
-  friend InfoHandle LoadInfo(const string&);
-

branches/qt_gui/src/info/lib/info_impl.cc

@@ -75 +75 @@
-}
-
-dtdfile
+text
-  document_("EMDataInfo"),
-  def_list_()
-{
-
-
-
+
-    throw(InfoError("QDomDocument.setContent failed"));
-  }
-  file.close();
-}
-

branches/qt_gui/src/info/lib/info_impl.hh

@@ -113 +113 @@
-  InfoImpl();
-  InfoImpl(const string& file);
-dtdfile
+text
-
-  RootPtr Copy() const;

branches/qt_gui/src/info/lib/info_item.cc

@@ -201 +201 @@
-}
-
+double RetrieveFloatInfoItem(InfoGroup ig, const InfoPath& path, double def)
+{
+  if(ig.HasItem(path)) {
+    return ig.GetItem(path).AsFloat();
+  }
+  ig.RetrieveItem(path).SetFloat(def);
+  return def;
+}
+
+int RetrieveIntInfoItem(InfoGroup ig, const InfoPath& path, int def)
+{
+  if(ig.HasItem(path)) {
+    return ig.GetItem(path).AsInt();
+  }
+  ig.RetrieveItem(path).SetInt(def);
+  return def;
+}
+
+bool RetrieveBoolInfoItem(InfoGroup ig, const InfoPath& path, bool def)
+{
+  if(ig.HasItem(path)) {
+    return ig.GetItem(path).AsBool();
+  }
+  ig.RetrieveItem(path).SetBool(def);
+  return def;
+}
+
+geom::Vec3 RetrieveVectorInfoItem(InfoGroup ig, const InfoPath& path, const geom::Vec3& def)
+{
+  if(ig.HasItem(path)) {
+    return ig.GetItem(path).AsVector();
+  }
+  ig.RetrieveItem(path).SetVector(def);
+  return def;
+}
+
+string RetrieveStringInfoItem(InfoGroup ig, const InfoPath& path, const string& def)
+{
+  if(ig.HasItem(path)) {
+    return ig.GetItem(path).GetValue();
+  }
+  ig.RetrieveItem(path).SetValue(def);
+  return def;
+}
+
-void SetFloatInfoItem(InfoGroup ig, const InfoPath& path, double val)
-{

branches/qt_gui/src/info/lib/info_item.hh

@@ -124 +124 @@
-DLLEXPORT string GetStringInfoItem(const InfoGroup& ig, const InfoPath& path, const string& def);
-
+// these convenience functions will create the InfoItem if not already present
+DLLEXPORT double RetrieveFloatInfoItem(InfoGroup ig, const InfoPath& path, double def);
+DLLEXPORT int RetrieveIntInfoItem(InfoGroup ig, const InfoPath& path, int def);
+DLLEXPORT bool RetrieveBoolInfoItem(InfoGroup ig, const InfoPath& path, bool def);
+DLLEXPORT geom::Vec3 RetrieveVectorInfoItem(InfoGroup ig, const InfoPath& path, const geom::Vec3& def);
+DLLEXPORT string RetrieveStringInfoItem(InfoGroup ig, const InfoPath& path, const string& def);
+
-DLLEXPORT void SetFloatInfoItem(InfoGroup ig, const InfoPath& path, double val);
-DLLEXPORT void SetIntInfoItem(InfoGroup ig, const InfoPath& path, int val);

branches/qt_gui/src/info/pymod/wrap_info.cc

@@ -54 +54 @@
-  g->Apply(v,b);
-}
+
+
+struct InfoVisitorWrap : InfoVisitor, wrapper<InfoVisitor>
+{
+    void VisitItem(InfoItem& item)
+    {
+        if (override VisitItemOverride = get_override("VisitItem"))
+            VisitItemOverride(item);
+        InfoVisitor::VisitItem(item);
+    }
+
+    bool VisitGroup(InfoGroup& group)
+    {
+        if (override VisitGroupOverride = get_override("VisitGroup"))
+            return VisitGroupOverride(group);
+        return InfoVisitor::VisitGroup(group);
+    }
+
+    void VisitGroupFinish(InfoGroup& group)
+    {
+        if (override VisitGroupFinishOverride = get_override("VisitGroupFinish"))
+            VisitGroupFinishOverride(group);
+        InfoVisitor::VisitGroupFinish(group);
+    }
+
+    void VisitItemDefault(InfoItem& item)
+    {
+        InfoVisitor::VisitItem(item);
+    }
+    bool VisitGroupDefault(InfoGroup& group)
+    {
+        return InfoVisitor::VisitGroup(group);
+    }
+    void VisitGroupFinishDefault(InfoGroup& group)
+    {
+        InfoVisitor::VisitGroupFinish(group);
+    }
+
+};
-
-}
@@ -148 +187 @@
-  def("GetStringInfoItem",GetStringInfoItem);
-
+  def("RetrieveFloatInfoItem",RetrieveFloatInfoItem);
+  def("RetrieveIntInfoItem",RetrieveIntInfoItem);
+  def("RetrieveBoolInfoItem",RetrieveBoolInfoItem);
+  def("RetrieveVectorInfoItem",RetrieveVectorInfoItem);
+  def("RetrieveStringInfoItem",RetrieveStringInfoItem);
+
-  def("SetFloatInfoItem",SetFloatInfoItem);
-  def("SetIntInfoItem",SetIntInfoItem);
@@ -156 +201 @@
-  implicitly_convertible<string,InfoPath>();
-
-
+
+
+
+
-    ;
-