From 82fbe439804e3aabcd9544e36360b87b359ad374 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Tue, 20 Dec 2016 08:18:47 +0100 Subject: [PATCH] transfert method to obiviews --- python/obitools3/obidms/_obidms.pxd | 6 +- python/obitools3/obidms/_obidms.pyx | 88 ----------------------------- 2 files changed, 1 insertion(+), 93 deletions(-) diff --git a/python/obitools3/obidms/_obidms.pxd b/python/obitools3/obidms/_obidms.pxd index 9777c16..d46059e 100644 --- a/python/obitools3/obidms/_obidms.pxd +++ b/python/obitools3/obidms/_obidms.pxd @@ -14,11 +14,7 @@ cdef class OBIDMS: cpdef close(self) cpdef OBI_Taxonomy open_taxonomy(self, str taxo_name) - - cpdef OBIView new_view(self, str view_name, str view_type=*, bint quality_column=*, str comments=*) - cpdef OBIView clone_view(self, str view_name, object view_to_clone, str comments=*) - cpdef OBIView clone_view_with_line_selection(self, str view_name, OBIView_line_selection line_selection, str comments=*) - + cpdef dict read_view_infos(self, str view_name) # cpdef dict read_views(self) TODO diff --git a/python/obitools3/obidms/_obidms.pyx b/python/obitools3/obidms/_obidms.pyx index 2bc083b..8a51ef4 100644 --- a/python/obitools3/obidms/_obidms.pyx +++ b/python/obitools3/obidms/_obidms.pyx @@ -36,21 +36,6 @@ from libc.stdlib cimport malloc - - - - -###################################################################################################### - - - -###################################################################################################### - - - -###################################################################################################### - - cdef class OBIDMS : def __init__(self, str dms_name) : @@ -82,32 +67,6 @@ cdef class OBIDMS : return OBI_Taxonomy(self, taxo_name) - cpdef OBIView new_view(self, str view_name, str view_type="", bint quality_column=False, str comments="") : - cdef object view_class - # Get right subclass depending on view type - view_class = OBIView.get_view_subclass(view_type) - return view_class(self, view_name, new=True, comments=comments, quality_column=quality_column, view_type=view_type) - - - cpdef OBIView clone_view(self, str view_name, object view_to_clone, str comments="") : - cdef object view_class # @DuplicatedSignature - cdef str view_type - # Get right subclass depending on view type - if type(view_to_clone) == str : - view_type = self.read_view_infos(view_to_clone)["view_type"] - else : - view_type = view_to_clone.type - view_class = OBIView.get_view_subclass(view_type) - return view_class(self, view_name, new=True, view_to_clone=view_to_clone, comments=comments, view_type=view_type) - - - cpdef OBIView clone_view_with_line_selection(self, str view_name, OBIView_line_selection line_selection, str comments="") : - cdef object view_class # @DuplicatedSignature - # Get right subclass depending on view type - view_class = OBIView.get_view_subclass(line_selection._view.type) - return view_class(self, view_name, new=True, view_to_clone=line_selection._view, line_selection=line_selection, comments=comments) - - cpdef dict read_view_infos(self, str view_name) : cdef Obiview_infos_p view_infos_p @@ -144,51 +103,4 @@ cdef class OBIDMS : return view_infos_d -# cpdef dict read_views(self) : # TODO function that prints the dic nicely and function that prints 1 view nicely. Add column type in col ref -# -# cdef Obiviews_infos_all_p all_views_p -# cdef Obiview_infos_p view_p -# cdef Column_reference_p column_refs -# cdef int nb_views -# cdef int i, j -# cdef str view_name -# cdef str column_name -# cdef dict views -# cdef bytes name_b -# -# views = {} -# all_views_p = obi_read_view_infos(self._pointer) -# if all_views_p == NULL : -# raise Exception("No views to read") -# nb_views = (all_views_p.header).view_count -# for i in range(nb_views) : -# view_p = ( (all_views_p.view_infos)) + i -# view_name = bytes2str(view_p.name) -# views[view_name] = {} -# views[view_name]["comments"] = bytes2str(view_p.comments) -# views[view_name]["view_type"] = bytes2str(view_p.view_type) -# views[view_name]["column_count"] = view_p.column_count -# views[view_name]["line_count"] = view_p.line_count -# views[view_name]["view_number"] = view_p.view_number -# views[view_name]["created_from"] = bytes2str(view_p.created_from) -# views[view_name]["creation_date"] = bytes2str(obi_format_date(view_p.creation_date)) -# if (view_p.all_lines) : -# views[view_name]["line_selection"] = None -# else : -# views[view_name]["line_selection"] = {} -# views[view_name]["line_selection"]["column_name"] = bytes2str((view_p.line_selection).column_name) -# views[view_name]["line_selection"]["version"] = (view_p.line_selection).version -# views[view_name]["column_references"] = {} -# column_refs = view_p.column_references -# for j in range(views[view_name]["column_count"]) : -# column_name = bytes2str((column_refs[j]).column_name) -# views[view_name]["column_references"][column_name] = {} -# views[view_name]["column_references"][column_name]["version"] = column_refs[j].version -# -# obi_close_view_infos(all_views_p); -# -# return views - - - \ No newline at end of file