Log of /trunk/graf3d/gl/src/TGLAxisPainter.cxx
Parent Directory
Revision
48992 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 28 15:26:26 2013 UTC (21 months, 3 weeks ago) by
rdm
File length: 20732 byte(s)
Diff to
previous 39083
From Lifeng Sun:
The attached patchset fixes a bunch of typo in the source:
0001-succes-success.patch
0002-preceed-preced.patch
0003-informations-information.patch
0004-childs-children.patch
0005-avaliable-available.patch
0006-writeable-writable.patch
0007-comand-command.patch
0008-unkown-unknown.patch
0009-wierd-weird.patch
0010-wheter-whether.patch
0011-unecessary-unnecessary.patch
0012-splitted-split.patch
0013-registerd-registered.patch
0014-recieve-receive.patch
0015-processsing-processing.patch
0016-ouput-output.patch
0017-mutiple-multiple.patch
0018-lenght-length.patch
0019-interupted-interrupted.patch
0020-independant-independent.patch
0021-inconsistant-inconsistent.patch
0022-expresion-expression.patch
0023-explicitely-explicitly.patch
0024-enviroment-environment.patch
0025-deafult-default.patch
0026-continous-continuous.patch
0027-completly-completely.patch
0028-commited-committed.patch
0029-choosen-chosen.patch
0030-backgroud-background.patch
0031-auxilliary-auxiliary.patch
0032-authentification-authentication.patch
0033-appropiate-appropriate.patch
0034-an-other-another.patch
0035-environement-environment.patch
0036-targetting-targeting.patch
0037-suppported-supported.patch
0038-paramater-parameter.patch
Revision
32807 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Mar 29 11:40:58 2010 UTC (4 years, 9 months ago) by
matevz
File length: 20655 byte(s)
Diff to
previous 32806
* TGLAxisPainter
Store all-zeroes regexp as member and optimize it.
* TGLRect
Fix calculation of diagonal, screwed on previous commit.
Revision
30425 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 24 19:45:11 2009 UTC (5 years, 4 months ago) by
matevz
File length: 20569 byte(s)
Diff to
previous 30418
In all classes using FTGL fonts:
Consistently use integer for FTGL font size.
TGLEventHandler, TEveLegoEventHandler, TGLSAViewer,TGLEmbeddedViewer:
Change construnctor of TGLEventHandler and TEveLegoEventHandler.
Revision
30418 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 24 17:10:11 2009 UTC (5 years, 4 months ago) by
matevz
File length: 20537 byte(s)
Diff to
previous 30384
From Alja.
GLRnrCtx:
Add possibility for automatic font scaling.
TGLFontManager:
In RegisterFont() check if font state has changed and check valid font size. Before,
this checks were done in the renders.
render classes:
Use optionally scaled or non-scaled fonts. Remove checks for FTGL fonts,
since they are now done in TGLFontManager:RegisterFont().
Revision
30384 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Sep 23 17:54:23 2009 UTC (5 years, 4 months ago) by
matevz
File length: 21183 byte(s)
Diff to
previous 29526
Merge from fworks branch the following revisions:
30297
=====
tutorials/eve/cms_calo.C:
Change elements names.
TGLViewer:
Add getter to see if use bright or dark colorset.
TGLCameraOverlay, TEveCaloLego, TEveProjectionAxes,TEveCaloLegoOverlay:
By default use markup colors from color set. This way color will be correct
in bright and dark background without any settings.
30340
=====
TEveViewer:
Protect against misleading warnings (happened on mac only).
30376
=====
TGLFont:
Remove TGLFont::RenderBitmap() function and replace it with TGLFont::Render(),
which can be used more genericaly: for all font types and alignments.
TGLAxisPainter, TGLCameraOverlay, TGLAnnotation, TEveProjectionAxesGL:
Use TGLFont::Render() function to draw labels and titles.
TEveCaloLego, TEveCaloLegoEditor:
Remove obsolete members fTopViewUseMaxColor and fTopViewTowerColor.
TEveCaloLegoGL:
Draw tower vlues in all 2DModes.
TEveCaloLegoOverlay:
Draw palette scales in case TEveCaloLego is using palette (f2DMode = TEveCaloLego::kValColor).
TEveCalo3DGL:
Keep grid color same in outline and wirewrame render mode.
Revision
29526 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jul 20 17:41:53 2009 UTC (5 years, 6 months ago) by
matevz
File length: 21240 byte(s)
Diff to
previous 28378
gl/
===
- Introduce common base class TGLPlot3D for wrappers over plot-painters.
- Move code for plot-painter instantiation from TGLScenePad to into TGLPlot3D.
- TGLAxisPainter - add option to use markup color from the current color-set
instead of axis/label/title colors from TAttAxis.
eve/
====
- Add class TEvePlot3D - it wraps a TH2/TH3/TF2 object and draws it with
given option string. TEveTrans can be applied over it - so the plot
can be positioned/scaled to fit into a more complex scene.
- There are still problems with usage of depth-buffer in plot-painters so
the plots overlay each other in somewhat random fashion.
- See tutorials/eve/test_glplot.C.
Revision
28378 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Apr 28 15:40:53 2009 UTC (5 years, 8 months ago) by
matevz
File length: 21062 byte(s)
Diff to
previous 28214
TGLRnrCtx
- Add function ColorOrForeground(Color_t col) which sets given color
or falls back to default foregorund in col is the background color.
TGLFontManager
- Rewrite GetFontSize(Float_t size, Int_t min, Int_t max) to use
TMath::BinarySearch().
- Add function GetFontSize(Float_t size) that uses min, max from the
available font-sizes.
TGLAxisPainterBox
- New class for painting of 3D axes around a box.
TF2GL, TH2GL
- Use TGLAxisPainterBox for painting of axes.
TH3GL
- New class for rendering of TH3 objects.
TGLScenePad
- Proper handling of TH3.
TGLViewer
- When constructed with a given TPad, set background and foreground
colors accordingly.
TGLUtilColor
- Add cache-variable fIndex that makes it easier / more optimal to
compare and retrieve color-indices.
TGLCameraOverlay
- Use TGLFontManager::GetFontSize() without limits.
TGLParametricEquationGL
- Gray-space changes.
Revision
28214 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 15 11:32:25 2009 UTC (5 years, 9 months ago) by
matevz
File length: 14168 byte(s)
Diff to
previous 28197
Merge revisions 28203, 28204 and 28206 from fireworks branch.
28203 - add function TEveJetCone::AddEllipticCone();
28204 - protection for delayed main-frame destruction;
28206 - font-size fixes for GL overlays.
Revision
28197 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Apr 14 13:59:27 2009 UTC (5 years, 9 months ago) by
matevz
File length: 14158 byte(s)
Diff to
previous 27643
Merge the following revisions from the fireworks branch:
-r 27692:27867
-c 27876
-r 28012:28187
================================================================================
27693
TEveCalo:
Set bounding box when calo data empty.
TEveCaloLegoGL:
TGLAxisPainter:
Draw axis title in TGLAxisPainter::PaintAxis().
--------------------------------------------------------------------------------
27694
Forget to check-in this file in revision 27693.
--------------------------------------------------------------------------------
27695
Don't draw frame and call TGLAxisPainter::Paint() if calo data empty.
--------------------------------------------------------------------------------
27699
Fix issues reported by valgrind.
--------------------------------------------------------------------------------
27758
Return viewer in TEveViewer::SpawnGLViewer and TEveViewer::SpawnGLEmbeddedViewer().
--------------------------------------------------------------------------------
27767
Unset event handler when destroying TGLWidget. This is important in case destruction of TGLWidget is called with timeout.
--------------------------------------------------------------------------------
27840
Add possibility to create different icon boxes in
TEveCompositeFrame. Use static function pointer fgIconBarCreator to change default behavior.
Remove oboslete function TEveCompositeFrame::ReplaceIconBox().
--------------------------------------------------------------------------------
7856
Bug fix: Get font size calculating projected axis length at the Z-title position.
--------------------------------------------------------------------------------
27857
Move to real world coordinates. Add line-set for test.
--------------------------------------------------------------------------------
27867
TGLViewer:
Add function:
void ResetInitGL()
This is needed if GL-context is destroyed from outside.
Call it from derived classes when creating and destroying GL-widget.
--------------------------------------------------------------------------------
27876
In line set add possibility to disable depth test, i.e. draw lines/markers in front.
--------------------------------------------------------------------------------
28013
Fix memory leak in TEveCalo2D.
--------------------------------------------------------------------------------
28048
In HandleCrossing() ignore grab and ungrab events. Several window managers produce them nowadays (fvwm2, x-on-mac, sawfish).
--------------------------------------------------------------------------------
28050
Simplify macro.
--------------------------------------------------------------------------------
28106
URL: http://root.cern.ch/viewcvs?rev=28106&root=root&view=rev
Log:
Add data-members and accessors for controlling brightness of front,
side and speulcar lights.
--------------------------------------------------------------------------------
28114
TGLPShapeObjEditor
==================
Remove obsolete data-members and enum entries.
TGLUtil
=======
New class TGLColor - using this will simplify color management in
TGLViewer and TGLRnrCtx.
TEveUtil
========
Simplify implementation of TEveUtil::ColorFromIdx() functions.
--------------------------------------------------------------------------------
28144
Add dtor for TGLColor.
--------------------------------------------------------------------------------
28161
URL: http://root.cern.ch/viewcvs?rev=28161&root=root&view=rev
Log:
Extend window management demo.
--------------------------------------------------------------------------------
28162
Add support several GL color-sets - each defines colors for background,
foreground, outline, markup and for outlines of selected and
highlighted objects.
GL/
===
TGLUtil - add new class TGLColorSet.
TGLRnrCtx - add color-set stack.
TGLViewer - create two color-sets by default - for light and dark
background. These can be switched with the 'e' key now.
TGLScene - decrease polgon-offset for outline-mode fill-pass from (1,
1) to (0.5, 0.5) which is sufficient.
Use/support color-set functionality in other modified classes.
EVE/
====
TEvePolygonSetProjectedGL - skip outline pass.
TEveProjectionAxesGL - skip outline pass and slightly widen the depth
range so that the text is visible in outline mode, where
polygon-offset is applied during the fill-pass.
--------------------------------------------------------------------------------
28168
Add support for a global GL color-set shared among several (all)
viewers.
TGLViewer - add static data-members and functions to handle global
color-set. Add methods that allow switching between global/private
color-sets for a given viewer.
TGLViewerEditor - Disable backgound-color widget when the viewer uses
global color-set.
TGLCameraOverlay - use foreground color for some markup rendering.
In two tutorials use the new API for setting of the background color.
--------------------------------------------------------------------------------
28187
Put back the old method for setting background color and mark it as deprecated.
Revision
27643 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Feb 27 16:13:24 2009 UTC (5 years, 10 months ago) by
matevz
File length: 14948 byte(s)
Diff to
previous 27500
From Alja.
graf3d/gl/src/TGLAxisPainter.cxx,
graf3d/gl/inc/TGLAxisPainter.h:
Add possibility to render axis with any FTGL font mode. Before only pixmap and bitmap fonts were supported.
graf3d/gl/src/TGLFontManager.cxx:
Check if static table is initialised in TGLFontManager::GetFontNameFromId().
graf3d/gl/src/TGLCameraOverlay.cxx,
graf3d/gl/inc/TGLCameraOverlay.h:
Use FTGL font directly in kBar and kPlaneIntersect overlay mode.
graf3d/eve/src/TEveProjectionAxes.cxx:
Set axis attributes.
graf3d/eve/src/TEveProjectionAxesGL.cxx,
graf3d/eve/src/TEveCaloLegoOverlay.cxx,
graf3d/eve/inc/TEveCaloLegoOverlay.h,
Render axis with texture font.
Revision
27370 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Feb 6 18:58:23 2009 UTC (5 years, 11 months ago) by
matevz
File length: 13312 byte(s)
Diff to
previous 27341
graf3d/gl/src/TGLAxisPainter.cxx:
Fix last tick-mark position.
graf3d/gl/src/TGLCameraOverlay.cxx,
graf3d/gl/inc/TGLCameraOverlay.h:
Set font size and tick length relative to size of viewport diagonal.
graf3d/eve/src/TEveCaloLegoOverlay.cxx:
graf3d/eve/src/TEveLegoOverlay.cxx:
graf3d/eve/inc/TEveLegoOverlay.h:
graf3d/eve/inc/TEveCaloLegoOverlay.h:
graf3d/eve/inc/LinkDef2.h:
graf3d/eve/Module.mk:
Rename class TEveLegoOverlay to TEveCaloLegoOverlay, since this is overlay rendering calorimeter parameters.
graf3d/eve/inc/TEveCaloLegoGL.h:
graf3d/eve/src/TEveCaloLegoGL.cxx:
Small bug fix in z-axis tick marks offset. Render axes in 2D
differently than in 3D.
graf3d/eve/src/TEveProjectionAxesGL.cxx:
graf3d/eve/src/TEveProjectionAxes.cxx:
Set axis range relative to viewport size not relative to bounding box
of projection manager as before. Use viewport diagonal as a main reference to set tick length and font size.
graf3d/eve/src/TEveProjectionAxes.cxx:
Change default tick length.
tutorials/eve/cms_calo.C:
tutorials/eve/cms_calo_detail.C:
Adopt to changes in the source code.
Revision
27341 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Feb 3 19:47:35 2009 UTC (5 years, 11 months ago) by
matevz
File length: 13523 byte(s)
Diff to
previous 26367
From Alja.
graf3d/gl/src/TGLAxisPainter.cxx,
graf3d/gl/inc/TGLAxisPainter.h:
Reimplement GL rendering of axis. Calculation of labels val-positions
and tick-marks is separated from the rendering code. The painter has
now possibility to render TAxis directly or render given list of label position-value pairs.
graf3d/gl/inc/LinkDef.h:
Remove obsolete class TGLAttAxis, which have been used by TGLAxisPainter.
graf3d/gl/src/TGLFontManager.cxx:
Use same indexing of font names as in graf2d rendering of axis.
graf3d/gl/inc/TGLCameraOverlay.h,
graf3d/gl/src/TGLCameraOverlay.cxx,
graf3d/eve/src/TEveProjectionAxes.cxx,
graf3d/eve/inc/TEveProjectionAxes.h,
graf3d/eve/inc/TEveProjectionAxesGL.h,
graf3d/eve/src/TEveProjectionAxesGL.cxx,
graf3d/eve/inc/TEveLegoOverlay.h,
graf3d/eve/src/TEveLegoOverlay.cxx,
graf3d/eve/inc/TEveCaloLegoGL.h
graf3d/eve/src/TEveCaloLegoGL.cxx,
Use new implementation of TGLAxisPainter.
graf3d/eve/inc/TEveProjectionAxesEditor.h,
graf3d/eve/src/TEveProjectionAxesEditor.cxx:
Remove obsolete widgets since TEveProjectionAxes inherit from TAttAxis.
graf3d/eve/src/TEveCalo.cxx:
Bugfix. Check if RGBAPalette is created when switching E/Et.
Revision
26367 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Nov 21 18:08:30 2008 UTC (6 years, 2 months ago) by
matevz
File length: 11752 byte(s)
Diff to
previous 25899
Merge revisions 26280:26327 from the fireworks branch.
26281
=====
- TGLScenePad: replace static variable with a data-member. Fix comments.
26304
=====
- TEveProjectionAxesGL: fix index out of bounds error reported by valgrind.
26306
=====
- TGLScene, TGLScenePad: better comments, consistent whitespace.
- TEveElement: add method DestroyOrWarn(): original Destroy() method is exception throwing.
- TEveScene: delete GL-scene and pad in destructor; add ownership information to class-docs.
- TEveSceneList: add method DestroyScenes().
- TEveViewer: add ownership information to class-docs.
- TEveManager: delete scenes, scene-list, viewers and viewer-list in destructor.
26325
=====
TEveTrackPropagator: implement the following overrides of virtual functions:
- TEveElement::CheckReferenceCount() - take into account references from TEveRefBackPtr;
- TEveRefBackPtr::OnZeroRefCount() - call CheckReferenceCount().
26327
=====
Remove trailing whitespace in eve/ and gl/.
Revision
25899 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 20 20:13:38 2008 UTC (6 years, 3 months ago) by
matevz
File length: 11753 byte(s)
Diff to
previous 25642
TEveProjectionAxesGL:
Add possibility to draw projection center and scene origin.
TEveProjectionAxes.h:
Set short description.
TGLAxisPainter.cxx:
Fix typo in documentation.
TGLCameraOverlay.cxx:
Fix viewport range.
Revision
25642 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 1 11:04:06 2008 UTC (6 years, 3 months ago) by
matevz
File length: 11754 byte(s)
Diff to
previous 25431
Merge revs 25435:25641 from the fireworks branch.
Many improvements in text and axis rendering for orthographic views,
for axes in non-linear projections and for the dedicated lego view.
TGLSceneBase
------------
Add data-member 'Bool_t fSelectable' with get/set methods.
If this is set to false, the scene is not rendered during selection
thus preventing any of its elements to be selected.
TGLViewerBase
-------------
In PreRender() honour the selectable state of a scene when selecting
which scenes to include in rendering.
TGLSAViewer
-----------
Remove extra border introduced by usage of kSunkenFrame.
TGLEmbeddedViewer
-----------------
Add optional argument 'Int_t border' to the constructor.
Revision
25431 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Sep 17 08:35:34 2008 UTC (6 years, 4 months ago) by
matevz
File length: 11755 byte(s)
Diff to
previous 25259
Merge Alja's development since the release from the fireworks branch.
25284
-----
TEveCaloLegoGL, TGLAxisPainter, TGLCameraOverlay:
Fix tick-mark and font offsets.
25291
-----
TGLViewerEditor, TGLViewer, TGLCamera, TGLOrthoCamera,
TGLCameraOverlay, LinkDef.h:
Remove TGLCameraMarkupStyle. Functionality is moved to TGLCameraOverlay.
TGLFontManager:
Add utility function TGLFont::RenderBitmap() to draw pixmap
and bitmap fonts on given location.
TEveProjectionAxesGL:
Use TGLFont::RenderBitmap() function.
cms_calo.C, projection_test_prescale.C, projection_test.C, test_compound.C:
Camera markup is not drawn by default in orthographic projection.
25319
-----
TGLCameraOverlay.cxx:
Fix gl pick matrix.
TEveLegoOverlay:
Move inheritance from TGLOverlayElement to TGLCameraOverlay.
25395
-----
TGLFontManager, TGLAxisPainter, TGLCameraOverlay,TEveLegoOverlay, TEveCaloLegoGL:
Modify utility function TGLFont::RenderBitmap() to render text with given alignment.
TEveProjectionAxes:
Render axis on the edges of viewport instead of on edges of bounding box.
25405
-----
TEveProjectionAxesGL:
Draw axis from start to end of frustum corners if frustum inside projection limits,
else draw axis from low to high projection limit.
Set tick-mark size relative to viewport size.
Revision
25259 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Aug 26 14:10:59 2008 UTC (6 years, 4 months ago) by
matevz
File length: 11728 byte(s)
Diff to
previous 25258
From Alja.
graf3d/eve/src/TEveCalo.cxx:
Add missing initialization of TEveCaloLego:fTopViewUseMaxColor in constructor.
graf3d/gl/src/TGLAxisPainter.cxx:
Fix compilation warnings.
From Bertrand.
tutorials/eve/cms_calo_detail.C:
Add missing includes for Windows.
Revision
25245 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Aug 25 21:44:09 2008 UTC (6 years, 4 months ago) by
matevz
File length: 11664 byte(s)
Diff to
previous 24445
Merge changes from the eve-dev branch (-r 25202:HEAD). This makes trunk up to date with all developments in eve/ and gl/. eve-dev branch is now obsolete and will be removed.
Revision
24445 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Fri Jun 20 18:55:43 2008 UTC (6 years, 7 months ago) by
matevz
File length: 7396 byte(s)
From Alja.
TGLAxisPainter.h, TGLAxisPainter.cxx:
Introduce new utilty class to paint axis with GL.
TEveCaloLegoGL,TEveLegoOverlay:
Use TGLAxisPainter functionality.
TEveCaloViz:
Add new Function GetMaxVal().
This form allows you to request diffs between any two revisions of this file.
For each of the two "sides" of the diff,
enter a numeric revision.
