Skip to content

Commit 810a4a2

Browse files
committed
Change the default Fixation Algorithm to be IDT, and fix filtering always ignoring -1,-1 fixations by default
1 parent 86e3f88 commit 810a4a2

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

Filter.qml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ Popup {
126126
TextField {
127127
id: fixationLineFilterMin
128128
Layout.fillWidth: true
129-
validator: IntValidator{bottom: 0}
130-
readonly property string defaultVal: "0"
129+
validator: IntValidator{bottom: -1}
130+
readonly property string defaultVal: "-1"
131131
text: defaultVal
132132
}
133133
Text {
@@ -162,8 +162,8 @@ Popup {
162162
TextField {
163163
id: fixationColFilterMin
164164
Layout.fillWidth: true
165-
validator: IntValidator{bottom: 0}
166-
readonly property string defaultVal: "0"
165+
validator: IntValidator{bottom: -1}
166+
readonly property string defaultVal: "-1"
167167
text: defaultVal
168168
}
169169
Text {

Options.qml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ Popup {
7272
ComboBox {
7373
id: algSelection
7474
model: ["BASIC","IDT","IVT"]
75+
currentIndex: 1
7576
onActivated: enableAlgorithm(index)
7677
}
7778
}
@@ -99,7 +100,7 @@ Popup {
99100
height: parent.height - 4 * margin - algSelectionGrid.height - separatorLine.height - buttonGrid.height
100101
width: parent.width - 2 * margin
101102
columns: 2
102-
visible: true
103+
visible: false
103104

104105
Layout.bottomMargin: margin
105106

@@ -152,7 +153,7 @@ Popup {
152153
height: basicAlg.height
153154
width: basicAlg.width
154155
columns: 2
155-
visible: false
156+
visible: true
156157

157158
Text {
158159
id: durationWindowLabel

database.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ Database::Database(QString file_path) : Database() {
4040
"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));"
4141
"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));"
4242

43-
"CREATE INDEX idx_event_time ON ide_context(event_time);"
43+
"CREATE INDEX idx_event_time_context ON ide_context(event_time);"
44+
"CREATE INDEX idx_event_time_gaze ON gaze(event_time);"
45+
"CREATE INDEX idx_fixation_id ON fixation(fixation_id);"
4446
;
4547

4648

0 commit comments

Comments
 (0)