Log of /trunk/graf3d/gl/src/TGLFontManager.cxx
Parent Directory
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: 16563 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: 17192 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: 17051 byte(s)
Diff to
previous 28464
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
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: 14618 byte(s)
Diff to
previous 27643
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
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: 14437 byte(s)
Diff to
previous 27564
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
27564 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Feb 21 12:37:20 2009 UTC (5 years, 11 months ago) by
matevz
File length: 14386 byte(s)
Diff to
previous 27563
TGLFontManager
--------------
Rename GetBaseLineParams() to MeasureBaseLineParams() to distinguish
it from the base-line param getters that return the font design
values.
TGLAnnotation
-------------
Add title to the annotaion-editor window.
Revision
27560 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Feb 20 21:41:28 2009 UTC (5 years, 11 months ago) by
matevz
File length: 14258 byte(s)
Diff to
previous 27467
TGLAnnotation
-------------
New class for rendering of GL labels.
User has the possibility to chanage text, drag it or delete it.
TGLEventHandler
TGLViewer
---------------
Add annotation pick mode.
TGLFontManager
--------------
Add getters for font description.
Revision
27467 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Feb 17 15:27:59 2009 UTC (5 years, 11 months ago) by
matevz
File length: 13157 byte(s)
Diff to
previous 27341
From Alja.
graf3d/gl/src/TGLFontManager.cxx:
Add comment in TGLFontManager::InitStatics() to show map from
font-name to font-id.
graf3d/gl/src/TGLCameraOverlay.cxx:
Bug fix: Use TAttAxis label font.
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: 13025 byte(s)
Diff to
previous 27157
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
26772 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Dec 9 19:57:49 2008 UTC (6 years, 1 month ago) by
matevz
File length: 13132 byte(s)
Diff to
previous 26572
Merge revs between 26664 and 26771 from the fireworks branch.
26664
=====
TEveCalo3DGL - Check if data empty in draw function.
26681
=====
TEveCalo.cxx:
Check if Data is empty if use relative scaling.
TEveCalo3DGL.cxx:
Remove unnecessary if statement.
26683
=====
TGLFontManager:
Add maping from TTF ID to font name.
TEveCaloLegoGL:
Remove hard coded axis title, read from TAxis.
cms_calo.C, cms_calo_detail.C:
Set axis title.
26685
=====
Draw frame from eta, pgi axis in TEveCalo3D.
26687
=====
TEveCalo3DGL - Do not use DLcache in case of highlight and selection.
26688
=====
TEveCalo3DGL - Draw phi bins exactly from front endcap to back endcap.
26756
=====
TEveCalo3DGL - Draw frame within eta, phi limits.
26771
=====
TEveCaloX - Fix compilation warnings.
Revision
26274 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 18 20:32:48 2008 UTC (6 years, 2 months ago) by
matevz
File length: 11661 byte(s)
Diff to
previous 25881
Merge from the fireworks branch the following revisions:
26053
=====
TEveCalo, TGLFontManager - Fix memory leaks.
26167
=====
TEveLegoOverlay - Add possiblity to draw a header text in top right corner of window.
26254
=====
TGLSAViewer - Properly clean up the TGMenuBar.
TEveManager - Add static method Terminate() to shutdown the manager.
26267
=====
TGLScene - In FindLogicalSmartRefresh() delete the shape if the classes don't
match. This was a (rare) memory leak.
TEveBoxSetGL - Consistent punctuation.
26273
=====
TEveManager - Add method 'void CloseEveWindow()' and connect it to the
'CloseWindow()' signal of the main browser.
Revision
25881 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 20 11:29:52 2008 UTC (6 years, 3 months ago) by
matevz
File length: 11639 byte(s)
Diff to
previous 25431
Merge rev 25880 from the fireworks branch.
TEveUtil.cxx:
Bug fix in GetFraction().
TGLFontManager.cxx, TEveProjectionAxesGL.cxx:
Fix left and right text alignement.
TEveLegoOverlay.cxx, TEveLegoOverlay.h:
Use TEveElement main color to color axis labels and lines.
TGLCameraOverlay.h, TGLCameraOverlay.cxx:
Fix random one pixel offset when rendering axis on the viewport
edges. Structural improvements.
tutorials/eve/cms_calo.C:
Show reference plane in TEveLegoOverlay object.
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: 11640 byte(s)
Diff to
previous 25290
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
23868 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 15 19:32:43 2008 UTC (6 years, 8 months ago) by
matevz
File length: 10247 byte(s)
Diff to
previous 23140
From Alja.
TGLFontManager:
Add utility function GetFontSize().
TEveCaloData:
Fix wrong usage of THStack.
TEveCalo, TEveCaloLegoEditor:
Remove obsolete memeber.
TEveLegoOverlay, LinkDef:
New class.
TEveCaloLegoGL:
Draw a semi-transparent plane parallel to the grid and have an
interactive marker on the scale which a user can drag to cause the
plane to move.
cms_calo.C:
Add overlay to the GL scene.
Revision
23140 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Apr 11 11:01:39 2008 UTC (6 years, 9 months ago) by
rdm
File length: 9741 byte(s)
Diff to
previous 23087
move the following directories to "graf2d":
asimage, freetype, gpad, graf, postscript, qt, win32gdk, x11, x11ttf
move the following directories to "graf3d":
eve, ftgl, g3d, gl, x3d
Revision
23087 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 9 14:10:56 2008 UTC (6 years, 9 months ago) by
rdm
Original Path:
trunk/gl/src/TGLFontManager.cxx
File length: 9741 byte(s)
Diff to
previous 22548
From Alja, Bertrand and Matevz - merged branches/dev/fireworks 22550:23082.
Major changes imported by this merge are:
gl/
====
- reorganization of scene rendering in TGLViewer - render opaque
objects from all scenes first, then all transparent ones;
- improve saving of images from the GL-viewer so that the dialog boxes
and other windows do not result in black areas on the saved image;
- improved management of FTGL fonts accross GL contexts.
eve/
====
- new classes for visualization of calorimeter data in lego mode;
- allow fixed scale beyond given radius for fish-eye projections.
Revision
21881 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jan 28 16:24:14 2008 UTC (6 years, 11 months ago) by
matevz
Original Path:
trunk/gl/src/TFTGLManager.cxx
File length: 6294 byte(s)
Diff to
previous 21812
From Alja:
Move rendering of axes from TEveProjectionManager to new class
TEveProjectionAxes. Use TEveText functionality for rendering of
tick-mark labels.
Add new members for FTFont configuration in TEveText.
New demo: tutorials/eve/projection_test.C.
Revision
21812 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Tue Jan 22 20:52:31 2008 UTC (7 years ago) by
matevz
Original Path:
trunk/gl/src/TFTGLManager.cxx
File length: 4189 byte(s)
From Alja:
New class TFTGLManager for management of FTGL fonts.
New classes TEveText, TEveTextEditor and TEveTextGL for display and
configuration of a 3D text.
New test macro 'tutorials/eve/text_test.C'.
From Matevz:
Reenable smart-refresh during redraw of TEveScenes.
Minor code-layout changes.
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.
