Combobox date format

Author: michael xu

SkinokBacktraderUI.py

@@ -182,21 +182,21 @@ def findTimeFrame(self, df):
         if len(df.index) > 2:
             dtDiff = df.index[1] - df.index[0]
 
-            if dtDiff.seconds == 60:
+            if dtDiff.total_seconds() == 60:
                 return "M1"
-            elif dtDiff.seconds == 300:
+            elif dtDiff.total_seconds() == 300:
                 return "M5"
-            elif dtDiff.seconds == 900:
+            elif dtDiff.total_seconds() == 900:
                 return "M15"
-            elif dtDiff.seconds == 1800:
+            elif dtDiff.total_seconds() == 1800:
                 return "M30"
-            elif dtDiff.seconds == 3600:
+            elif dtDiff.total_seconds() == 3600:
                 return "H1"
-            elif dtDiff.seconds == 14400:
+            elif dtDiff.total_seconds() == 14400:
                 return "H4"
-            elif dtDiff.seconds == 86400:
+            elif dtDiff.total_seconds() == 86400:
                 return "D"
-            elif dtDiff.seconds == 604800:
+            elif dtDiff.total_seconds() == 604800:
                 return "W"
 
         pass

loadDataFilesUI.py

@@ -19,8 +19,8 @@ def __init__(self, controller, parent = None):
         uic.loadUi( self.current_dir_path + "/ui/loadDataFiles.ui", self)
 
         self.filePathLE = self.findChild(QtWidgets.QLineEdit, "filePathLE")
-        self.datetimeFormatLE = self.findChild(QtWidgets.QLineEdit, "datetimeFormatLE")
-
+        self.datetimeFormatLE = self.findChild(QtWidgets.QComboBox, "datetimeFormatLE")
+       
         self.tabRB = self.findChild(QtWidgets.QRadioButton, "tabRB")
         self.commaRB = self.findChild(QtWidgets.QRadioButton, "commaRB")
         self.semicolonRB = self.findChild(QtWidgets.QRadioButton, "semicolonRB")
@@ -35,7 +35,10 @@ def __init__(self, controller, parent = None):
         self.dataFilesListWidget = self.findChild(QtWidgets.QListWidget, "dataFilesListWidget")
 
         # Default values
-        self.datetimeFormatLE.setText("%Y-%m-%d %H:%M:%S")
+        self.datetimeFormatLE.addItem("%Y-%m-%d %H:%M:%S")
+        self.datetimeFormatLE.addItem("%Y-%m-%d %H:%M")
+        self.datetimeFormatLE.addItem("%Y-%m-%d %H")
+        self.datetimeFormatLE.addItem("%Y-%m-%d")
 
         # Connect slots : open file
         self.openFilePB.clicked.connect( self.openFile )
@@ -47,13 +50,18 @@ def __init__(self, controller, parent = None):
     def openFile(self):
         self.dataFileName = QtWidgets.QFileDialog.getOpenFileName(self, 'Open data file', self.current_dir_path + "/data","CSV files (*.csv)")[0]
         self.filePathLE.setText(self.dataFileName)
+        fileparts = os.path.split(self.dataFileName)
+        datafile = fileparts[1]
+        print(datafile[-4:])
+        if datafile[-4:]=='.csv':
+            self.commaRB.setChecked(True)
         pass
 
     def loadFile(self):
 
         # try loading file by controller
         separator = '\t' if self.tabRB.isChecked() else ',' if self.commaRB.isChecked() else ';'
-        success, errorMessage = self.controller.loadData(self.dataFileName, self.datetimeFormatLE.text(), separator)
+        success, errorMessage = self.controller.loadData(self.dataFileName, self.datetimeFormatLE.currentText(), separator)
 
         if success:
 

ui/loadDataFiles.ui

@@ -109,7 +109,7 @@
        </widget>
       </item>
       <item row="1" column="1" colspan="4">
-       <widget class="QLineEdit" name="datetimeFormatLE"/>
+       <widget class="QComboBox" name="datetimeFormatLE"/>
       </item>
       <item row="4" column="1" colspan="4">
        <widget class="QPushButton" name="loadFilePB">

userInterface.py

@@ -542,7 +542,7 @@ def createControlPanel(self):
         self.ResetPB.setText("Reset")
         self.ResetPB.setCheckable(True)
         self.ResetPB.setMaximumWidth(100)
-        self.ResetPB.toggled.connect(self.resetChart)
+        self.ResetPB.toggled[bool].connect(self.resetChart)
         self.controlPanelLayout.addWidget(self.ResetPB)
 
         # Spacer
@@ -554,15 +554,15 @@ def createControlPanel(self):
         self.SmaPB.setText("SMA")
         self.SmaPB.setCheckable(True)
         self.SmaPB.setMaximumWidth(100)
-        self.SmaPB.toggled.connect(self.addSma)
+        self.SmaPB.toggled[bool].connect(self.addSma)
         self.controlPanelLayout.addWidget(self.SmaPB)
 
         # EMA
         self.EmaPB = QtWidgets.QPushButton(self.controlPanel)
         self.EmaPB.setText("EMA")
         self.EmaPB.setCheckable(True)
         self.EmaPB.setMaximumWidth(100)
-        self.EmaPB.toggled.connect(self.addEma)
+        self.EmaPB.toggled[bool].connect(self.addEma)
         self.controlPanelLayout.addWidget(self.EmaPB)
 
         # Spacer
@@ -574,15 +574,15 @@ def createControlPanel(self):
         self.RsiPB.setText("RSI")
         self.RsiPB.setCheckable(True)
         self.RsiPB.setMaximumWidth(100)
-        self.RsiPB.toggled.connect(self.toogleRsi)
+        self.RsiPB.toggled[bool].connect(self.toogleRsi)
         self.controlPanelLayout.addWidget(self.RsiPB)
 
         # Stochastic
         self.StochasticPB = QtWidgets.QPushButton(self.controlPanel)
         self.StochasticPB.setText("Stochastic")
         self.StochasticPB.setCheckable(True)
         self.StochasticPB.setMaximumWidth(100)
-        self.StochasticPB.toggled.connect(self.toogleStochastic)
+        self.StochasticPB.toggled[bool].connect(self.toogleStochastic)
         self.controlPanelLayout.addWidget(self.StochasticPB)
 
         # Stochastic RSI