Overview
Comment: | Merged change made on dev that fixes the messy sort view issue |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.55 |
Files: | files | file ages | folders |
SHA1: |
a0cf2c468e0f8e72b295d545811e6db8 |
User & Date: | mrwellan on 2013-08-22 09:28:21 |
Other Links: | branch diff | manifest | tags |
Context
2013-08-22
| ||
11:56 | Added filter/not filter for state/status and changed bgcolor when a filter is set check-in: 7aa57d6809 user: mrwellan tags: v1.55 | |
09:28 | Merged change made on dev that fixes the messy sort view issue check-in: a0cf2c468e user: mrwellan tags: v1.55 | |
00:21 | Re-fixed sorting to handle partial runs alongside full runs check-in: 2f78c46ed6 user: matt tags: dev | |
2013-08-20
| ||
11:30 | Fixed sorting check-in: f26494345d user: mrwellan tags: v1.55 | |
Changes
Modified common.scm from [6f10718538] to [f3abaceadf].
︙ | |||
298 299 300 301 302 303 304 | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 | - + + - + + - + | (define (get-uname . params) (let* ((uname-res (cmd-run->list (conc "uname " (if (null? params) "-a" (car params))))) (uname #f)) (if (null? (car uname-res)) "unknown" (caar uname-res)))) |
︙ |
Modified dashboard.scm from [c37f1382a1] to [cfc9412691].
︙ | |||
154 155 156 157 158 159 160 | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 | - + - | (set! *tests-sort-reverse* 0) (set! *tests-sort-reverse* (+ *tests-sort-reverse* 1))) *tests-sort-reverse*) (define (get-curr-sort) (vector-ref *tests-sort-options* *tests-sort-reverse*)) |
︙ | |||
206 207 208 209 210 211 212 | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | - + + + + + + + - - - - + - - - - - + | (allruns (cdb:remote-run db:get-runs #f runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2)) *start-run-offset* keypatts)) (header (db:get-header allruns)) (runs (db:get-rows allruns)) (result '()) (maxtests 0) (states (hash-table-keys *state-ignore-hash*)) |
︙ | |||
273 274 275 276 277 278 279 | 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 | + + + + + + - + - + + - + | (vector-set! res 0 (car splst)) (if (> (length splst) 1) (vector-set! res 1 (car (string-split (cadr splst) ")")))) res)) lst)) (define (collapse-rows inlst) (let* ((sort-info (get-curr-sort)) (sort-by (vector-ref sort-info 1)) (sort-order (vector-ref sort-info 2)) (bubble-type (if (member sort-order '(testname)) 'testname 'itempath)) |
︙ | |||
318 319 320 321 322 323 324 | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 | - + - - + + - - + + | (if (> (length parts) 1)(conc " " (car (string-split (cadr parts) ")"))) newval)))) (vector-set! keycol i newval) (iup:attribute-set! lbl "TITLE" munged-val))) (iup:attribute-set! lbl "FGCOLOR" (if (hash-table-ref/default *collapsed* newval #f) "0 112 112" "0 0 0")) (if (< i maxn) (loop (+ i 1))))))) |
︙ | |||
1163 1164 1165 1166 1167 1168 1169 | 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 | - + | ;;(iup:textbox #:size "60x15" #:fontsize "10" #:value "%" ;; #:action (lambda (obj unk val) ;; (mark-for-update) ;; (update-search "item-name" val)) )) (iup:vbox (iup:hbox |
︙ | |||
1218 1219 1220 1221 1222 1223 1224 | 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 | - - + + + + | (let ((val (inexact->exact (round (/ (string->number (iup:attribute obj "VALUE")) 10)))) (oldmax (string->number (iup:attribute obj "MAX"))) (maxruns *tot-run-count*)) (set! *start-run-offset* val) (mark-for-update) (debug:print 6 "*start-run-offset* " *start-run-offset* " maxruns: " maxruns ", val: " val " oldmax: " oldmax) (iup:attribute-set! obj "MAX" (* maxruns 10)))) |
︙ | |||
1256 1257 1258 1259 1260 1261 1262 | 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 | - + + + | (set! *please-update-buttons* #t) (set! *start-test-offset* (inexact->exact (round (/ val 10)))) (debug:print 6 "*start-test-offset* " *start-test-offset* " val: " val " newmax: " newmax " oldmax: " oldmax) (if (< val 10) (iup:attribute-set! obj "MAX" newmax)) )) #:expand "VERTICAL" |
︙ |
Modified zmq-transport.scm from [82efec97d4] to [397cba74a4].
whitespace changes only