obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Minor changes for better presentation

Browse Source
This commit is contained in:
Celine Mercier
2016-07-19 15:30:17 +02:00
parent b89af38109
commit 8850e40b6e
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
python/obitools3/obidms/_obidms.pyx
View File

@ -304,29 +304,21 @@ cdef class OBIView :
def __repr__(self) : def __repr__(self) :
cdef str s cdef str s
s = str(self.name) + ", " + str(self.comments) + ", " + str(self.pointer.infos.line_count) + " lines\n" s = str(self.name) + "\n" + str(self.comments) + "\n" + str(self.pointer.infos.line_count) + " lines\n"
for column_name in self.columns : for column_name in self.columns :
s = s + self.columns[column_name].__repr__() + '\n' s = s + self.columns[column_name].__repr__() + '\n'
return s return s
cpdef delete_column(self, str column_name) : cpdef delete_column(self, str column_name) :
cdef int i
cdef Obiview_p view_p
cdef OBIDMS_column column
cdef OBIDMS_column_p column_p
cdef OBIDMS_column_header_p header
cdef str column_n cdef str column_n
view = self.pointer if obi_view_delete_column(self.pointer, str2bytes(column_name)) < 0 :
if obi_view_delete_column(view_p, str2bytes(column_name)) < 0 :
raise Exception("Problem deleting a column from a view") raise Exception("Problem deleting a column from a view")
# Update the dictionaries of column pointers and column objects, and update pointers in column objects (make function?): # Update the dictionaries of column pointers and column objects, and update pointers in column objects (make function?):
(self.columns).pop(column_name) (self.columns).pop(column_name)
for column_n in self.columns : for column_n in self.columns :
(self.columns[column_n]).update_pointer() (self.columns[column_n]).update_pointer()
@ -345,9 +337,9 @@ cdef class OBIView :
bint create=True bint create=True
) : ) :
cdef bytes column_name_b cdef bytes column_name_b
cdef bytes elements_names_b cdef bytes elements_names_b
cdef object subclass cdef object subclass
cdef OBIDMS_column_p column_p cdef OBIDMS_column_p column_p
column_name_b = str2bytes(column_name) column_name_b = str2bytes(column_name)