Commit Graph

30 Commits

Author SHA1 Message Date
Orgad Shaneh
e68327666f Tests: Fix MSVC warning
tst_timelineselectionrenderpass.cpp:75: warning: C4305: 'return' : truncation from 'double' to 'float'

Change-Id: I2d8e06338bf69c219020e7d9c7015f52db34877a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-09-28 16:51:47 +00:00
Ulf Hermann
b1dd6c9d75 Timeline: Adapt selection renderer autotest to new material
Change-Id: If518418ba1ee22bff99abe9c108166976ce43f2c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-09-11 09:13:10 +00:00
Ulf Hermann
7b7dddbbc5 Timeline: Adapt test case for behavior change in selection handling
Change-Id: I560cce362964baf9877d5a4833223ca0669b6d0c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-27 12:10:33 +00:00
Ulf Hermann
15300d8c85 Timeline: Test that model height change signals make sense
Change-Id: I561fb90f163f3ee2bd9f8a28e839392f2501c61f
Task-number: QTCREATORBUG-14507
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-27 12:10:25 +00:00
Eike Ziller
3858c33d74 Merge remote-tracking branch 'origin/3.4'
Change-Id: I35ba4cc7f7052699c3006545514c866be3cb5fdd
2015-05-26 15:12:42 +02:00
Ulf Hermann
aa1b52aec9 Timeline: Use QSGSimpleRectNode for testing render state
Apparently on some Qt versions we cannot add geometry nodes without
material to the tree.

Change-Id: Id6d7debefd2060190f101ab365f27cae2f461d8d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-19 12:38:56 +00:00
Christian Kandeler
de133ee89c Timeline: Fix qbs build.
Change-Id: If28191975c4290eb364e2b2849cf2b9e3daa6c13
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-05-19 08:36:48 +00:00
Ulf Hermann
f356aae5f9 Timeline: Test TimelineZoomControl
Change-Id: I7053848aa5c77228ef2ce760899f411cf35c3c25
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:33 +00:00
Ulf Hermann
445c7f0014 Timeline: Test TimelineSelectionRenderPass
Change-Id: Ica6c007dd3f6d1e3d1347b7d805273e63e233483
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:29 +00:00
Ulf Hermann
3d09c1411a Timeline: Test TimelineRenderState
Change-Id: Ic89642b6b66f7daf83ba0fa6f74f80ef6af857b7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:25 +00:00
Ulf Hermann
a4945a9f01 Timeline: Test TimelineRenderPass
Change-Id: I20cede53c2a61bfd1a8cf216c4e7054d72c0fb3f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:22 +00:00
Ulf Hermann
e460c7d1e2 Timeline: Test TimelineRenderer
Change-Id: I0297601767b5660673b92c7f560e57b114a3523d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:19 +00:00
Ulf Hermann
b6b8697bef Timeline: Test TimelineOverviewRenderer
Change-Id: I9450f9e260bb11c9e94f7bfe4beb0a9e47ad3ca7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:14 +00:00
Ulf Hermann
2ce83b5193 Timeline: Test TimelineNotesRenderPass
Change-Id: If4778e6cc661c76278a13a61f742e8bb0c2d2dad
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:34:14 +00:00
Ulf Hermann
dad60dfca5 Timeline: Extract common test code into separate files
Change-Id: I812c9343a73f8027a02d4e5670a9751c8b8790c7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:34:10 +00:00
Ulf Hermann
de7caa70d1 Timeline: Test TimelineNotesModel
Change-Id: Ic29538d4e6f432a504f076665eb489100592d931
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:34:02 +00:00
Ulf Hermann
70e8015fa7 Timeline: Move clearing of dirty flags into TimelineAbstractRenderer
As TimelineAbstractRenderer sets the flags it should also clear them.

Change-Id: I78245a9d9048ed50cd0819cc48d22bed89531883
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 11:17:49 +00:00
Ulf Hermann
94b42da80a Timeline: Make 0-width events visible again.
Events with duration == 0 were erroneously filtered out by the items
render pass. Also, we have to give them a very small width in order for
the "stretching" mechanism in the vertex shader to work.

Change-Id: Icb76168f0831547a3ca55ab79df7161736ed4dc4
Task-number: QTCREATORBUG-14446
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 08:20:43 +00:00
Ulf Hermann
171d16c6fb Timeline: Be more exact about height of model aggregator
Only emit the change signal if the height has actually changed.

Change-Id: Ic4bf67f25cb4a7f204815b4e6b0c6bd88c71944a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-16 13:33:03 +00:00
Ulf Hermann
7b1a421fbf Timeline: Test TimelineModelAggregator
Change-Id: I327a12212f6e0d842ed2c230a4d489a3178033d0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-16 13:32:43 +00:00
Ulf Hermann
8425e198c1 Timeline: Be more exact about model height changes.
Emit the signal every time the height changes, but not if it doesn't.

Change-Id: I3a3da737bc99ae99ac6d5690c55c21d94cf5b647
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-16 13:03:25 +00:00
Ulf Hermann
0df8cc2e02 Timeline: Clear excess row heights when reducing the number of rows
Otherwise, if you increase the number of rows again later you get
surprising results.

Change-Id: I3ec809820716368849415f9dcdb1ec9208844353
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-14 15:19:46 +00:00
Ulf Hermann
153a57ce80 Timeline: Test parenting of equal start times
If you insert events with equal start times in a way that the model can
not reorder them by their end times the parenting follows the indexes,
not the end times. This has caused confusion multiple times and it's
good to test it.

Change-Id: I3e9ba212ff377dc2afa2a2893637bb55edebafea
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-09 13:41:51 +00:00
Ulf Hermann
d57c7e14fe Timeline: In autotests, fail if the renderer warns
Warnings from the scene graph renderer are most likely things we want
to catch when testing, such as failure to compile the shaders.

Change-Id: I96bcf4a44d0986ca6f065cda71b242ebb355ce84
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-03-24 11:23:17 +00:00
Ulf Hermann
d2070c8fc8 Timeline: test TimelineItemsRenderPass
Change-Id: I324a9a1733d1d0a38bf73c8178d5a97cd60c25c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-04 16:16:19 +00:00
Ulf Hermann
c6628f7ee3 Timeline: Add exception for parenting ranges with equal start times
Also, in contrast to the 5 previous times this piece of code has been
broken and fixed, this time add an elaborate comment about the problem
and a test case to check for future regressions.

Change-Id: I2babf7c6e98d7ab12ee53362229f30f6d9e5d7d5
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-01-29 15:20:48 +00:00
Ulf Hermann
dac7e8644e Timeline: test TimelineAbstractRenderer
Change-Id: I9860af4b6aedbd656103bf5def38f1830b1352e1
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-18 13:04:28 +01:00
Ulf Hermann
f0da74d35d Timeline: Streamline model implementations
Allow models to be created without a parent and provide default
implementations for virtual methods. It's actually fine to have all
ranges in row 0 and in black by default. Having default implementations
makes things easier to test.

Change-Id: Ibb842ef295cdcfa13d8ca4be3489906af72e9699
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-18 13:04:09 +01:00
Ulf Hermann
7053378fdf Timeline: Complete test coverage of TimelineModel.
Change-Id: If27c51b1189bc0bb0333837c58849bc79b779845
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-18 13:03:38 +01:00
Ulf Hermann
c40d9e9d17 Timeline: Create new library from contents of QmlProfiler
Change-Id: I964b2f149e237eb25a08600e8dab8968e8bc0cb9
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-16 15:22:48 +01:00