Changeset 1755

Timestamp:

01/14/10 17:22:19 (2 years ago)

Author:

andreas

Message:

added InfoGroup interface to InfoHandle / added boolean to control use of defaults in InfoHandles?

Files:

• branches/qt_gui/src/info/lib/info_group.cc (modified) (14 diffs)
• branches/qt_gui/src/info/lib/info_group.hh (modified) (4 diffs)
• branches/qt_gui/src/info/lib/info_handle.cc (modified) (1 diff)
• branches/qt_gui/src/info/lib/info_handle.hh (modified) (2 diffs)
• branches/qt_gui/src/info/pymod/wrap_info.cc (modified) (5 diffs)

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

@@ -23 +23 @@
-namespace iplt { namespace info {
-
+
+
-InfoGroup::InfoGroup(const InfoHandle& root, const ElePtr& impl):
-  root_(root),
@@ -45 +47 @@
-
-
-
+, bool use_defaults
-{
-  std::vector<string> plist=path.GetList();
@@ -54 +56 @@
-    return last_group;
-  } else {
-
+ && use_defaults
-    // TODO: prepend path to this group
-    return root_.GetDefaultGroup(path);
@@ -90 +92 @@
-} 
-
-
+, bool use_defaults
-{
-  std::vector<string> plist=path.GetList();
@@ -98 +100 @@
-  if(do_group_lookup(pos,plist.end(),last_group)) {
-    return true;
-
+if(use_defaults)
-    // TODO: prepend path to this group
-    return root_.HasDefaultGroup(path);
@@ -106 +108 @@
-
-InfoGroup InfoGroup::group_create(InfoGroup group, 
-               
-               
+        
+        
-{
-  InfoGroup subgroup = group.CreateGroup((*pos));
@@ -115 +117 @@
-}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-  } else {
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -145 +149 @@
-      tp=IT_BOOL;
-    } else if(tps=="vector" || tps=="VECTOR") {
-   
+      
-    } else {
-      // keep string default, alternatively could throw error here...
@@ -155 +159 @@
-}
-
-
+, bool use_defaults
-{
-  InfoGroup grp=*this;
-
-  InfoPath grppath=path.Strip();
-
-  std::vector<string> plist=grppath.GetList();
-
-  std::vector<string>::const_iterator pos=plist.begin();
-
-  string iname=path.GetList().back();
-
-  InfoGroup last_group(*this);
-  if(do_group_lookup(pos,plist.end(),last_group)) {
@@ -173 +172 @@
-      ElePtr p(last_group.impl_->GetSub(iname));
-      if(!p->HasAttribute("value")) {
-   
+        
-      }
-      return InfoItem(root_,p,ResolveItemType(p));
@@ -181 +180 @@
-  // check default
-  // TODO: prepend path to this group
-
+use_defaults && 
-    return root_.GetDefaultItem(path);
-  }
@@ -194 +193 @@
-}
-
-
+, bool use_defaults
-{
-  InfoGroup grp=*this;
-
-  InfoPath grppath=path.Strip();
-
-  std::vector<string> plist=grppath.GetList();
-
-  std::vector<string>::const_iterator pos=plist.begin();
-
-  InfoGroup last_group(*this);
-  if(do_group_lookup(pos,plist.end(),last_group)) {
@@ -210 +205 @@
-      ElePtr p(last_group.impl_->GetSub(iname));
-      if(p->HasAttribute("value")) {
-   
+        
-      }
-    }
-  } 
-
-  // fallback to default item
-
-
-
-
+
+
+
+
+
+
+
-{
-  string item=path.GetList().back();
-
-
+,use_defaults
-  
-
+,use_defaults
-    return grp.GetItem(item);
-  } else {
@@ -232 +229 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-

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

@@ -23 +23 @@
-#include <iplt/base.hh>
-
-#include "info_fw.hh"
-#include "info_handle.hh"
-#include "info_impl_fw.hh"
@@ -29 +28 @@
-namespace iplt { namespace info {
-
- 
+
-  friend class InfoHandle; // ctor access
-  friend class InfoItem; // ctor access
@@ -36 +35 @@
-  //! retrieve parent group
-  InfoGroup GetParent() const;
-
-  //! set name
-  void SetName(const string& name);
-  //! retrieve name
-  string GetName() const;
-
-
+
-  InfoGroup CreateGroup(const string& name);
-
-
-
-
+
+
+
-  InfoItem CreateItem(const string& name, const string& value);
-
-
-
-
-
+
+
+
-  //! return attribute of given name
-  string GetAttribute(const string& name) const;
@@ -62 +56 @@
-  //! remove attribute of given name
-  void RemoveAttribute(const string& name);
-
-  std::vector<string> GetAttributeList() const;
-
-  string GetTextData() const;
-  void SetTextData(const string& td);
-
-  //! Apply visitor
-  /*!

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

@@ -126 +126 @@
-}
-
+InfoGroup InfoHandle::GetParent()  const
+{
+  return Root().GetParent();
+}
+
+void InfoHandle::SetName(const string& name)
+{
+  Root().SetName(name);
+}
+
+string InfoHandle::GetName()  const
+{
+  return Root().GetName();
+}
+
+InfoGroup InfoHandle::GetGroup(const InfoPath& path, bool use_defaults)  const
+{
+  return Root().GetGroup(path,use_defaults);
+}
+
+InfoGroup InfoHandle::CreateGroup(const string& name)
+{
+  return Root().CreateGroup(name);
+}
+
+bool InfoHandle::HasGroup(const InfoPath& name, bool use_defaults)  const
+{
+  return Root().HasGroup(name,use_defaults);
+}
+
+InfoGroup InfoHandle::RetrieveGroup(const InfoPath& path, bool use_defaults)
+{
+  return Root().RetrieveGroup(path,use_defaults);
+}
+
+InfoItem InfoHandle::GetItem(const InfoPath& path, bool use_defaults)  const
+{
+  return Root().GetItem(path,use_defaults);
+}
+
+InfoItem InfoHandle::CreateItem(const string& name, const string& value)
+{
+  return Root().CreateItem(name,value);
+}
+
+bool InfoHandle::HasItem(const InfoPath& path, bool use_defaults)  const
+{
+  return Root().HasItem(path,use_defaults);
+}
+
+InfoItem InfoHandle::RetrieveItem(const InfoPath& path, bool use_defaults)
+{
+  return Root().RetrieveItem(path,use_defaults);
+}
+
+void InfoHandle::Remove(const InfoPath& path, bool remove_defaults)
+{
+  return Root().Remove(path,remove_defaults);
+}
+
+string InfoHandle::GetAttribute(const string& name)  const
+{
+  return Root().GetAttribute(name);
+}
+
+void InfoHandle::SetAttribute(const string& name, const string& value)
+{
+  Root().SetAttribute(name,value);
+}
+
+bool InfoHandle::HasAttribute(const string& name)  const
+{
+  return Root().HasAttribute(name);
+}
+
+void InfoHandle::RemoveAttribute(const string& name)
+{
+  Root().RemoveAttribute(name);
+}
+
+std::vector<string> InfoHandle::GetAttributeList()  const
+{
+  return Root().GetAttributeList();
+}
+
+string InfoHandle::GetTextData()  const
+{
+  return Root().GetTextData();
+}
+
+void InfoHandle::SetTextData(const string& td)
+{
+  Root().SetTextData(td);
+}
+
+void InfoHandle::Apply(InfoVisitor& v, bool visit_this)
+{
+  Root().Apply(v,visit_this);
+}
+
+void InfoHandle::Apply(InfoConstVisitor& v, bool visit_this)  const
+{
+  Root().Apply(v,visit_this);
+}
+
+
-}} // ns

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

@@ -43 +43 @@
-  unless the Copy() method is used.
-*/
- 
+
-  friend InfoHandle CreateInfo();
-  friend InfoHandle CreateInfo(const string& text);
@@ -74 +74 @@
-  InfoItem GetDefaultItem(const InfoPath& p) const;
-
+  //! group interface
+  InfoGroup GetParent() const;
+  void SetName(const string& name);
+  string GetName() const;
+  InfoGroup GetGroup(const InfoPath& path, bool use_defaults=true) const;
+  InfoGroup CreateGroup(const string& name);
+  bool HasGroup(const InfoPath& name, bool use_defaults=true) const;
+  InfoGroup RetrieveGroup(const InfoPath& path, bool use_defaults=true);
+  InfoItem GetItem(const InfoPath& path, bool use_defaults=true) const;
+  InfoItem CreateItem(const string& name, const string& value);
+  bool HasItem(const InfoPath& path, bool use_defaults=true) const;
+  InfoItem RetrieveItem(const InfoPath& path, bool use_defaults=true);
+  void Remove(const InfoPath& path, bool remove_defaults=false);
+  string GetAttribute(const string& name) const;
+  void SetAttribute(const string& name, const string& value);
+  bool HasAttribute(const string& name) const;
+  void RemoveAttribute(const string& name);
+  std::vector<string> GetAttributeList() const;
+  string GetTextData() const;
+  void SetTextData(const string& td);
+  void Apply(InfoVisitor& v, bool visit_this=true);
+  void Apply(InfoConstVisitor& v, bool visit_this=true) const;
+
-private:
-  InfoHandle(RootPtr impl);

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

@@ -35 +35 @@
-InfoHandle (*CreateInfoPtr2)(const string&)=CreateInfo;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-  g->Apply(v,b);
@@ -95 +115 @@
-
-}
+
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getgroup_overloads, GetGroup, 1, 2)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(retrievegroup_overloads, RetrieveGroup, 1, 2)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(hasgroup_overloads, HasGroup, 1, 2)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getitem_overloads, GetItem, 1, 2)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(hasitem_overloads, HasItem, 1, 2)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(retrieveitem_overloads, RetrieveItem, 1, 2)
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(remove_overloads, Remove, 1, 2)
+
+
-
-
@@ -135 +165 @@
-    ;
-
+
-  class_<InfoGroup>("InfoGroup",no_init)
-    .def("GetParent",&InfoGroup::GetParent)
@@ -140 +171 @@
-    .def("SetName",&InfoGroup::SetName)
-    .add_property("name",&InfoGroup::GetName,&InfoGroup::SetName)
-
+,getgroup_overloads()
-    .def("CreateGroup",&InfoGroup::CreateGroup)
-
-
-
+,retrievegroup_overloads()
+,hasgroup_overloads()
+,getitem_overloads()
-    .def("CreateItem",&InfoGroup::CreateItem)
-
-
-
+,hasitem_overloads()
+,retrieveitem_overloads()
+,remove_overloads()
-    .def("GetAttribute",&InfoGroup::GetAttribute)
-    .def("SetAttribute",&InfoGroup::SetAttribute)
-    .def("HasAttribute",&InfoGroup::HasAttribute)
-    .def("GetAttributeList",&InfoGroup::GetAttributeList)
-group_
-group_
-group_
-group_
+
+
+
+
-    .def("GetTextData",&InfoGroup::GetTextData)
-
-
-
+  
+
+ 
-    .def("Import",&InfoHandle::Import)
-    .def("Export",&InfoHandle::Export)
@@ -170 +201 @@
-    .def("HasDefaultItem",&InfoHandle::HasDefaultItem)
-    .def("GetDefaultItem",&InfoHandle::GetDefaultItem)
+    .def("GetParent",&InfoHandle::GetParent)
+    .def("GetName",&InfoHandle::GetName)
+    .def("SetName",&InfoHandle::SetName)
+    .add_property("name",&InfoHandle::GetName,&InfoHandle::SetName)
+    .def("GetGroup",&InfoHandle::GetGroup,getgroup_overloads())
+    .def("CreateGroup",&InfoHandle::CreateGroup)
+    .def("RetrieveGroup",&InfoHandle::RetrieveGroup,retrievegroup_overloads())
+    .def("HasGroup",&InfoHandle::HasGroup,hasgroup_overloads())
+    .def("GetItem",&InfoHandle::GetItem,getitem_overloads())
+    .def("CreateItem",&InfoHandle::CreateItem)
+    .def("HasItem",&InfoHandle::HasItem,hasitem_overloads())
+    .def("RetrieveItem",&InfoHandle::RetrieveItem,retrieveitem_overloads())
+    .def("Remove",&InfoHandle::Remove,remove_overloads())
+    .def("GetAttribute",&InfoHandle::GetAttribute)
+    .def("SetAttribute",&InfoHandle::SetAttribute)
+    .def("HasAttribute",&InfoHandle::HasAttribute)
+    .def("GetAttributeList",&InfoHandle::GetAttributeList)
+    .def("Apply",info_handle_apply1a)
+    .def("Apply",info_handle_apply1b)
+    .def("Apply",info_handle_apply2a)
+    .def("Apply",info_handle_apply2b)
+    .def("GetTextData",&InfoHandle::GetTextData)
-    ;  
-