Merge pull request #69 from iTrace-Dev/develop

V0.2.2 Patch

Filter.qml

@@ -126,8 +126,8 @@ Popup {
                 TextField {
                     id: fixationLineFilterMin
                     Layout.fillWidth: true
-                    validator: IntValidator{bottom: 0}
-                    readonly property string defaultVal: "0"
+                    validator: IntValidator{bottom: -1}
+                    readonly property string defaultVal: "-1"
                     text: defaultVal
                 }
                 Text {
@@ -162,8 +162,8 @@ Popup {
                 TextField {
                     id: fixationColFilterMin
                     Layout.fillWidth: true
-                    validator: IntValidator{bottom: 0}
-                    readonly property string defaultVal: "0"
+                    validator: IntValidator{bottom: -1}
+                    readonly property string defaultVal: "-1"
                     text: defaultVal
                 }
                 Text {

Options.qml

@@ -72,6 +72,7 @@ Popup {
         ComboBox {
             id: algSelection
             model: ["BASIC","IDT","IVT"]
+            currentIndex: 1
             onActivated: enableAlgorithm(index)
         }
     }
@@ -99,7 +100,7 @@ Popup {
         height: parent.height - 4 * margin - algSelectionGrid.height - separatorLine.height - buttonGrid.height
         width: parent.width - 2 * margin
         columns: 2
-        visible: true
+        visible: false
 
         Layout.bottomMargin: margin
 
@@ -152,7 +153,7 @@ Popup {
         height: basicAlg.height
         width: basicAlg.width
         columns: 2
-        visible: false
+        visible: true
 
         Text {
             id: durationWindowLabel

controller.cpp

@@ -788,7 +788,9 @@ void Controller::generateQueriedData(QString query, QString output_type, QString
         output.open();
         output.exec("CREATE TABLE IF NOT EXISTS fixation(fixation_id TEXT PRIMARY KEY,fixation_run_id INTEGER,fixation_start_event_time INTEGER,fixation_order_number INTEGER,x INTEGER,y INTEGER,fixation_target TEXT,source_file_line INTEGER, source_file_col INTEGER,token TEXT,syntactic_category TEXT,xpath TEXT,left_pupil_diameter REAL,right_pupil_diameter REAL,duration INTEGER, query TEXT)");
         for(auto i : data) {
-            output.exec(QString("INSERT INTO fixation(fixation_id,fixation_run_id,fixation_start_event_time,fixation_order_number,x,y,fixation_target,source_file_line,source_file_col,token,syntactic_category,xpath,left_pupil_diameter,right_pupil_diameter,duration,query) VALUES(\"%1\",%2,%3,%4,%5,%6,\"%7\",%8,%9,%10,%11,%12,%13,%14,%15,'%16')").arg(i[0]).arg(i[1]).arg(i[2]).arg(i[3]).arg(i[4]).arg(i[5]).arg(i[6]).arg(i[7]).arg(i[8]).arg(i[9] == "null" ? "null" : "\""+i[9]+"\"").arg(i[10] == "null" ? "null" : "\""+i[10]+"\"").arg(i[11] == "null" ? "null" : "\""+i[11]+"\"").arg(i[12]).arg(i[13]).arg(i[14]).arg(safeQuery));
+            QString insert = QString("INSERT INTO fixation(fixation_id,fixation_run_id,fixation_start_event_time,fixation_order_number,x,y,fixation_target,source_file_line,source_file_col,token,syntactic_category,xpath,left_pupil_diameter,right_pupil_diameter,duration,query) VALUES(\"%1\",%2,%3,%4,%5,%6,\"%7\",%8,%9,%10,%11,%12,%13,%14,%15,'%16')").arg(i[0]).arg(i[1]).arg(i[2]).arg(i[3]).arg(i[4]).arg(i[5]).arg(i[6]).arg(i[7]).arg(i[8]).arg(i[9] == "null" ? "null" : "\""+i[9]+"\"").arg(i[10] == "null" ? "null" : "\""+i[10]+"\"").arg(i[11] == "null" ? "null" : "\""+i[11]+"\"").arg(i[12]).arg(i[13]).arg(i[14]).arg(safeQuery);
+            std::cout << insert << std::endl;
+            output.exec(insert);
         }
         output.close();
         QSqlDatabase::removeDatabase("output");

database.cpp

@@ -40,7 +40,9 @@ Database::Database(QString file_path) : Database() {
             "CREATE TABLE IF NOT EXISTS fixation_gaze(fixation_id INTEGER,event_time INTEGER,FOREIGN KEY (fixation_id) REFERENCES fixation(fixation_id),FOREIGN KEY (event_time) REFERENCES gaze(event_time));"
             "CREATE TABLE IF NOT EXISTS files(file_hash TEXT PRIMARY KEY,session_id INTEGER,file_full_path TEXT,file_type TEXT,FOREIGN KEY (session_id) REFERENCES session(session_id));"
 
-            "CREATE INDEX idx_event_time ON ide_context(event_time);"
+            "CREATE INDEX idx_event_time_context ON ide_context(event_time);"
+            "CREATE INDEX idx_event_time_gaze ON gaze(event_time);"
+            "CREATE INDEX idx_fixation_id ON fixation(fixation_id);"
             ;
 
 

main.cpp

@@ -18,7 +18,8 @@
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    //QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
 
     QApplication app(argc, argv);
 
@@ -30,8 +31,6 @@ int main(int argc, char *argv[])
 
     ParticipantsList participants;
 
-
-
     QQmlApplicationEngine engine;
     const QUrl url(QStringLiteral("qrc:/main.qml"));
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,

main.qml

@@ -22,20 +22,22 @@ import io.qt.examples.backend 1.0 // This flags as an error, but works perfectly
 
 Window {
     id: main
-    property int menuHeight: 40
+    property int menuHeight: 40;
     property int buttonHeight: 30;
-    property int margin: 15
+    property int margin: 15;
+    property int minHeight: 760;
+    property int minWidth: 420;
 
     property string iTraceRed: "#680314"
 
     visible: true
-    width: 420
-    height: 760 //+ menuHeight
-    maximumHeight: height
-    maximumWidth: width
-    minimumHeight: height
-    minimumWidth: width
-    title: qsTr("iTrace Toolkit")
+    width: minWidth
+    height: minHeight //+ menuHeight
+    /*maximumHeight: height
+    maximumWidth: width*/
+    minimumHeight: minHeight
+    minimumWidth: minWidth
+    title: qsTr("iTrace Toolkit V0.2.2")
 
     function getBottomY(obj) {
         return obj.y + obj.height;