TimeFeatures 1.0.7__tar.gz → 1.0.9__tar.gz

{TimeFeatures-1.0.7 → TimeFeatures-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TimeFeatures
-Version: 1.0.7
+Version: 1.0.9
 Summary: Timefeatures add-on for Orange 3 data mining software.
 Home-page: https://github.com/alervgr/Orange-TimeFeatures
 Author: Alejandro Rivas García

{TimeFeatures-1.0.7 → TimeFeatures-1.0.9}/TimeFeatures.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TimeFeatures
-Version: 1.0.7
+Version: 1.0.9
 Summary: Timefeatures add-on for Orange 3 data mining software.
 Home-page: https://github.com/alervgr/Orange-TimeFeatures
 Author: Alejandro Rivas García

{TimeFeatures-1.0.7 → TimeFeatures-1.0.9}/setup.py

@@ -21,7 +21,7 @@ setup(name="TimeFeatures",
       packages=["timefeatures.widgets"],
       package_data={"timefeatures.widgets": ["icons/*.svg", "icons/*.png"]},
       entry_points={"orange.widgets": "Time-Features = timefeatures.widgets"},
-      version="1.0.7",
+      version="1.0.9",
       author="Alejandro Rivas García",
       author_email="alejandrorivasgarcia@gmail.com",
       keywords=[

{TimeFeatures-1.0.7 → TimeFeatures-1.0.9}/timefeatures/widgets/owsavetodb.py

@@ -14,7 +14,7 @@ from Orange.widgets.utils.itemmodels import PyListModel
 from Orange.widgets.utils.owbasesql import OWBaseSql
 from Orange.widgets.utils.sql import check_sql_input
 from Orange.widgets.utils.widgetpreview import WidgetPreview
-from Orange.widgets.widget import Msg
+from Orange.widgets.widget import Msg, OWWidget
 from PyQt5.QtGui import QPixmap, QStandardItem
 from PyQt5.QtWidgets import QGridLayout, QLineEdit, QPushButton, QSizePolicy, QLabel
 from orangewidget.utils.signals import Input
@@ -42,7 +42,7 @@ class BackendModel(PyListModel):
         return super().data(index, role)
 
 
-class owsavetodb(OWBaseSql):
+class owsavetodb(OWBaseSql, OWWidget):
     name = "Save to DB"
     description = "Save a dataset into a DB."
     icon = "icons/savedatadb.svg"
@@ -139,6 +139,7 @@ class owsavetodb(OWBaseSql):
             minimumWidth=120
         )
         self.btn_savedata.clicked.connect(self.saveData)
+        self.btn_savedata.setEnabled(False)
         layoutA.addWidget(self.btn_savedata, 3, 2)
         self._add_backend_controls()
 
@@ -179,6 +180,7 @@ class owsavetodb(OWBaseSql):
 
     def create_table(self, table_name):
 
+        contBar = 0
         contMetasOriginales = 0
         cont = 0
         variables = []
@@ -224,8 +226,21 @@ class owsavetodb(OWBaseSql):
         insert_query = insert_query[:-1]  # Eliminar la coma final
         insert_query += ")"
 
+        self.progressBarInit()
+
         for instance in self.data:
             data_row = []
+            contBar += 1
+
+            if contBar*4 == len(self.data):
+                self.progressBarSet(25)
+            elif contBar*2 == len(self.data):
+                self.progressBarSet(50)
+            elif contBar == len(self.data)-(len(self.data)/4):
+                self.progressBarSet(75)
+            elif contBar == len(self.data):
+                self.progressBarSet(100)
+
             for i in range(len(variables)):
                 if cont > 0:
                     i -= cont
@@ -239,6 +254,7 @@ class owsavetodb(OWBaseSql):
                     pass
             except BackendError as ex:
                 self.Error.connection(str(ex))
+            self.progressBarFinished()
 
     def saveData(self):
 

{TimeFeatures-1.0.7 → TimeFeatures-1.0.9}/timefeatures/widgets/owtfgraphgenerator.py

@@ -124,6 +124,7 @@ class owtfgraphgenerator(OWWidget, ConcurrentWidgetMixin):
             minimumWidth=10
         )
         self.btn_generate.clicked.connect(self.generate)
+        self.btn_generate.setEnabled(False)
         buttonlayout.addWidget(self.btn_generate)
         toplayout.addLayout(buttonlayout, 0)
 
@@ -131,13 +132,19 @@ class owtfgraphgenerator(OWWidget, ConcurrentWidgetMixin):
     def setData(self, data=None):
 
         self.data = data
-        self.btn_generate.setEnabled(bool(self.data))
-        self.generate()
+
+        if self.data is not None:
+            if len(self.data.domain) >= 2 and (self.data.domain[0].name != "Variable" or self.data.domain[1].name != "Expression"):
+                self.Error.generation_error("You need a configuration table (Variable-Expression).")
+                self.Outputs.network.send(None)
+            else:
+                self.generate()
+                self.btn_generate.setEnabled(True)
+        else:
+            self.Outputs.network.send(None)
+            self.btn_generate.setEnabled(False)
 
     def generate(self):
-        if self.data is None:
-            self.error("No data provided.")
-            return
 
         func = self.GRAPH_TYPES[self.graph_type]
 

{TimeFeatures-1.0.7 → TimeFeatures-1.0.9}/timefeatures/widgets/owtimefeatureconstructor.py

@@ -1235,7 +1235,7 @@ class owtimefeatureconstructor(OWWidget, ConcurrentWidgetMixin):
                 variables.pop(0)
 
         variable_column = Orange.data.DiscreteVariable(name="Variable", values=variables)
-        expresion_column = Orange.data.DiscreteVariable(name="Expresion", values=expresiones)
+        expresion_column = Orange.data.DiscreteVariable(name="Expression", values=expresiones)
 
         # Creo el dominio
         domain = Orange.data.Domain([variable_column, expresion_column])