TimeFeatures 1.0.14__tar.gz → 1.0.16__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/PKG-INFO +1 -1
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/TimeFeatures.egg-info/PKG-INFO +1 -1
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/setup.py +1 -1
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/timefeatures/widgets/owsavetodb.py +1 -23
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/timefeatures/widgets/owtimefeaturesconstructor.py +2 -4
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/timefeatures/widgets/owvardependencygraph.py +2 -1
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/LICENSE +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/README.md +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/TimeFeatures.egg-info/SOURCES.txt +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/TimeFeatures.egg-info/dependency_links.txt +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/TimeFeatures.egg-info/entry_points.txt +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/TimeFeatures.egg-info/top_level.txt +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/setup.cfg +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/timefeatures/widgets/__init__.py +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/timefeatures/widgets/icons/graphgenerator.svg +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/timefeatures/widgets/icons/savedatadb.svg +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/timefeatures/widgets/icons/timefeature-xs.svg +0 -0
- {TimeFeatures-1.0.14 → timefeatures-1.0.16}/timefeatures/widgets/icons/timefeature.svg +0 -0
|
@@ -19,7 +19,7 @@ setup(name="TimeFeatures",
|
|
|
19
19
|
packages=["timefeatures.widgets"],
|
|
20
20
|
package_data={"timefeatures.widgets": ["icons/*.svg", "icons/*.png"]},
|
|
21
21
|
entry_points={"orange.widgets": "Time-Features = timefeatures.widgets"},
|
|
22
|
-
version="1.0.
|
|
22
|
+
version="1.0.16",
|
|
23
23
|
author="Alejandro Rivas García",
|
|
24
24
|
author_email="alejandrorivasgarcia@gmail.com",
|
|
25
25
|
keywords=[
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import Orange
|
|
2
|
-
from AnyQt.QtWidgets import QComboBox
|
|
3
|
-
from AnyQt.QtGui import QCursor
|
|
2
|
+
from AnyQt.QtWidgets import QComboBox
|
|
4
3
|
from AnyQt.QtCore import Qt
|
|
5
4
|
from datetime import datetime
|
|
6
5
|
|
|
7
6
|
from Orange.data import Table
|
|
8
7
|
from Orange.data.sql.backend import Backend
|
|
9
8
|
from Orange.data.sql.backend.base import BackendError
|
|
10
|
-
from Orange.data.sql.table import SqlTable, LARGE_TABLE, AUTO_DL_LIMIT
|
|
11
9
|
from Orange.widgets import gui
|
|
12
10
|
from Orange.widgets.settings import Setting
|
|
13
11
|
from Orange.widgets.utils.itemmodels import PyListModel
|
|
@@ -15,7 +13,6 @@ from Orange.widgets.utils.owbasesql import OWBaseSql
|
|
|
15
13
|
from Orange.widgets.utils.sql import check_sql_input
|
|
16
14
|
from Orange.widgets.utils.widgetpreview import WidgetPreview
|
|
17
15
|
from Orange.widgets.widget import Msg, OWWidget
|
|
18
|
-
from PyQt5.QtGui import QPixmap, QStandardItem
|
|
19
16
|
from PyQt5.QtWidgets import QGridLayout, QLineEdit, QPushButton, QSizePolicy, QLabel
|
|
20
17
|
from orangewidget.utils.signals import Input
|
|
21
18
|
|
|
@@ -32,14 +29,6 @@ def is_postgres(backend):
|
|
|
32
29
|
return getattr(backend, 'display_name', '') == "PostgreSQL"
|
|
33
30
|
|
|
34
31
|
|
|
35
|
-
class TableModel(PyListModel):
|
|
36
|
-
def data(self, index, role=Qt.DisplayRole):
|
|
37
|
-
row = index.row()
|
|
38
|
-
if role == Qt.DisplayRole:
|
|
39
|
-
return str(self[row])
|
|
40
|
-
return super().data(index, role)
|
|
41
|
-
|
|
42
|
-
|
|
43
32
|
class BackendModel(PyListModel):
|
|
44
33
|
def data(self, index, role=Qt.DisplayRole):
|
|
45
34
|
row = index.row()
|
|
@@ -62,20 +51,9 @@ class owsavetodb(OWBaseSql, OWWidget):
|
|
|
62
51
|
pass
|
|
63
52
|
|
|
64
53
|
settings_version = 2
|
|
65
|
-
|
|
66
54
|
buttons_area_orientation = None
|
|
67
|
-
|
|
68
55
|
selected_backend = Setting(None)
|
|
69
|
-
table = Setting(None)
|
|
70
56
|
sql = Setting("")
|
|
71
|
-
guess_values = Setting(True)
|
|
72
|
-
download = Setting(False)
|
|
73
|
-
|
|
74
|
-
materialize = Setting(False)
|
|
75
|
-
materialize_table_name = Setting("")
|
|
76
|
-
|
|
77
|
-
class Information(OWBaseSql.Information):
|
|
78
|
-
data_sampled = Msg("Data description was generated from a sample.")
|
|
79
57
|
|
|
80
58
|
class Warning(OWBaseSql.Warning):
|
|
81
59
|
missing_extension = Msg("Database is missing extensions: {}")
|
{TimeFeatures-1.0.14 → timefeatures-1.0.16}/timefeatures/widgets/owtimefeaturesconstructor.py
RENAMED
|
@@ -147,7 +147,7 @@ def modificar_expression(expression):
|
|
|
147
147
|
mean_value1 = match.group(2)
|
|
148
148
|
mean_value2 = match.group(3)
|
|
149
149
|
|
|
150
|
-
new_mean = f'mean{
|
|
150
|
+
new_mean = f'mean{match_counter_mean}({variable_name},{mean_value1},{mean_value2})'
|
|
151
151
|
|
|
152
152
|
modified_expression = modified_expression.replace(match.group(0), new_mean, 1)
|
|
153
153
|
|
|
@@ -846,8 +846,6 @@ class owtimefeaturesconstructor(OWWidget, ConcurrentWidgetMixin):
|
|
|
846
846
|
transform_error = Msg("{}")
|
|
847
847
|
|
|
848
848
|
class Warning(OWWidget.Warning):
|
|
849
|
-
renamed_var = Msg("Recently added variable has been renamed, "
|
|
850
|
-
"to avoid duplicates.\n")
|
|
851
849
|
table_warning = Msg("You need a configuration table (Variable-Expression).")
|
|
852
850
|
|
|
853
851
|
def __init__(self):
|
|
@@ -1116,7 +1114,7 @@ class owtimefeaturesconstructor(OWWidget, ConcurrentWidgetMixin):
|
|
|
1116
1114
|
|
|
1117
1115
|
if self.data is not None and self.expressions is not None:
|
|
1118
1116
|
if self.expressions is not None:
|
|
1119
|
-
if len(self.expressions.domain) >=
|
|
1117
|
+
if len(self.expressions.domain) >= 1 and (
|
|
1120
1118
|
self.expressions.domain[0].name != "Variable" or self.expressions.domain[1].name != "Expression"):
|
|
1121
1119
|
self.Warning.table_warning()
|
|
1122
1120
|
else:
|
|
@@ -207,13 +207,14 @@ class owvardependencygraph(OWWidget, ConcurrentWidgetMixin):
|
|
|
207
207
|
self.data = data
|
|
208
208
|
|
|
209
209
|
if self.data is not None:
|
|
210
|
-
if len(self.data.domain) >=
|
|
210
|
+
if len(self.data.domain) >= 1 and (self.data.domain[0].name != "Variable" or self.data.domain[1].name != "Expression"):
|
|
211
211
|
self.Error.generation_error("You need a configuration table (Variable-Expression).")
|
|
212
212
|
self.Outputs.network.send(None)
|
|
213
213
|
else:
|
|
214
214
|
self.generate()
|
|
215
215
|
self.btn_generate.setEnabled(True)
|
|
216
216
|
else:
|
|
217
|
+
self.Error.clear()
|
|
217
218
|
self.Outputs.network.send(None)
|
|
218
219
|
self.btn_generate.setEnabled(False)
|
|
219
220
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|