feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
141 Commits 108 Branches 368 Tags
b3e4cf2032fe9899caac60ceb7029ca33ce68771
Commit Graph

51 Commits

Author SHA1 Message Date
Eike Ziller
5fef8a9d91 Merge remote-tracking branch 'origin/3.3' 
Change-Id: I8a5730f8d103f697a9179c9783c1bdfc7d5d312b
 2015-02-13 09:38:33 +01:00
Eike Ziller
ce38b0379f Update License 
Change-Id: I2ba997eac9d3ff75542b5861dbbc89d3ccd6017e
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
 2015-01-16 09:48:02 +02:00
Ulf Hermann
ff45f1c156 Define separate methods for getting collapsed and expanded rows 
Change-Id: I3449e163dd00283a04fd5147d81034d2f68a961f
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-12-05 15:16:28 +02:00
Ulf Hermann
fad69ea995 Remove useless checks in labels() methods 
The view should do those.

Change-Id: I05f1316b8970cdd24958550c958695c5a7ad0d79
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:41 +02:00
Ulf Hermann
d93266420b Adapt to splitting of AbstractTimelineModel 
Change-Id: Ib39831448262c5c4329b0f13f62e20d4c3ea73b6
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:35 +02:00
Ulf Hermann
fd09a6bed2 Create extension models through a factory 
Like that we can drop the deferred setting of model manager and we can
announce the features right away on construction.

Change-Id: I8b4eb3e94046511b0e637084768e919649115e77
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:30 +02:00
Ulf Hermann
b398ccb738 Adapt to switching of typeId and selectionId 
Change-Id: I2aa918232b688bb84690fb8ee10753aa04804d7c
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:25 +02:00
Ulf Hermann
bfbad9b941 Don't use AbstractTimelineModel's private class 
We can easily implement all needed functionality with only the public
interface.

Change-Id: Ibf22f2e4bc27a8b506f0164e0e1fdf529b1a9e45
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:21 +02:00
Ulf Hermann
587caba5e7 Adapt to merging of AbstractTimelineModel and SortedTimelineModel 
Change-Id: I13cbcf98934daef075080a8bf27d505a673103cf
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:50:15 +02:00
Ulf Hermann
6438cacf1a Add texture deletion events to scene graph profiler 
It seems those were forgotten when the scene graph profiler was
refactored.

Change-Id: I4cf5f1cae701ec4ff64659bd023fb5941715e7e1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-10-16 09:45:59 +03:00
Ulf Hermann
63f5ccfc11 Use QT_TRANSLATE_NOOP to mark translatable strings in arrays 
Change-Id: Id24ca60a8166394811e0ff93f5bd1d3e198ac67e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-10-15 12:24:52 +03:00
Ulf Hermann
7ae08a61b1 Improve appearance of Scene Graph profiler. 
It shouldn't display 0-size timings and it should distinguish the
threads more clearly. Also, we display the gross render time in
addition to the render time breakdown. This seems to be rather
important information for users.

Change-Id: I3c1d94f1489902a815c20831e8e1059c815ef129
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-10-15 12:24:40 +03:00
Ulf Hermann
f70cbad9b1 Store typeIds in range data 
Change-Id: I09e9481296cbd0429858df893de902c63891b430
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-29 14:07:42 +03:00
Ulf Hermann
009b1bd437 Rename eventId to typeId and selectionId 
Change-Id: Id28186a5e24c9b0f6f89142ba4c35d1a5a462852
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-29 14:07:05 +03:00
Ulf Hermann
83be08fe41 Respect the "hidden" property when generating labels 
Change-Id: I96a40813ad8aebcb86ddc9ed08327fe836681267
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-15 12:29:31 +03:00
Ulf Hermann
2aff8c4ea9 Centralize rowCount calculation 
Change-Id: I6e159702e533848c9eb9c98551743d5472f2155c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-15 12:29:20 +03:00
Ulf Hermann
4f0e720893 Report supported features from timeline models 
Also add a stub input events model to represent that feature.

Change-Id: Idd05b9452b7c6920779e72966ce62c0a1decaeef
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-15 12:29:13 +03:00
Ulf Hermann
f430b10868 Rename "Glyph Count" to just "Glyphs" 
It means the same but is shorter and doesn't get elided.

Change-Id: I0ef221bb844691b9c15a3c10743bfd7389fe95ae
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-08 11:26:20 +03:00
Ulf Hermann
1ee5799e7e Don't resolve the type ID twice when coloring scene graph events 
Change-Id: Ib396f4a28ddcfc5a4d95beb4a22dbd109d06b38e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-08 11:25:29 +03:00
Ulf Hermann
4cb16afcf0 Fix typo in scene graph model 
Change-Id: Ifef5ac0b3ffa05b17d6f17adf8a8c2f745a98e1c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-09-08 11:24:58 +03:00
Ulf Hermann
e32fff5b5a Adapt to new class hierarchy for AbstractTimelineModel 
Change-Id: I432e334cee3cfc97970224c0f61213dc4f0a2cc2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:54:41 +03:00
Ulf Hermann
af151a0a68 Change the scene graph profiler to give more accurate information 
The scene graph profiler was pretty barren. The ranges it showed were
only vaguely related to actual events and the numbers shown in the
labels weren't really informative.

This change shows every stage in GUI thread and rendering thread as its
own range, so that you can easily see now if a particular stage takes
unusually long. This comes at a cost, though: The color is used for
showing event types instead of frame rates now and there is no 1:1
mapping of rows to threads anymore. The first row is still reserved
for the GUI thread and the second one for the render thread. Further
rows are used as needed, though, and you can meaningfully expand the
category now.

Task-number: QTBUG-39876
Change-Id: Ib91ba454dd0e3e7482ca2afe6d3c80d9868bcce3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:53:51 +03:00
Ulf Hermann
ae07d0624c Simplify range details 
Adapt to the new signature of the details method and don't create
unnecessary nested maps.

Change-Id: Iab8d31e48d35923fee3e258c0390459a81ece746
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:53:21 +03:00
Ulf Hermann
b7cd23a466 Adapt to renaming of get* and find* methods 
Change-Id: I470bcaaf53a6184ae35369484337b247bf17f52e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:52:00 +03:00
Ulf Hermann
2c4214825c Rename occurrences of "title" to "displayName" 
Change-Id: Ic26122d319dd56a4666a02bf6979c292581473ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:51:33 +03:00
Ulf Hermann
1a4371080b Adapt to removal of name from AbstractTimelineModel 
Change-Id: I7747ea5f8485795ad7777fa2f411afcff01956f8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-08-26 15:50:20 +03:00
Ulf Hermann
fafe9b116c Fix switched times for windows render loop. 
Task-number: QTBUG-39876
Change-Id: I01c15ede43a9d94fdfc3123b6df8a235430cfc81
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-02 12:24:33 +03:00
Ulf Hermann
7f0b2b4087 Remove redundant displayNames 
There is no point in showing a displayName that's the same as the
description.

Change-Id: Ie6ace79e622e31b87ff42d741e04103a920b36e4
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-02 12:16:57 +03:00
Ulf Hermann
da597356a1 Show scene graph events in correct thread for non-threaded render loop 
If no polishAndSync event is ever seen we can be sure the application
is doing non-threaded rendering. In that case all other events belong
to the GUI thread rather than the render thread.

Change-Id: Ib5d0cbcdc7c45bff6303a1b4bfb1f5333830c7f7
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-02 12:16:26 +03:00
Ulf Hermann
71f04e35d7 Adapt to centralization of type data. 
Change-Id: Ie2ad2f7ab326adb88334b3bd686cbde0f25f1a83
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-06-18 15:56:46 +03:00
Ulf Hermann
14babc5395 Derive from AbstractTimelineModel instead of SingleCategoryTimelineModel 
Change-Id: I720f067956417519e58fac9d92292edd7968356d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-06-17 17:53:25 +03:00
Ulf Hermann
c83e2cb3eb Adapt to single category per model 
Change-Id: I0af479f2405a9c71602b9635e8e8ec4b1bcb9554
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-06-16 13:17:57 +03:00
Ulf Hermann
3c5b2dd704 Adapt to changes in event type definitions 
Change-Id: If105f490a02ffabe07d2b4871c655972445c6a19
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-06-16 13:06:00 +03:00
Ulf Hermann
03c3241306 Saturate colors some more and use color selection from base class 
The original colors were hard to discern from the background on certain
devices.

Change-Id: I276f2cd76e0a1be40040bf5a0557a288d10d37d9
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2014-03-11 12:30:24 +02:00
Ulf Hermann
1b60bc8d3d Fix label for render thread. 
Change-Id: I8162d2dd025853055fff3d258e62eba5889ef3a8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-03-10 17:06:36 +02:00
Ulf Hermann
c55dbf2e7a Adapt to unified data models in creator 
Change-Id: I08991a79d5cc70bb374ecaa8d5b707962403cee7
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-02-19 16:57:39 +02:00
Ulf Hermann
b1bc443f5c Reduce code duplication 
Change-Id: Icc072982427dc3874262fcaaf9885931e1588e80
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-02-19 16:26:15 +02:00
Ulf Hermann
86b3da7cd2 Use time formatting method of base class instead of reimplementing it 
Change-Id: I81da4ec2a7830f3a3ddfb85ceeffdaeca20c3c6d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-02-18 15:49:27 +02:00
Ulf Hermann
f70e8c6464 Eliminate redundant isEmpty() methods. 
Change-Id: I7cdde38a389e077875199a0b34c8b527691aa96e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-02-18 15:48:53 +02:00
Ulf Hermann
ff75cbda02 Eliminate redundant name() methods 
Change-Id: Icaa03eee0650481309e073c51b1a5a1b98820b41
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-02-18 15:48:40 +02:00
Ulf Hermann
79ea5d26a6 Eliminate redundant categories() method in favor of categoryCount() 
Change-Id: Iaab6c1bc30208abe018a1534c2197166f673cf81
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-02-18 15:46:21 +02:00
Ulf Hermann
f3b2752410 Unify handling of category labels 
Change-Id: I3d06035e066aa249f5dcc06aa787c3480bbde74b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-02-18 15:45:58 +02:00
Ulf Hermann
eb4c101f9b Use dataChanged() implementation from abstract timeline model 
No need to repeat the same code multiple times.

Change-Id: Ibe6865458c7ae47cc32f03cdc493ada320def584
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-12-12 11:17:25 +02:00
Ulf Hermann
6627792f06 Use SortedTimelineModel for scenegraph timeline model 
Change-Id: I85e48c6301ad670105345621d9a1fb66baa39eb5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-12-12 11:17:10 +02:00
Christiaan Janssen
ab17b3ea6e QmlProfilerExtension: using QtCreator's qmlprofiler plugin 
Change-Id: I3daca67692a1b9c390bbd396fdd2991ae3c50297
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-08-12 12:55:15 +03:00
Christiaan Janssen
502d929c7f QmlProfiler: fix issues with SceneGraphModelProxy 
Change-Id: I1d58b158b7afb805ea03f439ec12b37acc8925c7
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-08-08 11:54:29 +03:00
Christiaan Janssen
71375b3c35 QmlProfiler: fixed bug in status completion 
Change-Id: I01b99f3c14d359be1d3e1bd85df01f6c823a1cab
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-08-06 15:59:03 +03:00
Christiaan Janssen
21689299ab QmlProfiler: Status bar for several models 
Change-Id: Icb6aa70a57ef1088b1eb00eed234a6e1d6a2fbc2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-08-06 15:58:57 +03:00
Christiaan Janssen
cb0ea6407f QmlProfiler: resetting expanded when data changes 
Change-Id: Iaacbe03eecb0679da03006f439e10b1e2dfe9167
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-08-06 15:58:34 +03:00
Christiaan Janssen
832e2b8d39 QmlProfiler: link views when selecting event 
Change-Id: I4dbb09d459e033fae2fceb24ab5e4b0e7de38179
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-07-11 15:12:51 +03:00