diff --git a/pyminer2/extensions/packages/dataio/data/__init__.py b/pyminer2/extensions/packages/dataio/dataUI/__init__.py similarity index 100% rename from pyminer2/extensions/packages/dataio/data/__init__.py rename to pyminer2/extensions/packages/dataio/dataUI/__init__.py diff --git a/pyminer2/extensions/packages/dataio/data/data_import_csv.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_csv.py similarity index 99% rename from pyminer2/extensions/packages/dataio/data/data_import_csv.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_csv.py index 5bfea13ba879b2c2067a7764d3df3bfe82cb9ff0..f3d4e8970c41d9b5864a667a6d1514ba49ae0795 100644 --- a/pyminer2/extensions/packages/dataio/data/data_import_csv.py +++ b/pyminer2/extensions/packages/dataio/dataUI/data_import_csv.py @@ -11,12 +11,9 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Form(object): - - def __init__(self): + def setupUi(self, Form): self.separator_char = [",", ";", "\\s", "\\t"] self.encode_type = ["utf8", "gb2312", "gbk", "ascii"] - - def setupUi(self, Form): Form.setObjectName("Form") Form.resize(800, 600) Form.setMinimumSize(QtCore.QSize(800, 600)) diff --git a/pyminer2/extensions/packages/dataio/data/data_import_csv.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_csv.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_csv.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_csv.ui diff --git a/pyminer2/extensions/packages/dataio/data/data_import_excel.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_excel.py similarity index 99% rename from pyminer2/extensions/packages/dataio/data/data_import_excel.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_excel.py index 3486feaa2056af5e81235262d2bfce70cfba0fef..880ea52d08eb5de840145cd01cf17be65e6f1c4d 100644 --- a/pyminer2/extensions/packages/dataio/data/data_import_excel.py +++ b/pyminer2/extensions/packages/dataio/dataUI/data_import_excel.py @@ -12,11 +12,8 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Form(object): - - def __init__(self): - self.encode_type = ["utf8", "gb2312", "gbk", "ascii"] - def setupUi(self, Form): + self.encode_type = ["utf8", "gb2312", "gbk", "ascii"] Form.setObjectName("Form") Form.resize(800, 600) Form.setMinimumSize(QtCore.QSize(800, 600)) diff --git a/pyminer2/extensions/packages/dataio/data/data_import_excel.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_excel.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_excel.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_excel.ui diff --git a/pyminer2/extensions/packages/dataio/data/data_import_matlab.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_matlab.py similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_matlab.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_matlab.py diff --git a/pyminer2/extensions/packages/dataio/data/data_import_matlab.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_matlab.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_matlab.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_matlab.ui diff --git a/pyminer2/extensions/packages/dataio/data/data_import_model.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_model.py similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_model.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_model.py diff --git a/pyminer2/extensions/packages/dataio/data/data_import_model.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_model.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_model.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_model.ui diff --git a/pyminer2/extensions/packages/dataio/data/data_import_mysql.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_mysql.py similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_mysql.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_mysql.py diff --git a/pyminer2/extensions/packages/dataio/data/data_import_mysql.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_mysql.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_mysql.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_mysql.ui diff --git a/pyminer2/extensions/packages/dataio/data/data_import_oracle.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_oracle.py similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_oracle.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_oracle.py diff --git a/pyminer2/extensions/packages/dataio/data/data_import_oracle.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_oracle.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_oracle.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_oracle.ui diff --git a/pyminer2/extensions/packages/dataio/data/data_import_postgresql.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_postgresql.py similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_postgresql.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_postgresql.py diff --git a/pyminer2/extensions/packages/dataio/data/data_import_postgresql.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_postgresql.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_postgresql.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_postgresql.ui diff --git a/pyminer2/extensions/packages/dataio/data/data_import_sas.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_sas.py similarity index 99% rename from pyminer2/extensions/packages/dataio/data/data_import_sas.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_sas.py index 7ae2d5489b7b0f582801a442002025401d174701..4ae2e645b20e631f9679fdeb3190feb69e0c8f3c 100644 --- a/pyminer2/extensions/packages/dataio/data/data_import_sas.py +++ b/pyminer2/extensions/packages/dataio/dataUI/data_import_sas.py @@ -12,12 +12,9 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Form(object): - - def __init__(self): + def setupUi(self, Form): self.separator_char = [",", ";", "\\s", "\\t"] self.encode_type = ["utf8", "gb2312", "gbk", "ascii", "无编码"] - - def setupUi(self, Form): Form.setObjectName("Form") Form.resize(800, 600) Form.setMinimumSize(QtCore.QSize(800, 600)) diff --git a/pyminer2/extensions/packages/dataio/data/data_import_sas.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_sas.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_sas.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_sas.ui diff --git a/pyminer2/extensions/packages/dataio/data/data_import_spss.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_spss.py similarity index 99% rename from pyminer2/extensions/packages/dataio/data/data_import_spss.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_spss.py index ecee953cee0b64a0ba18a12c190e96cbafc2af4b..b50957c4e9e914c7d025735f3417df77cc67f4d4 100644 --- a/pyminer2/extensions/packages/dataio/data/data_import_spss.py +++ b/pyminer2/extensions/packages/dataio/dataUI/data_import_spss.py @@ -12,11 +12,8 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Form(object): - - def __init__(self): - self.encode_type = ["utf8", "gb2312", "gbk", "ascii"] - def setupUi(self, Form): + self.encode_type = ["utf8", "gb2312", "gbk", "ascii"] Form.setObjectName("Form") Form.resize(800, 600) Form.setMinimumSize(QtCore.QSize(800, 600)) diff --git a/pyminer2/extensions/packages/dataio/data/data_import_spss.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_spss.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_spss.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_spss.ui diff --git a/pyminer2/extensions/packages/dataio/data/data_import_stata.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_stata.py similarity index 99% rename from pyminer2/extensions/packages/dataio/data/data_import_stata.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_stata.py index 3dd416937983a217c68ff1cfe3be5db17a345701..83f735942a9167aebb4c1feec4120c0a3e7c9987 100644 --- a/pyminer2/extensions/packages/dataio/data/data_import_stata.py +++ b/pyminer2/extensions/packages/dataio/dataUI/data_import_stata.py @@ -11,11 +11,8 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Form(object): - - def __init__(self): - self.encode_type = ["utf8", "gb2312", "gbk", "ascii"] - def setupUi(self, Form): + self.encode_type = ["utf8", "gb2312", "gbk", "ascii"] Form.setObjectName("Form") Form.resize(800, 600) Form.setMinimumSize(QtCore.QSize(800, 600)) diff --git a/pyminer2/extensions/packages/dataio/data/data_import_stata.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_stata.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_stata.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_stata.ui diff --git a/pyminer2/extensions/packages/dataio/data/data_import_text.py b/pyminer2/extensions/packages/dataio/dataUI/data_import_text.py similarity index 99% rename from pyminer2/extensions/packages/dataio/data/data_import_text.py rename to pyminer2/extensions/packages/dataio/dataUI/data_import_text.py index c4cd5e033a3ba086349e08bbaeedb24a6291486b..516599a6f571218f96c590b9bf9de9deaeb5de53 100644 --- a/pyminer2/extensions/packages/dataio/data/data_import_text.py +++ b/pyminer2/extensions/packages/dataio/dataUI/data_import_text.py @@ -12,12 +12,9 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_Form(object): - - def __init__(self): + def setupUi(self, Form): self.separator_char = ["(无)", "\\n", ",", ";", "\\s", "\\t"] self.encode_type = ["utf8", "gb2312", "gbk", "ascii"] - - def setupUi(self, Form): Form.setObjectName("Form") Form.resize(800, 600) Form.setMinimumSize(QtCore.QSize(800, 600)) diff --git a/pyminer2/extensions/packages/dataio/data/data_import_text.ui b/pyminer2/extensions/packages/dataio/dataUI/data_import_text.ui similarity index 100% rename from pyminer2/extensions/packages/dataio/data/data_import_text.ui rename to pyminer2/extensions/packages/dataio/dataUI/data_import_text.ui diff --git a/pyminer2/extensions/packages/dataio/data/display.png b/pyminer2/extensions/packages/dataio/dataUI/display.png similarity index 100% rename from pyminer2/extensions/packages/dataio/data/display.png rename to pyminer2/extensions/packages/dataio/dataUI/display.png diff --git a/pyminer2/extensions/packages/dataio/data/hide.png b/pyminer2/extensions/packages/dataio/dataUI/hide.png similarity index 100% rename from pyminer2/extensions/packages/dataio/data/hide.png rename to pyminer2/extensions/packages/dataio/dataUI/hide.png diff --git a/pyminer2/extensions/packages/dataio/data/password.py b/pyminer2/extensions/packages/dataio/dataUI/password.py similarity index 100% rename from pyminer2/extensions/packages/dataio/data/password.py rename to pyminer2/extensions/packages/dataio/dataUI/password.py diff --git a/pyminer2/extensions/packages/dataio/sample.py b/pyminer2/extensions/packages/dataio/sample.py index 26f62532a3ada09895e19aa27c3c73fe8b70e438..77b7afab60a61d25c93ed8e522d2f6709cc153a4 100644 --- a/pyminer2/extensions/packages/dataio/sample.py +++ b/pyminer2/extensions/packages/dataio/sample.py @@ -13,27 +13,27 @@ from pyminer2.core import read_matlab, read_stata, dataframe from pyminer_algorithms import set_var if typing.TYPE_CHECKING: - from .data.data_import_csv import Ui_Form as CsvImport_Ui_Form - from .data.data_import_excel import Ui_Form as ExcelImport_Ui_Form - from .data.data_import_matlab import Ui_Form as MATLABImport_Ui_Form - from .data.data_import_stata import Ui_Form as STATAImport_Ui_Form - from .data.data_import_mysql import Ui_Form as ImportMysql_Ui_Form - from .data.data_import_oracle import Ui_Form as ImportOracle_Ui_Form - from .data.data_import_postgresql import Ui_Form as ImportPostgreSQL_Ui_Form - from .data.data_import_sas import Ui_Form as SASImport_Ui_Form - from .data.data_import_spss import Ui_Form as SPSSImport_Ui_Form - from .data.data_import_text import Ui_Form as Import_Ui_Form + from .dataUI.data_import_csv import Ui_Form as CsvImport_Ui_Form + from .dataUI.data_import_excel import Ui_Form as ExcelImport_Ui_Form + from .dataUI.data_import_matlab import Ui_Form as MATLABImport_Ui_Form + from .dataUI.data_import_stata import Ui_Form as STATAImport_Ui_Form + from .dataUI.data_import_mysql import Ui_Form as ImportMysql_Ui_Form + from .dataUI.data_import_oracle import Ui_Form as ImportOracle_Ui_Form + from .dataUI.data_import_postgresql import Ui_Form as ImportPostgreSQL_Ui_Form + from .dataUI.data_import_sas import Ui_Form as SASImport_Ui_Form + from .dataUI.data_import_spss import Ui_Form as SPSSImport_Ui_Form + from .dataUI.data_import_text import Ui_Form as Import_Ui_Form else: - from data.data_import_csv import Ui_Form as CsvImport_Ui_Form - from data.data_import_excel import Ui_Form as ExcelImport_Ui_Form - from data.data_import_matlab import Ui_Form as MATLABImport_Ui_Form - from data.data_import_stata import Ui_Form as STATAImport_Ui_Form - from data.data_import_mysql import Ui_Form as ImportMysql_Ui_Form - from data.data_import_oracle import Ui_Form as ImportOracle_Ui_Form - from data.data_import_postgresql import Ui_Form as ImportPostgreSQL_Ui_Form - from data.data_import_sas import Ui_Form as SASImport_Ui_Form - from data.data_import_spss import Ui_Form as SPSSImport_Ui_Form - from data.data_import_text import Ui_Form as Import_Ui_Form + from dataUI.data_import_csv import Ui_Form as CsvImport_Ui_Form + from dataUI.data_import_excel import Ui_Form as ExcelImport_Ui_Form + from dataUI.data_import_matlab import Ui_Form as MATLABImport_Ui_Form + from dataUI.data_import_stata import Ui_Form as STATAImport_Ui_Form + from dataUI.data_import_mysql import Ui_Form as ImportMysql_Ui_Form + from dataUI.data_import_oracle import Ui_Form as ImportOracle_Ui_Form + from dataUI.data_import_postgresql import Ui_Form as ImportPostgreSQL_Ui_Form + from dataUI.data_import_sas import Ui_Form as SASImport_Ui_Form + from dataUI.data_import_spss import Ui_Form as SPSSImport_Ui_Form + from dataUI.data_import_text import Ui_Form as Import_Ui_Form # 导入PyQt5模块 from qtpy.QtCore import *