Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/visualization/OpenGL/src/G4OpenGLFontBaseStore.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /visualization/OpenGL/src/G4OpenGLFontBaseStore.cc (Version 11.3.0) and /visualization/OpenGL/src/G4OpenGLFontBaseStore.cc (Version 8.3.p2)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 //                                                 26 //
                                                   >>  27 // $Id: G4OpenGLFontBaseStore.cc,v 1.3 2006/06/29 21:18:56 gunter Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-08-03-patch-02 $
 27 //                                                 29 //
 28                                                    30 
 29 #include "G4OpenGLFontBaseStore.hh"                31 #include "G4OpenGLFontBaseStore.hh"
 30                                                    32 
 31 std::map<G4VViewer*,std::vector<G4OpenGLFontBa     33 std::map<G4VViewer*,std::vector<G4OpenGLFontBaseStore::FontInfo> >
 32 G4OpenGLFontBaseStore::fFontBaseMap;               34 G4OpenGLFontBaseStore::fFontBaseMap;
 33                                                    35 
 34 void G4OpenGLFontBaseStore::AddFontBase            36 void G4OpenGLFontBaseStore::AddFontBase
 35 (G4VViewer* viewer, G4int fontBase,            <<  37 (G4VViewer* viewer,G4int fontBase,
 36  G4double size, const G4String& fontName,      <<  38  G4double size, const G4String& fontName) {
 37  G4int width) {                                <<  39   fFontBaseMap[viewer].push_back(FontInfo(fontName, size, fontBase));
 38   fFontBaseMap[viewer].push_back(FontInfo(font << 
 39 }                                                  40 }
 40                                                    41 
 41 const G4OpenGLFontBaseStore::FontInfo&         <<  42 G4int G4OpenGLFontBaseStore::GetFontBase(G4VViewer* viewer, G4double size) {
 42 G4OpenGLFontBaseStore::GetFontInfo             <<  43   G4int fontBase = -1;
 43 (G4VViewer* viewer, G4double size) {           <<  44   std::map<G4VViewer*,std::vector<FontInfo> >::const_iterator i;
 44   std::map<G4VViewer*,std::vector<FontInfo> >: <<  45   i = fFontBaseMap.find(viewer);
 45     fFontBaseMap.find(viewer);                 << 
 46   if (i != fFontBaseMap.end()) {                   46   if (i != fFontBaseMap.end()) {
 47     G4double sizeDiscrepancy = 9999.;              47     G4double sizeDiscrepancy = 9999.;
 48     std::vector<FontInfo>::const_iterator j, k     48     std::vector<FontInfo>::const_iterator j, k;
 49     for (j = i->second.begin(); j != i->second     49     for (j = i->second.begin(); j != i->second.end(); ++j) {
 50       G4double d = std::abs(size - j->fSize);      50       G4double d = std::abs(size - j->fSize);
 51       if (d < sizeDiscrepancy) {                   51       if (d < sizeDiscrepancy) {
 52   sizeDiscrepancy = d;                             52   sizeDiscrepancy = d;
 53   k = j;                                           53   k = j;
 54       }                                            54       }
 55     }                                              55     }
 56     return *k;                                 <<  56     fontBase = k->fFontBase;
 57   } else {                                     << 
 58     // No font found for requested viewer.     << 
 59     static const FontInfo nullFontInfo;  // De << 
 60     return nullFontInfo;                       << 
 61   }                                                57   }
                                                   >>  58   return fontBase;
 62 }                                                  59 }
 63                                                    60