Commit Graph

1103 Commits

Author SHA1 Message Date
cba672f2c5 coverity#1215398 Uninitialized scalar field
Change-Id: I190cafda21a9e5969d8a353b272a0e92b5b65903
2014-09-02 12:14:46 +01:00
be7d3df141 remove SAL_DEBUGs introduced earlier
Change-Id: I901188b5b0a3e64e2407d039dd80f89cce8cf6de
2014-09-02 01:31:13 +02:00
0c3a8965b5 simplify code
Change-Id: If0b1c47a1e0f6084795fb5ca4a2acced736d4523
2014-09-02 01:08:49 +02:00
276b3d1f8a extract some shared code
Change-Id: I062ea860f695189ab1d59615f1d2390710a21d44
2014-09-02 01:08:48 +02:00
a72a10a32b WIP debug statements 2014-09-02 01:08:45 +02:00
69fa8cfb2d fixed pipeline functions are not available in core context
Change-Id: I50f5e876da902181f8ab5c9571df61f035630218
2014-09-02 01:08:44 +02:00
9d12559881 GL_LIGHTING is deprecated
Change-Id: I6280af7182f4afefe39ef676024caa9c21f089ff
2014-09-02 01:08:44 +02:00
6a7dd1b385 GL_TEXTURE_WRAP_* is deprecated
Change-Id: I2604a6d647c912a91da156072b9821b2abe52b48
2014-09-02 01:08:44 +02:00
71aa5ff208 GL_POINT_SMOOTH is deprecated
Change-Id: Id81a238ed71c8c2f9297e14f6f37d148f29cfbca
2014-09-02 01:08:43 +02:00
a0fc0d0488 glEnable(GL_TEXTURE_2D) is deprecated
Change-Id: Ic4ee5414fbbea3d73655b52e66cb397220e61566
2014-09-02 01:08:43 +02:00
edf7c73d45 Consistency around SfxUInt16Item in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I2e467df03a34d694214e0560476cb7fd76ef0735
2014-09-01 15:18:17 +02:00
0c092af2eb Don't render with mp2DRenderer when we have 3D charts
Change-Id: Icb224f2d3dd55580532b1c4c43781ad444e51a43
2014-08-29 17:40:35 +02:00
18ccf40359 Oops, static was forgotten.
Change-Id: I0c316581ab8bfb0a49420006a0801d13021bd1ca
2014-08-29 17:40:34 +02:00
aa40e86049 Store env variable in a static variable instead
Change-Id: I5d6067806645722faac3fe90cbec01b6963f7283
2014-08-29 17:40:33 +02:00
72d8f483b3 Revert "Stop flickering in rendering of charts in Writer"
Hide when it's actually a normal chart.

This reverts commit b79b862927d937d695b31df4bdb85d1fc8774f39.

Change-Id: Ib7aee142cea979293864f3916eb0580a82605b2b
2014-08-29 17:40:33 +02:00
8e37097d52 Update chart when chart type is changed in edit mode
Regression to master.
In long term it would be better to define ChartWindow as an
OpenGL window and not creating a new window inside the chart
window, becasue otherwise all events which was handled well
by the chart window will be broken (catched by the OpenGL
window so no effect on ChartWindow (defining the behavior of
charts in general) or catched by the ChartWindow and so no
effect on the OpenGLWindow (like invalidating in this case).

Change-Id: I234f469f70914e01f030c8edae9cb5aacea112bf
2014-08-29 17:40:32 +02:00
19cf361efa Fix rendering of GL3DBarCharts after ODF import
OpenGL window need to have a valid size before
rendering.

Change-Id: I3ce3dbf653f0dc101de3acc4d634d7fe6c3be9ad
2014-08-29 17:40:30 +02:00
ed23d7e6d3 Stop flickering in rendering of charts in Writer
Change-Id: I52efa9cd7851f480ee2abcaa1646735c6f518f3a
2014-08-29 17:40:30 +02:00
cde22222cf Mirror vertically the texture bitmaps for OpenGL
In case of glTF models it saves a Mirror() call.
In case of OpenGL charts it avoid flipped texts.

Change-Id: I1ac980e16bcb5ba6a9a025b638aaac3b08b4aab3
2014-08-29 17:40:28 +02:00
f71aae7501 It seems better if the caller allocates the memory for the RGBA buffer.
For example it allows to use std::vector<> and call the method

Change-Id: Id4b8e33838d358dd242d0176e42558505fa8d4a3
2014-08-29 17:40:28 +02:00
7daba09d02 Fix OpenGL chart reinitialiation
Problem after ChartWindow was disabled and enabled
again, OpenGL content was lost.

Two things:
-After setting a new OpenGLWindow the corresponding
IRenderer must be set (x3DWindowProvider->update)
-InitOpenGL() call should not depend on DummyChart, but on
OpenGLWindow (OpenGLContext).

Change-Id: If74e1945de9973d3921ceea1ca6fef39311add7a
2014-08-29 17:40:26 +02:00
43d23a24fd opengl charts: Move the init from sc to chart2, to have the right parent.
Conflicts:
	chart2/source/view/charttypes/GL3DBarChart.cxx

Change-Id: I1e23329345e00e7d8e1f269c832e84d015824c0a
2014-08-29 17:40:25 +02:00
f9857727c6 EE_PARA_WRITINGDIR should presumably use an SvxFrameDirectionItem
...rather than an SfxInt32Item, just as it does everywhere else outside chart2.
At least, running CppunitTest_chart2_export under -fsanitize=undefined
complained about an invalid cast to SvxFrameDirectionItem.

Change-Id: Ia7ea43a00d659de9642f801f390f45b9239d9c32
2014-08-28 15:53:13 +02:00
f96908e1b1 pass by const reference
Change-Id: I1d1fff8b596d75a4cb033679d06b300402dbf212
2014-08-27 12:12:40 +02:00
ed48265c56 correct the variable name
Change-Id: I053c99c1b544fd64951c42ebe1c232cd1768e79f
2014-08-27 11:45:44 +02:00
a670e1596f add screen text color set interface
Change-Id: I2407166368b55b973c70a2edc377785b82d8481b
2014-08-27 11:45:42 +02:00
47e2fd0dc8 Consistently use size_t and SAL_MAX_SIZE
Change-Id: Ibab89984ec94556ec368653b6db50c6c2e380dec
2014-08-16 21:52:32 +02:00
8378bb3122 fix OSX check for GL_EXT_texture_array
For some reason the extension is supported in GL but not in GLSL.

Change-Id: I1cad8baea23e80714269454af23fca87ea9e2949
2014-08-15 00:02:51 +02:00
0cb5939f72 modify screen text color to blue
Change-Id: I80435a980550a2b74657442ef1b44ca8e3825a97
2014-08-13 06:21:34 +02:00
b80cd0c555 add scroll screen text
Change-Id: I619af23f2ea8df2878e2161e99626b09b947a31b
2014-08-13 06:21:34 +02:00
916b1403de add click and history screen text
Change-Id: I7aba9fcc0a5ed96de722f9334476da6763221ab0
2014-08-13 06:21:34 +02:00
212dfdbb92 add render fps rendering
Change-Id: Ic0c8c9a05079a4d4b715f90eccffb7c4ae8260c9
2014-08-13 06:21:33 +02:00
05ecb52d2b add position control to screen text
Change-Id: I6bf340acb3aa50f2ce534b10d5be32c4615b0688
2014-08-13 06:21:33 +02:00
ac6fabdc02 fix Wreorder
Change-Id: Icc9d9587ddf5610d6adaca9b2ea5eb32e2534947
2014-08-06 20:45:13 +02:00
e3d4a488a0 make GL 3.0 support bars scroll
Change-Id: I71d8d94f410e6c67d0e188ea2e0f79eb151758e0
2014-08-06 20:45:13 +02:00
495d53b1dc make pick shader work when bars scroll
Change-Id: I9a3e0e36b212ff49ad22ac0ff267d04476b4c307
2014-08-06 20:45:13 +02:00
b819026e19 add scroll matrix and bars can scroll
Change-Id: Ic821faaa9dc02fd965f46a77136edaf7a87cf6fe
2014-08-06 20:45:12 +02:00
af01f14c87 add scene edge function
Change-Id: Id64e3dc06d0d853bc7cece2337dcc927e15a49b6
2014-08-06 20:45:12 +02:00
2597da2de7 add functions of setting the speed and distance of bars
Change-Id: Id44adf11d445b9c30467e220465528a80ee31b18
2014-08-06 20:45:12 +02:00
cc20cedcbc add codes to compile the scroll shaders
Change-Id: Ib69dbdb012e983e194b7ada04b455c80cf0abbaa
2014-08-06 20:45:12 +02:00
22b45c0adc add high light bar code for click
Change-Id: I412173d01fe6611027b45169fe4cd9be5b4cc4df
2014-08-06 20:45:11 +02:00
7dcc31ed61 pick bar path should use the IDs in pick resource
Change-Id: Ifd20a7a9ecb85ffc080204f4f3e9f200b07b9a9c
2014-08-06 20:45:11 +02:00
00f097b627 test patch of creating bitmap in render thread
Change-Id: Ic0879dba3ad6a80359931edb65f0b72c1cc4d597
2014-08-06 20:45:11 +02:00
f9d2de854b texture should be released in render thread
Change-Id: I4ae03163a2bf9aff831e6fd3a8c1c91fa3eba675
2014-08-06 20:45:11 +02:00
91cc314576 Revert "Revert "bnc#886540: Let's not push the available area down when no titles are there.""
This reverts commit b7a46a22b6a0a5429adec015255ce76e41dced41.
2014-08-06 20:27:33 +02:00
b7a46a22b6 Revert "bnc#886540: Let's not push the available area down when no titles are there."
This reverts commit b398ed8e3f95b75705bb2e53d49589ef7fdbb1c7:  "Aug 06 10:11:53
<sberg> moggi, b398ed8e3f95b75705bb2e53d49589ef7fdbb1c7 broke
CppunitTest_chart2_xshape, very many attributes in
chart2/qa/extras/xshape/data/reference/fdo75075.xml have wrong values now;
what's the best way to fix? manually fixing fdo75075.xml (assuming the new
values are even correct?) looks /very/ tedious.  better revert the commit for
now?"
2014-08-06 15:40:42 +02:00
b398ed8e3f bnc#886540: Let's not push the available area down when no titles are there.
This improves visual layout compability with MS Office chart & looks better.

Change-Id: I348ea81152eca4e3bba9e0d9460448d9314738ad
2014-08-05 14:59:19 -04:00
ec66929352 This was my debug code and is no longer relevant. Let's remove this.
Change-Id: Idcf8890af737adf302866c78101dd00398397a3c
2014-08-05 14:29:25 -04:00
6053491532 fdo#75380: Let's not always set the line style to NONE here.
This one line guarantees that no matter what the real line style is,
it will be ignored.

Change-Id: I3bceaf49ce13ddb42ceb56750d8a4ccfef54033b
2014-07-31 23:35:46 -04:00
f1531cdaae bnc#885825: Support borders around data labels.
Change-Id: Ib141413e523cbf73746876f727e9f80dda9f5f7c
2014-07-26 16:26:08 -04:00