New branch 'feature/calctiledrendering_attempt3_2' available with the following
commits:
commit f1da817eccc0e264ed52283b0c361ec71693e5c0
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 29 11:47:55 2014 +0200
TEMPORARY: more twips in ScOutputData.
Some parts are working, some aren't.
Change-Id: I69b63a585e971a4a56514a66ab318e48507ca5be
commit e3b83296437d8ba23b53977563d4c7b7c7e82e34
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 29 10:36:26 2014 +0200
TEMPORARY: ViewData SetPosX/Y.
Is this just unnecessary data duplication?
(Would've been necessary with the old scaling I guess, but we
don't have these inaccuracies any more?)
Change-Id: I955345668d0d85a30e37316dd9a12f64d6bcbb03
commit ce6c10174151d52f50c45831785c2fef51b37995
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 29 10:31:40 2014 +0200
ViewData: further twips updates.
Change-Id: I88b45057ce6feb121f14ecda65a23f2631349ef8
commit 8f4c131c215da020591f5ed2d083dcd8e0932cb3
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 29 10:23:40 2014 +0200
TEMPORARY: Use PaintMapMode scaling for DrawMapMode too.
Otherwise we end up with invalid scalings once PPTX/Y doesn't
exist.
We can't use the DrawView yet as that gives us invalid scales
for now (due to the PPTX/Y removal/disablement).
Change-Id: I59279cb007bace1237384f58b345079d23aee92e
commit e29f354a89f78b3ee9c997136276beafeb500d63
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 29 10:06:57 2014 +0200
Use Twips in DrawEditStandard too.
This is used e.g. for cells which have been marked by the spellchecker.
Change-Id: I8e0f85c1ff6f3104520b986eb89b03c6d457bf78
commit ac30c4a17803da346f3633723885243f17f79562
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Thu Aug 28 23:41:14 2014 +0200
Update DrawStrings to Twips.
Change-Id: I8df207056e5aab198a2d81b5a4a7cc4d85aa07e6
commit 075f16d19a1324ec10b71034f9a13072c672fd6a
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Thu Aug 28 23:35:52 2014 +0200
Upgrade GetOutputArea to Twips too.
Change-Id: Ie8f4f004fb73c1042616aaa475ab1d12c33f1181
commit 80f391814fb76c529a0de9431dbc1c54b6a2a08b
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Thu Aug 28 23:32:38 2014 +0200
TEMPORARY: don't predraw for calc.
Since we don't have ViewData (yet), the scaling in OutputData is wrong,
making this output ugly. This only seems to affect what appeasrs on screen
directly after startup, and there appears to be no negative effect from
this, so maybe we can jus tkill this pre-painting?
Change-Id: Ie4178ed39263e07fa11a139b20811799b7253601
commit 3edb69a7ff5029785110b084fa409b684bf17415
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Thu Aug 28 23:23:09 2014 +0200
TEMPORARY: variable renamed, but usage not yet adapted.
Change-Id: Ica80137ab67f7687db03cc0f6c0f7eb10d574a69
commit 09f61150e5ead84a0980caa17896d7666e27c704
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Thu Aug 28 23:22:15 2014 +0200
Logic coordinates for clip marks too.
Change-Id: I214064a1c060af2078dc5cd3f1fb4990ea374f0b
commit b9f4df427ef83f1b685d6d6e7fd64c700240aaa7
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Thu Aug 28 23:17:06 2014 +0200
Use Twips for OutputData as much as possible too.
Change-Id: I4eaa1db83861d325beae2f5eea4b623331a56879
commit b8b0bc543f2de0ef66d9550ee75853bff1e919fa
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Thu Aug 28 22:46:03 2014 +0200
Only set outdev origin for tiled rendering.
Change-Id: Iec3e438867a94ec3465474f7b830275373c72bd3
commit f4bf6baa0ba6f01e2aa28593cc61e9165a957d8c
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Thu Aug 28 22:42:56 2014 +0200
Use proper conversion for EditGrowX/Y too.
Change-Id: I344a46d2f27f663dc446562534564c34f9ceaea1
commit d3a7e32f6787e3a12f45057623e722b527d849be
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 20:56:07 2014 +0200
Upgrade GetSelectionRects to logic coordinates too.
Change-Id: I4fda7bb4fea5971654c0ecacbd67bc16bd3a68d9
commit e1c4eb03033a54e90579cef4baa6740e9e22569f
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 20:52:36 2014 +0200
Ensure we use the correct rectangle size for tiled rendering.
Change-Id: I0a4b3bf9c8263365d04ed4319a0c551c363120cd
commit 043a523ed9b1575885178a9b76e6ba913087b773
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 20:52:09 2014 +0200
Match TiledRendering scaling to the new ViewData PaintMapMode.
This is a bit hacky, still need to figure out what's going
wrong that we need this weird conversion.
Change-Id: Id1c62401f9f85c6d436bdd73b51ccf126100cbc4
commit 74f35e1f7aca1ffa003e78827f4a9acd665f38b8
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 20:44:50 2014 +0200
Ensure we keep our modified OutputDevice origin.
This is needed for TiledRendering which treats the sheet as one
continuous area rather than the what's-on-screen assumptions
of the usual rendering method.
Change-Id: Ibebba72f8b5fcba75a8f78ccfa6473d2de2df5fa
commit 1d48c84f2d5f3efa9106914add7a5f94c77b64cf
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 20:42:48 2014 +0200
Don't use UpdateVisibleRange for calc tiled rendering.
Change-Id: Iaba02741acc280dfc4c500e0d08271b39560149b
commit f71b7b21554fdbe4696f55f8236ac55ea842e318
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 20:39:23 2014 +0200
Use logic coordinates to determine cells in visible area.
Change-Id: I91268b0d32aa85ea2a63e05837dc8c3781ede018
commit 0ca6bda9e743d4e5ec2c3d7425b4cda6b70e0545
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 20:37:45 2014 +0200
Set visible range from origin for Calc Tiled Rendering.
Change-Id: I255b8865786088751c5d71da9db2ba38defed3bd
commit aa2e63bec26cbcc4d9defa78a46959fb380dec72
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 20:32:38 2014 +0200
Kill use of PPT for DrawEditParam.
Instead use our MapMode using code.
Change-Id: I41a4fda036fa94f1ea7e5feed669df39e9ca8ebe
commit d955180828008ad4dc40c5f59c906220cd7aa81e
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 19:31:10 2014 +0200
Add logic/pixel conversion wrappers to ScOutputData.
However we still need to think through what to do for the case where
we don't have mpViewData.
Change-Id: I5c5c1e17407f5c24035d9623e49db25754a4e292
commit 06e356d430c6621c02ca183426350a613665b082
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 19:26:28 2014 +0200
Use logic coordinates for GetMergeSizePixel.
Change-Id: Ie4fae87c3307c601548f29c3b502e3ce4f7e49e0
commit bf62b4027fd2f7b1a956b5f11f8eef5e9dae8b5c
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 19:25:09 2014 +0200
GetScrPos: do position sums in logic coordinates.
I.e. match up with the rest of our scaling rewrite, since
summing up after converting to pixels introduces ugly errors.
Change-Id: If60569ce83d2593cf40fa982d3376108b050d383
commit 88c39c1fed1928bcd5ebed34c6c02dea352b9612
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 14:48:47 2014 +0200
Replace AddPixelsWhile with Twips equivalent.
Change-Id: I7bd2125ac839278406133c116201a0474d84d4d4
commit 7e2080df792b1734268aa623f32dd33b2606800c
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 14:46:06 2014 +0200
Allow PaintMapMode retrieval.
We need this for conversions elsewhere (outside of ScViewData).
Change-Id: I86ce18a22095488d3d3750bd13a5fab46a352be5
commit 2ce0a5d51b34632c26555c4844c0b0e2f3c5b636
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 14:32:02 2014 +0200
Conversions should be const.
Change-Id: I98c68ce809d889c5d7b479a59859e633eb4309d9
commit 6c50e5777f277d25f6b13f46fd1d4cfe2aa1bd3e
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 14:29:53 2014 +0200
Don't use PPT values for row/column size changes either.
Change-Id: I70186485c20280ab26587b0b42e48f3ecb483323
commit d146df0b68cef6e3f96a1ab48a5a694a5275153b
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 14:29:07 2014 +0200
Use GetScrPos so that col/row-headers match the grid.
Without this we can still get single pixel errors which can sum
up over multiple columns/row.
Change-Id: Id428dafab1ca771c123c84d815261263a7d33fed
commit d8c049fa8d32b8d7250c421c93153873e10db1cb
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Aug 27 14:24:18 2014 +0200
Use MapMode instead of PPT for ScEditUtil::GetEditArea
Change-Id: I3fbc33da3f32723e37c5004f7883fa6ab4107921
commit 49870ccb9b405573595b43df95a6704108c276d6
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Mon Jul 21 21:13:15 2014 +0200
Add Point and Size versions of convertMm100ToTwip/TwipToMm100.
There seem to be quite a few cases where the individual components
are being converted, this way we can just conver the entire
object as one.
Change-Id: I0043b6f40520d7497e6edc185187706b255f2354
commit c3f803982b23355765913a948ec2dcefa4d159a2
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 15 16:49:34 2014 +0200
Use viewdata scaling for vertical grid lines.
Horizontal lines / the rest of ScOutputData still need converting,
but at least this shows we're on the right track.
Change-Id: I4a7702d9983dd07674808319b3c613d4350ac25e
commit 2ccfad1a23172e3a29185973e9c6ce2f33d5f2d8
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 15 16:48:41 2014 +0200
Implement some Logic/Pixel conversion functions for ScViewData.
Change-Id: I54c99d19852be9825f3dbe80fcbfcfa13a79c835
commit 5a8df7cd86cc8c9c70bfec841893b19d45574ecf
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 15 16:48:01 2014 +0200
Use MapMode instead of nPPTX/nPPTY.
This is far from complete: we need to replace all uses of
nPPTX/nPPTY for things to work correctly.
Change-Id: I7c8aca62c537d8770903f4a6ae0a164479af3fc1
commit 0a9bd8f7c8a9cb20867e51b67730f1b9923b0cb4
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 15 16:46:11 2014 +0200
ScOutputData needs ScViewData for scaling.
Change-Id: I14cd3e835ba8233478514d5f6832737aa2c99bf9
commit 9764a44eaa0c3bcd81deedeeb153034be05cbe44
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 15 16:06:06 2014 +0200
Make nPrtToScreenFactor and GetOutputFactor fractions.
These are then used for our output MapMode which required
Fractions too.
Change-Id: Icbfd9f808a6efe297096c94dc4043cef88c0ba0b
commit 91a31b9c39870b7728b3374ca0a353ba24af85a2
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 15 09:54:58 2014 +0200
ScViewData::GetActiveWin can be const.
We need to reuse this in other const methods, so lets make it const
too.
Change-Id: I6d96fa2370081d515f8629998d8a1e218bec643a
commit 4ccac77312cc8317377e9953bc9face7667b5ad6
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 15 09:53:56 2014 +0200
Allow overriding limits for SetZoom for Tiled Rendering.
Change-Id: Ic656012921408ce5c8dc691933a71a9e0ac78e5d
commit 9a9fd4f9eee4f147622d4ffe5f5b1140cce4c9fa
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 15 09:52:58 2014 +0200
aScrSize should be mutable.
Change-Id: I7376ea17aa4f66c9d9085757b84fb69dd0ad71cb
commit 1ad8138273be02a9f34d7d8379130e06c253762d
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Fri Aug 15 09:48:52 2014 +0200
Fillinfo: don't scale data unnecessarily.
Previously we had multiple layers of scaling, with rounding
errors propagating, leading to up to 5% differences in expected
and rendered sheet widths -- for tiled rendering dimensions have
to scale accurately as we may paint the same tile at multiple zoom
levels, by eliminating multiple scaling and letting the output
device instead deal with the scaling once we can eliminate these
errors.
Change-Id: I0a725fd5c030f3c089c2bbd25947088c321eb2d4
commit c4c39ab5b305b4f3feb54a0e65117ec2df365195
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Thu Jun 26 17:06:58 2014 +0100
Ensure we actually render all cells in the selected area.
Only cells within maVisibleRange are rendered, even if we request
a larger area (and maVisibleRange is otherwise not updated for tiled
rendering). Hence we should explicitly set it here.
Change-Id: I399be9df1f266a2b3d32a95483960b21f561c6b3
commit 9b48317474c5115664bb780a688e7d09b762c23c
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Thu Jun 26 14:30:08 2014 +0100
Take into account drawing layer for data area size.
The drawing layer could potentially have items that are outwith
the data area, but we probably want to have them included for
tiled rendering.
Change-Id: I958c4fa29491cdb0fd80392dfcfa033306f2b76c
commit a63bf4768654007001313bab6d7cba25b2ddcd13
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Jun 18 09:33:16 2014 +0100
Implement data area size retrieval.
Cell dimensions appear to be in TWIPs (but the drawing layer is in 100th
mm).
commit c438d1e82af176cb98cc27eb7a15aa529c8889c6
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Wed Jun 18 08:28:04 2014 +0100
Allow overriding of device for Paint, and use that for Tiles.
Paint handles figuring out which cells are within the visible area
for us etc.
Gridwin being a Window which paints to itself is a bit of a pain,
since we now need to be able to reroute painting calls to alternative
output devices, however these changes seem to be sufficient to at least
get the cells in the desired tile rendered.
Change-Id: I7bd1434c97acc6e9ef6e1e63cbcf039b987c88e4
commit 2cd763002ca9cf88a8cbc32300070ce5e34625c6
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Mon Jun 16 16:19:56 2014 +0100
Calc: Add tiled rendering device to the paint view.
This prevents the previous warnings of
SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), \
this should never be needed
Change-Id: I76cb7c9ed4d45bfcbd297f697314309b4e036f80
commit e498a19c96703c24504b1f53c0b6c94327ae96f4
Author: Andrzej Hunt <andrzej.h...@collabora.com>
Date: Mon Jun 16 15:00:02 2014 +0100
Render tiles from calc.
Currently the document size and number of cells to be rendered
is hardcoded, this will need some more work to select the correct
cells for a given tile (i.e. cells from location). Also, there
isn't really a "size" for a calc sheet, so presumably we'd need
to instead return the area containing cells that aren't empty,
whilst still being able to render larger tiles? (And in any case
the client will need to be aware of this and provide an appropriate
interface, i.e. the current LO UI simply extends the sheet ad-infinitum.)
We also currently get some warnings most likely related to the way
we push our OutputDevice into the rendering methods:
SdrPageView::DrawLayer: Creating temporary SdrPageWindow (ObjectContact), \
this should never be needed
Change-Id: Ia9d64d7de6c22d5b401350f88497a7ec106f1973
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
