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

Added a lines_used property to the OBIDS_column class

Browse Source
This commit is contained in:
Celine Mercier
2016-09-26 18:04:28 +02:00
parent bd50b3f972
commit a7f891d1c9
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/obitools3/obidms/_obidms.pxd
View File

@ -15,13 +15,13 @@ cdef class OBIDMS_column:
cdef str data_type # associated property: data_type cdef str data_type # associated property: data_type
cdef index_t nb_elements_per_line # associated property: nb_elements_per_line cdef index_t nb_elements_per_line # associated property: nb_elements_per_line
cdef list elements_names # associated property: elements_names cdef list elements_names # associated property: elements_names
cdef index_t lines_used # associated property: lines_used
cdef OBIDMS_column_p* pointer cdef OBIDMS_column_p* pointer
cdef OBIDMS dms cdef OBIDMS dms
cdef OBIView view cdef OBIView view
cdef str dms_name cdef str dms_name
cpdef index_t get_nb_lines_used(self)
cpdef str get_creation_date(self) cpdef str get_creation_date(self)
cpdef str get_comments(self) cpdef str get_comments(self)
cpdef dict get_references(self) cpdef dict get_references(self)

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

@ -125,10 +125,7 @@ cdef class OBIDMS_column :
lines_used = (self.pointer)[0].header.lines_used lines_used = (self.pointer)[0].header.lines_used
for line_nb in range(lines_used): for line_nb in range(lines_used):
yield self.get_line(line_nb) yield self.get_line(line_nb)
cpdef index_t get_nb_lines_used(self):
return (self.pointer)[0].header.lines_used
cpdef str get_creation_date(self): cpdef str get_creation_date(self):
return bytes2str(obi_format_date((self.pointer)[0].header.creation_date)) return bytes2str(obi_format_date((self.pointer)[0].header.creation_date))
@ -181,12 +178,17 @@ cdef class OBIDMS_column :
# original_name property getter # original_name property getter
@property @property
def original_name(self): def original_name(self):
return self.original_name return self.original_name # TODO go get in header
# version property getter # version property getter
@property @property
def version(self): def version(self):
return self.version return self.version # TODO go get in header
# lines_used property getter
@property
def lines_used(self):
return (self.pointer)[0].header.lines_used
@staticmethod @staticmethod
cdef object get_subclass_type(OBIDMS_column_p column_p) : cdef object get_subclass_type(OBIDMS_column_p column_p) :