Skip to content

Commit

Permalink
Merge pull request biolab#4098 from rokgomiscek/datetime_string_conve…
Browse files Browse the repository at this point in the history
…rsion

[FIX] Datetime conversion to string
  • Loading branch information
lanzagar authored and janezd committed Oct 18, 2019
2 parents 4e3f471 + daee584 commit 19eb46a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Orange/widgets/data/owfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ def __init__(self):
url_model.wrap(self.recent_urls)
url_combo.setLineEdit(LineEditSelectOnFocus())
url_combo.setModel(url_model)
url_combo.setSizePolicy(Policy.MinimumExpanding, Policy.Fixed)
url_combo.setSizePolicy(Policy.Ignored, Policy.Fixed)
url_combo.setEditable(True)
url_combo.setInsertPolicy(url_combo.InsertAtTop)
url_edit = url_combo.lineEdit()
Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/utils/domaineditor.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def numbers_are_round(var, col_data):
col_data = self._to_column(col_data, is_sparse)
elif tpe == StringVariable:
var = tpe.make(name)
if type(orig_var) == DiscreteVariable:
if type(orig_var) in [DiscreteVariable, TimeVariable]:
col_data = [orig_var.repr_val(x) if not np.isnan(x) else ""
for x in self._iter_vals(col_data)]
elif type(orig_var) == ContinuousVariable:
Expand Down

0 comments on commit 19eb46a

Please sign in to comment.