Skip to content
Snippets Groups Projects
Commit 74417bef authored by Marco Biasini's avatar Marco Biasini
Browse files

fix BZDNG-408

CreateViewFromAtoms has been aliased as CreateViewFromAtomList and now
accepts AtomHandleList/AtomViewLists as well as normal python lists.
parent 0ececca6
Branches
Tags
No related merge requests found
...@@ -4,6 +4,7 @@ Changes In Release 1.3.3 ...@@ -4,6 +4,7 @@ Changes In Release 1.3.3
* fix context menu/main menu for newer Qt versions * fix context menu/main menu for newer Qt versions
* CreateEntityFromView remembers chemical type (BZDNG-430) * CreateEntityFromView remembers chemical type (BZDNG-430)
* Fix remote=true for MMCIF loader (BZDNG-449) * Fix remote=true for MMCIF loader (BZDNG-449)
* made CreateViewFromAtoms more flexible (BZDNG-408)
Changes In Release 1.3.2 Changes In Release 1.3.2
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
...@@ -36,7 +36,7 @@ using namespace ost::mol; ...@@ -36,7 +36,7 @@ using namespace ost::mol;
namespace { namespace {
template<class T> template<class T>
std::vector<T> from_list(const list& seq) std::vector<T> from_list(const object& seq)
{ {
std::vector<T> nrvo; std::vector<T> nrvo;
for (int i = 0; i < len(seq); ++i) { for (int i = 0; i < len(seq); ++i) {
...@@ -62,9 +62,12 @@ StringMethod find_chain_str=&EntityView::FindChain; ...@@ -62,9 +62,12 @@ StringMethod find_chain_str=&EntityView::FindChain;
QSMethod select_string=&EntityView::Select; QSMethod select_string=&EntityView::Select;
QueryMethod select_query=&EntityView::Select; QueryMethod select_query=&EntityView::Select;
EntityView create_view(const list& seq) EntityView create_view(const object& seq)
{ {
if(len(seq)==0) return EntityView();
if(len(seq)==0) {
return EntityView();
}
extract<AtomHandle> get_handle(seq[0]); extract<AtomHandle> get_handle(seq[0]);
if(get_handle.check()) { if(get_handle.check()) {
return CreateViewFromAtomList(from_list<AtomHandle>(seq)); return CreateViewFromAtomList(from_list<AtomHandle>(seq));
...@@ -209,6 +212,7 @@ void export_EntityView() ...@@ -209,6 +212,7 @@ void export_EntityView()
def("Intersection", &Intersection); def("Intersection", &Intersection);
def("CreateViewFromAtoms", create_view); def("CreateViewFromAtoms", create_view);
def("CreateViewFromAtomList", create_view);
def("CreateEntityFromView", &CreateEntityFromView, def("CreateEntityFromView", &CreateEntityFromView,
arg("handle")=EntityHandle()); arg("handle")=EntityHandle());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment