1. taxonome
  2. taxonome

Commits

Thomas Kluyver  committed bf555ef

Fixes for matching from loaded dataset.

  • Participants
  • Parent commits 8d83304
  • Branches default

Comments (0)

Files changed (2)

File taxonome/gui/mapnames.py

View file
         from_csv = True
     else:
         seln = optswizard.taxa_dataset.currentIndex()
-        taxa_dataset = app.datasets_model.item(seln)
+        dataset_item = app.datasets_model.item(seln)
+        taxa_dataset = dataset_item.ds
         from_csv = False
     
     upgrade, prefer_accepted, strict_authority, user_choice = getoptions(app, optswizard)
                 fields.remove(authfield)
         else:
             fields = set()
-            for t in data_in: fields.update(t.info)
+            for t in taxa_dataset: fields.update(t.info)
             fields = list(fields)
         f = open(taxadata_file, "w", encoding='utf-8', newline='')
         files.append(f)

File taxonome/tracker.py

View file
         self.every = every
         self.n = 0
     
-    def reset(self):
+    def start_taxon(self, tax):
         self.n += 1
         if self.n % self.every == 0:
-            self.callback(n)
+            self.callback(self.n)
 
 class CSVTaxaTracker(NoopTracker):
     """Produces a list of the existing taxa data with the new names."""