Skip to content
This repository has been archived by the owner on Mar 22, 2018. It is now read-only.

Commit

Permalink
pep8
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfrasca
mfrasca committed Jun 3, 2015
1 parent 881b85c commit bbcefc4
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 38 deletions.
2 changes: 0 additions & 2 deletions bauble/plugins/garden/plant.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@
select_in_search_results, Action
import bauble.view as view

from bauble import pictures_view

# TODO: do a magic attribute on plant_id that checks if a plant id
# already exists with the accession number, this probably won't work
# though sense the acc_id may not be set when setting the plant_id
Expand Down
64 changes: 29 additions & 35 deletions bauble/plugins/garden/propagation.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# -*- coding: utf-8 -*-
#
# Copyright 2008-2010 Brett Adams
# Copyright 2015 Mario Frasca <[email protected]>.
#
# This file is part of bauble.classic.
#
# bauble.classic is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# bauble.classic is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with bauble.classic. If not, see <http://www.gnu.org/licenses/>.
#
# propagation module
#

Expand Down Expand Up @@ -53,7 +71,7 @@ class Propagation(db.Base):
"""
__tablename__ = 'propagation'
#recvd_as = Column(Unicode(10)) # seed, urcu, other
#recvd_as_other = Column(UnicodeText) # ** maybe this should be in the notes
#recvd_as_other = Column(UnicodeText) # maybe this should be in the notes
prop_type = Column(types.Enum(values=prop_type_values.keys(),
translations=prop_type_values),
nullable=False)
Expand Down Expand Up @@ -124,9 +142,10 @@ def get_date(date):
if c.hormone:
values.append(_('Hormone treatment: %s' % c.hormone))
if c.bottom_heat_temp:
values.append(_('Bottom heat: %(temp)s%(unit)s') %
dict(temp=c.bottom_heat_temp,
unit=bottom_heat_unit_values[c.bottom_heat_unit]))
values.append(
_('Bottom heat: %(temp)s%(unit)s') %
dict(temp=c.bottom_heat_temp,
unit=bottom_heat_unit_values[c.bottom_heat_unit]))
if c.container:
values.append(_('Container: %s' % c.container))
if c.media:
Expand Down Expand Up @@ -309,14 +328,12 @@ class PropSeed(db.Base):
propagation_id = Column(Integer, ForeignKey('propagation.id'),
nullable=False)


def __str__(self):
# what would the string be...???
# cuttings of self.accession.species_str() and accession number
return repr(self)



class PropagationTabPresenter(editor.GenericEditorPresenter):

"""PropagationTabPresenter
Expand All @@ -342,11 +359,9 @@ def __init__(self, parent, model, view, session):
tab_box.pack_start(box, expand=False, fill=True)
self.__dirty = False


def dirty(self):
return self.__dirty


def add_propagation(self):
"""
Open the PropagationEditor and append the resulting
Expand All @@ -367,7 +382,6 @@ def add_propagation(self):
else:
propagation.plant = None


def create_propagation_box(self, propagation):
"""
"""
Expand Down Expand Up @@ -429,15 +443,13 @@ def on_remove_clicked(button, propagation, box):
hbox.show_all()
return hbox


def on_add_button_clicked(self, *args):
"""
"""
self.add_propagation()
self.parent_ref().refresh_sensitivity()



class PropagationEditorView(editor.GenericEditorView):
"""
"""
Expand All @@ -453,17 +465,14 @@ def __init__(self, parent=None):
parent=parent)
self.init_translatable_combo('prop_type_combo', prop_type_values)


def get_window(self):
"""
"""
return self.widgets.prop_dialog


def start(self):
return self.get_window().run()


# TODO: if you edit an existing cutting and the the OK is not set sensitive

# TODO: if you reopen an accession editor the list of propagations
Expand Down Expand Up @@ -599,19 +608,15 @@ def _rooted_data_func(column, cell, model, treeiter, prop):
self.view.connect('rooted_remove_button', "clicked",
self.on_rooted_remove_clicked)



def dirty(self):
return self.__dirty


def set_model_attr(self, field, value, validator=None):
#debug('%s = %s' % (field, value))
super(CuttingPresenter, self).set_model_attr(field, value, validator)
self.__dirty = True
self.parent_ref().refresh_sensitivity()


def on_rooted_cell_edited(self, cell, path, new_text, prop):
treemodel = self.view.widgets.rooted_treeview.get_model()
rooted = treemodel[path][0]
Expand All @@ -621,7 +626,6 @@ def on_rooted_cell_edited(self, cell, path, new_text, prop):
self.__dirty = True
self.parent_ref().refresh_sensitivity()


def on_rooted_add_clicked(self, button, *args):
"""
"""
Expand All @@ -635,7 +639,6 @@ def on_rooted_add_clicked(self, button, *args):
column = tree.get_column(0)
tree.set_cursor(path, column, start_editing=True)


def on_rooted_remove_clicked(self, button, *args):
"""
"""
Expand All @@ -649,15 +652,13 @@ def on_rooted_remove_clicked(self, button, *args):
self.__dirty = True
self.parent_ref().refresh_sensitivity()


def refresh_view(self):
for widget, attr in self.widget_to_field_map.iteritems():
value = getattr(self.model, attr)
#debug('%s: %s' % (widget, value))
self.view.set_widget_value(widget, value)



class SeedPresenter(editor.GenericEditorPresenter):

widget_to_field_map = {'seed_pretreatment_textview': 'pretreatment',
Expand Down Expand Up @@ -885,7 +886,7 @@ def __init__(self, parent, model, view, session):
# only add the propagation editor widgets to the view
# widgets if the widgets haven't yet been added
filename = os.path.join(paths.lib_dir(), 'plugins', 'garden',
'prop_editor.glade')
'prop_editor.glade')
view.widgets.builder.add_from_file(filename)
prop_main_box = view.widgets.prop_main_box
view.widgets.remove_parent(prop_main_box)
Expand All @@ -910,7 +911,6 @@ def __init__(self, parent, model, view, session):
self._dirty = False
super(SourcePropagationPresenter, self).__init__(model, view)


def on_prop_type_changed(self, combo, *args):
"""
Override PropagationPresenter.on_type_changed() to handle the
Expand All @@ -922,31 +922,26 @@ def on_prop_type_changed(self, combo, *args):
prop_type = combo.get_model()[it][0]
if not prop_type:
self.set_model_attr('prop_type', None)
self.view.widgets.prop_details_box.props.visible=False
self.view.widgets.prop_details_box.props.visible = False
else:
super(SourcePropagationPresenter, self).\
on_prop_type_changed(combo, *args)


def set_model_attr(self, attr, value, validator=None):
#debug('set_model_attr(%s, %s)' % (attr, value))
super(SourcePropagationPresenter, self).set_model_attr(attr, value)
self._dirty = True
self.refresh_sensitivity()


def refresh_sensitivity(self):
self.parent_ref().refresh_sensitivity()


def dirty(self):
return super(SourcePropagationPresenter, self).dirty() or self._dirty



class PropagationEditorPresenter(PropagationPresenter):


def __init__(self, model, view):
'''
:param model: an instance of class Propagation
Expand All @@ -962,12 +957,10 @@ def __init__(self, model, view):
self.view.widgets.prop_details_box.props.visible = False
self.view.widgets.prop_ok_button.props.sensitive = False


def start(self):
r = self.view.start()
return r


def refresh_sensitivity(self):
super(PropagationEditorPresenter, self).refresh_sensitivity()
sensitive = True
Expand All @@ -982,7 +975,8 @@ def refresh_sensitivity(self):
model = self.model._seed

if model:
invalid = utils.get_invalid_columns(model, ['id', 'propagation_id'])
invalid = utils.get_invalid_columns(
model, ['id', 'propagation_id'])
# TODO: highlight the widget with are associated with the
# columns that have bad values
if invalid:
Expand Down Expand Up @@ -1079,8 +1073,8 @@ def handle_response(self, response, commit=True):
return False
except Exception, e:
msg = _('Unknown error when committing changes. See the '
'details for more information.\n\n%s') \
% utils.xml_safe_utf8(e)
'details for more information.\n\n%s') %\
utils.xml_safe_utf8(e)
logger.debug(traceback.format_exc())
utils.message_details_dialog(msg, traceback.format_exc(),
gtk.MESSAGE_ERROR)
Expand Down
21 changes: 20 additions & 1 deletion bauble/plugins/garden/source.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# -*- coding: utf-8 -*-
#
# Copyright 2008-2010 Brett Adams
# Copyright 2015 Mario Frasca <[email protected]>.
#
# This file is part of bauble.classic.
#
# bauble.classic is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# bauble.classic is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with bauble.classic. If not, see <http://www.gnu.org/licenses/>.
#
#
# source.py
#
Expand Down Expand Up @@ -25,7 +45,6 @@
import bauble.btypes as types
import bauble.view as view
import bauble.paths as paths
#from bauble.plugins.garden.propagation import *


def coll_markup_func(coll):
Expand Down

0 comments on commit bbcefc4

Please sign in to comment.