summaryrefslogtreecommitdiff
path: root/chart2
AgeCommit message (Collapse)Author
2014-09-18fdo#82577: Handle FontNoel Grandin
Put the VCL Font class in the vcl namespace. Avoids clash with the X11 Font typedef. Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
2014-09-17fdo#81237: 2D OpenGL charts was upside-downZolnai Tamás
The problem is that LO drawinglayer uses a coordinate system with an origin at the top-left corner of the screen, while OpenGL uses a complete coordinate system (with all four quarters, e.g.: allows negative values). The points in LO are always positive values which means they are drawn in the first quarter of the OpenGL coordinate system which also means that the origin is at the bottom-left corner of the scene. This difference causes the flipped scene. * To solve that problem scale the projection matrix with -1.0f along the y axis. * glDisable(GL_CULL_FACE) is necessary to avoid dropping primitives after scaling with -1.0. * Since projection matrix mirrors also the textures we don't need to do that inside the ConvertBitmapExToRGBATextureBuffer() method. Change-Id: Ieba642f3e665778a12368fe50a20865ec8f73514
2014-09-16fdo#83717: Fix the bar picking in the 3D charts.Jan Holesovsky
Change-Id: Id5d4a9344d24f4f6e7d2e33ecde058e8a7147025
2014-09-16fdo#83518: We need the GL context when rendering text.Jan Holesovsky
Change-Id: I5e14dbb4f74000fe49aae9d864fa69266c131d53
2014-09-15Ensure we export correct label placement value for clustered bar chartsMiklos Vajna
This is similar to 7b8073906adca8dae24c04a23708a3f3d582218f (Ensure we export correct labal placement value for percent/stacked charts., 2014-08-07), in case a clustered bar chart has a top placement ("t" in OOXML), then MSO complains as well. Change-Id: Iffd991127784e0e732f6ae55de956a328a3a53e5
2014-09-12chart2: sal_Bool -> boolStephan Bergmann
Change-Id: I8d9802c58950ebe46202c4305b58682f6321531a
2014-09-123D charts: Update the 3D charts when a value changes.Jan Holesovsky
Change-Id: I9c4052108446959ff6f5215d704b496e7a8e6aee
2014-09-12Turn SfxItemState into a C++11 scoped enumerationStephan Bergmann
...to gain further confidence in the claim "that none of the existing code tries to uses combinations of these enum values" (d92602c5b13d0a60439d86c5a033d124178726ca "more fixes for SfxItemState") Change-Id: I987922d945e8738e38adfde83b869adf3ff35b13 Reviewed-on: https://gerrit.libreoffice.org/11384 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2014-09-11bnc#892610: OOXML import: Improve chart number formats.Matúš Kukan
If sourceLinked is used, do not set "PercentageNumberFormat" even if showPercent is true. The format string should be used for "NumberFormat". c8cc89ff802d86b1f3a69afe1b4835b7df7f70c7 unnecessarily disabled "LinkNumberFormatToSource". Use that for data labels but not for axis. Also, actually make attaching number format supplier work for Calc. Previously, non standard formats were added into wrong supplier, and they were thrown away later because it was attached too late. (See also ChartModel::attachNumberFormatsSupplier) Change-Id: Iaf9945abc3d82d0ac63d9f36b8888eb49f39ab57
2014-09-10fdo#83716 - fix deadlock holding mutex required by rendering thread.Michael Meeks
Change-Id: I7195bba02474ac1c00fce0a93f59be622a920686
2014-09-10Re-factor ~inexcusible copy/paste coding away.Michael Meeks
Change-Id: I2ad27cb09031dfadaa628939c191ccc5d88ecffe
2014-09-10more fixes for SfxItemStateNoel Grandin
In commit 88a874fc "convert SfxItemState constants to a proper enum" I made some mistakes in converting bitwise logic to boolean logic. I fixed one of those places in commit 7ad83656 "fix bitwise->logic conversion in SfxItemState commit" This commit fixes the other places where I converted bitwise to normal boolean logic. I also validated that none of the existing code tries to uses combinations of these enum values. This commit also introduces an exception-throwing check in the one place where the enum is explicitly cast to make sure that no combinations sneak in. Change-Id: I545f7d17b76c4fd999078867caec314e83ffe165 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-09-09fix bitwise->logic conversion in SfxItemState commitNoel Grandin
88a874fc "convert SfxItemState constants to a proper enum" Change-Id: I979d5a859f0bbfd8797bfc5ba4ce5497eb777fe7
2014-09-02coverity#1219805 Uninitialized scalar fieldCaolán McNamara
Change-Id: I6dde5a126e57f34705c2fe9189a49d7964b3d65f
2014-09-02coverity#1215398 Uninitialized scalar fieldCaolán McNamara
Change-Id: I190cafda21a9e5969d8a353b272a0e92b5b65903
2014-09-02remove SAL_DEBUGs introduced earlierMarkus Mohrhard
Change-Id: I901188b5b0a3e64e2407d039dd80f89cce8cf6de
2014-09-02simplify codeMarkus Mohrhard
Change-Id: If0b1c47a1e0f6084795fb5ca4a2acced736d4523
2014-09-02extract some shared codeMarkus Mohrhard
Change-Id: I062ea860f695189ab1d59615f1d2390710a21d44
2014-09-02add more notes about deprecated OpenGL featuresMarkus Mohrhard
Change-Id: Ic83ec7e99c8b666b755b93f315019754f9d9757f
2014-09-02WIP debug statementsMarkus Mohrhard
2014-09-02add a note about deprecated functionalityMarkus Mohrhard
Change-Id: Ic980e633f7c9cdcbb3a1b512d66bfd8279d16339
2014-09-02don't even try to create a shape for non existing valuesMarkus Mohrhard
Change-Id: I0af9285c2fa0371607e9ec750bb07968244c44d8
2014-09-02fixed pipeline functions are not available in core contextMarkus Mohrhard
Change-Id: I50f5e876da902181f8ab5c9571df61f035630218
2014-09-02GL_LIGHTING is deprecatedMarkus Mohrhard
Change-Id: I6280af7182f4afefe39ef676024caa9c21f089ff
2014-09-02GL_TEXTURE_WRAP_* is deprecatedMarkus Mohrhard
Change-Id: I2604a6d647c912a91da156072b9821b2abe52b48
2014-09-02GL_POINT_SMOOTH is deprecatedMarkus Mohrhard
Change-Id: Id81a238ed71c8c2f9297e14f6f37d148f29cfbca
2014-09-02glEnable(GL_TEXTURE_2D) is deprecatedMarkus Mohrhard
Change-Id: Ic4ee5414fbbea3d73655b52e66cb397220e61566
2014-09-02fix my last core shader errorMarkus Mohrhard
Now all shaders compile cleanly against a core context without deprecated functions. Change-Id: I53c1fe04e07247f94ad5e3a17819cebea0a9f535
2014-09-02texture*D in GLSL is deprecated and not available in core contextsMarkus Mohrhard
Change-Id: Ia5da0899d73aea22fe7bae735e57e30dcd37b254
2014-09-02replace all attribute and varying in chart shadersMarkus Mohrhard
Next step to a pure OpenGL 3.2 core context. Change-Id: Ifcfccd9ffc8adcc3b7338e10cb25aeb8496909a3
2014-09-02we need to switch to OpenGL 3.2 core for OSXMarkus Mohrhard
A 3.2 core context only supports GLSL 150 core and above. This at least removes all vompile errors related to missing or wrong version requirements. In a next step we need to make use of modern GLSL features now. Change-Id: I59f1bc84ab4f64cc6520309b7da25adc3e116997
2014-09-02make sure that all shaders contain a version stringMarkus Mohrhard
This is necessary for OSX where we are using a core context that does not implement any legacy features anymore. Change-Id: I59536e99761691d910fef62cf82ceb03e57725ae
2014-09-01Consistency around SvxB3DVectorItem in svx/svx3ditems.hxxStephan Bergmann
...similar to what has been done for svx/sdtmfitm.hxx in 68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem." Change-Id: I7f2348d82c76f6f231e34f0dfc4b6ee6fddffe55
2014-09-01Consistency around SvxColorItem in svx/svx3ditems.hxxStephan Bergmann
...similar to what has been done for svx/sdtmfitm.hxx in 68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem." Change-Id: If26ab3229871d2d6a7e4e7e8f79f4cb927b96930
2014-09-01Consistency around SfxUInt16Item in svx/svx3ditems.hxxStephan Bergmann
...similar to what has been done for svx/sdtmfitm.hxx in 68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem." Change-Id: I2e467df03a34d694214e0560476cb7fd76ef0735
2014-09-01Consistency around SfxBoolItem in svx/svx3ditems.hxxStephan Bergmann
...similar to what has been done for svx/sdtmfitm.hxx in 68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem." Change-Id: I3253b4cc5657a7d6b960ee892584109d373eed3d
2014-09-01Consistency around SfxUInt32Item in svx/svx3ditems.hxxStephan Bergmann
...similar to what has been done for svx/sdtmfitm.hxx in 68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem." Change-Id: I3193eab34a34c051002adeedd8b368e26f55f7a3
2014-08-29replace sleep with two condition variablesMarkus Mohrhard
Change-Id: I7611b5be7d462646a19ebfd86b8d6612dccafc71
2014-08-29the DUMMY_CHART_FACTORY variable is not the only indicator for OpenGl chartsMarkus Mohrhard
Change-Id: Idab33c8611526dc4749b4dbe4fe84e68138b4f73
2014-08-29Don't render with mp2DRenderer when we have 3D chartsZolnai Tamás
Change-Id: Icb224f2d3dd55580532b1c4c43781ad444e51a43
2014-08-29mpRenderer->init() needs a contextZolnai Tamás
Change-Id: I9f6ce17fcc590597f357bf3ded5fe3eb41fb3810
2014-08-29Oops, static was forgotten.Zolnai Tamás
Change-Id: I0c316581ab8bfb0a49420006a0801d13021bd1ca
2014-08-29Store env variable in a static variable insteadZolnai Tamás
Change-Id: I5d6067806645722faac3fe90cbec01b6963f7283
2014-08-29Revert "Stop flickering in rendering of charts in Writer"Zolnai Tamás
Hide when it's actually a normal chart. This reverts commit b79b862927d937d695b31df4bdb85d1fc8774f39. Change-Id: Ib7aee142cea979293864f3916eb0580a82605b2b
2014-08-29CHART_DUMMY_FACTORY should not control the OpenGL windowMarkus Mohrhard
Change-Id: Ic6c640f7d37606b357672f2b73f95d51d1daba67
2014-08-29Call resetCurrent as soon as possible to avoid conflict with other threadZolnai Tamás
Change-Id: Ie3edc252135301ba5b85b80edcdbe75537d0da16
2014-08-29Update chart when chart type is changed in edit modeZolnai Tamás
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-29Reinitialize GL3D renderer when OpenGL window is changedZolnai Tamás
Without it when we switch sheets in Calc or slides in Impress and go back to that page where the GL3DBar chart is then the renderer does not work. Change-Id: I9aa6203ed5aa7f94627d886b2f2e5ad34d493843
2014-08-29Don't create an OpenGL window in case of normal charts.Zolnai Tamás
Change-Id: Idb4506712d3902c12aa881a85ddf69a281edff82
2014-08-29Fix rendering of GL3DBarCharts after ODF importZolnai Tamás
OpenGL window need to have a valid size before rendering. Change-Id: I3ce3dbf653f0dc101de3acc4d634d7fe6c3be9ad