Skip to content

Commit

Permalink
work in progress, #225, loads images but makes user wait for it. does…
Browse files Browse the repository at this point in the history 
… nothing yet with database.
  • Loading branch information
@mfrasca
mfrasca committed Jan 11, 2018
1 parent 85d0140 commit ca21f81
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 21 deletions.
37 changes: 22 additions & 15 deletions bauble/plugins/garden/picture_importer.glade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,18 @@
<column type="gboolean"/>
<!-- column-name filename -->
<column type="gchararray"/>
<!-- column-name acc_nr -->
<!-- column-name accno -->
<column type="gchararray"/>
<!-- column-name binomial -->
<column type="gchararray"/>
<!-- column-name thumbnail -->
<column type="GdkPixbuf"/>
<!-- column-name editable_acc_nr -->
<!-- column-name editable_accno -->
<column type="gboolean"/>
<!-- column-name orig_accno -->
<column type="gchararray"/>
<!-- column-name edited_accno -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkDialog" id="picture_importer_dialog">
Expand Down Expand Up @@ -166,7 +170,7 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<object class="GtkAlignment" id="alignment_define">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
Expand Down Expand Up @@ -329,7 +333,7 @@
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<object class="GtkLabel" id="label_define">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;parameter definition&lt;/b&gt;</property>
Expand All @@ -350,7 +354,7 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<object class="GtkScrolledWindow" id="scrolledwindow_review">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
Expand All @@ -363,7 +367,7 @@
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<object class="GtkTreeViewColumn" id="use_tvc">
<property name="title" translatable="yes">use</property>
<child>
<object class="GtkCellRendererToggle" id="use_crtoggle">
Expand All @@ -376,7 +380,7 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn5">
<object class="GtkTreeViewColumn" id="filename_tvc">
<property name="title" translatable="yes">file name</property>
<child>
<object class="GtkCellRendererText" id="filename_crtext"/>
Expand All @@ -387,7 +391,7 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn6">
<object class="GtkTreeViewColumn" id="iseditable_tvc">
<property name="title" translatable="yes">edit</property>
<child>
<object class="GtkCellRendererToggle" id="edit_crtoggle">
Expand All @@ -400,18 +404,21 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn2">
<object class="GtkTreeViewColumn" id="accno_tvc">
<property name="title" translatable="yes">acc.nr.</property>
<child>
<object class="GtkCellRendererText" id="acc_nr_crtext"/>
<object class="GtkCellRendererText" id="accno_crtext">
<signal name="edited" handler="on_cellrenderertext_edited" swapped="no"/>
</object>
<attributes>
<attribute name="editable">5</attribute>
<attribute name="text">2</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn3">
<object class="GtkTreeViewColumn" id="binomial_tvc">
<property name="title" translatable="yes">binomial</property>
<child>
<object class="GtkCellRendererText" id="binomial_crtext"/>
Expand All @@ -422,7 +429,7 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn4">
<object class="GtkTreeViewColumn" id="thumbnail_tvc">
<property name="title" translatable="yes">thumbnail</property>
<child>
<object class="GtkCellRendererPixbuf" id="thumbnail_crpixbuf"/>
Expand All @@ -437,7 +444,7 @@
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label6">
<object class="GtkLabel" id="label_review">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;data revision&lt;/b&gt;</property>
Expand All @@ -458,7 +465,7 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<object class="GtkAlignment" id="alignment_log">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
Expand All @@ -480,7 +487,7 @@
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label7">
<object class="GtkLabel" id="label_log">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;commit or rollback&lt;/b&gt;</property>
Expand Down
23 changes: 17 additions & 6 deletions bauble/plugins/garden/picture_importer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,18 @@ def __init__(self, model, view, **kwargs):
def start(self, *args, **kwargs):
super(PictureImporterPresenter, self).start(*args, **kwargs)

def on_cellrenderertext_edited(self, column_widget, path, new_text, *args, **kwargs):
self.rows[path][2] = self.rows[path][7] = new_text

def on_use_crtoggle_toggled(self, column_widget, path):
self.rows[path][0] = not self.rows[path][0]

def on_edit_crtoggle_toggled(self, column_widget, path):
self.rows[path][5] = not self.rows[path][5]
# and make the accession field editable
if not self.rows[path][5]: # restore original
self.rows[path][2] = self.rows[path][6]
else: # restore last edit
self.rows[path][2] = self.rows[path][7]

def show_visible_pane(self):
for n, i in enumerate(self.panes):
Expand All @@ -116,20 +122,25 @@ def show_visible_pane(self):

def on_picture_importer_dialog_response(self, widget, response, **kwargs):
print 'response', response
print self.rows
for i in self.rows:
print [k for k in i]

def on_action_prev_activate(self, *args, **kwargs):
self.model.visible_pane -= 1
self.show_visible_pane()

def add_rows(self, arg, dirname, fnames):
for name in fnames:
d = decode_parts(os.path.join(dirname, name), self.model.accno_format)
d = decode_parts(name, self.model.accno_format)
if d is None:
continue
row = [True, name, d['accession'], d['species'], None, False]
pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.join(dirname, name))
pixbuf = pixbuf.apply_embedded_orientation()
scale_x = pixbuf.get_width() / 200
scale_y = pixbuf.get_height() / 200
scale = max(scale_x, scale_y, 1)
x = int(pixbuf.get_width() / scale)
y = int(pixbuf.get_height() / scale)
scaled_buf = pixbuf.scale_simple(x, y, gtk.gdk.INTERP_BILINEAR)
row = [True, name, d['accession'], d['species'], scaled_buf, False, d['accession'], d['accession']]
self.model.rows.append(row)
self.rows.append(row)

Expand Down

0 comments on commit ca21f81

Please sign in to comment.