Changeset 846


Ignore:
Timestamp:
Jun 27, 2008, 3:37:41 PM (16 years ago)
Author:
garnier
Message:

last updates

Location:
trunk/source/visualization
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/History

    r776 r846  
    1 $Id: History,v 1.420 2008/01/29 22:39:52 allison Exp $
     1$Id: History,v 1.423 2008/04/30 10:09:46 allison Exp $
    22-------------------------------------------------------------------
    33
    … …  
    2424History file for visualization category
    2525---------------------------------------
     26
     2730th April 2008  John Allison  (vis-V09-01-05)
     28- visman-V09-01-04: Fixes more gcc-4.3.0 compiler warnings.
     29- openinventor-V09-01-01: Fixes more gcc-4.3.0 compiler warnings.
     30
     3128th April 2008  John Allison  (vis-V09-01-04)
     32- visman-V09-01-03: Cosmetic improvements.
     33- opengl-V09-01-02: Tidied.
     34
     354th April 2008  John Allison  (vis-V09-01-03, needs greps-V09-01-03)
     36- Back on HEAD.  Contains vis-V09-01-00.
     37- visman-V09-01-02: Fixed gcc-4.3.0 compiler warnings.
     38- opengl-V09-01-01:
     39  o Fixed gcc-4.3.0 compiler warnings.
     40  o Fixed DBL_MAX problem in 2D drawing.
     41  o A lot of Qt development.
     42- openinventor-V09-01-00): Fixed most gcc-4.3.0 compiler warnings.
     43- raytracer-V09-01-00): Fixed gcc-4.3.0 compiler warnings.
     44- vistest-V09-01-01: Zero thickness of box for 2D drawing.
     45
     4630th January 2008  John Allison  (vis-V09-01-02)
     47- Bug fix tag (re-instated G4DAWNFILE) on branch vis-V09-00-03-branch.
     48- DOES NOT CONTAIN vis-V09-01-00 STUFF.
    2649
    275029th January 2008  John Allison  (vis-V09-01-01)

  • trunk/source/visualization/OpenGL/History

    r845 r846  
    1 $Id: History,v 1.114 2008/04/29 16:58:04 lgarnier Exp $
     1$Id: History,v 1.115 2008/06/20 13:55:06 lgarnier Exp $
    22-------------------------------------------------------------------
    33

  • trunk/source/visualization/OpenGL/include/G4OpenGLQtViewer.hh

    r844 r846  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.hh,v 1.9 2008/03/11 16:05:56 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.hh,v 1.10 2008/06/20 13:55:06 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/visualization/OpenGL/include/G4OpenGLStoredQtViewer.hh

    r804 r846  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQtViewer.hh,v 1.5 2008/01/30 10:54:13 lgarnier Exp $
     27// $Id: G4OpenGLStoredQtViewer.hh,v 1.6 2008/06/20 13:55:06 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/visualization/OpenGL/include/G4OpenGLViewer.hh

    r798 r846  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.hh,v 1.22 2008/03/10 16:57:04 lgarnier Exp $
     27// $Id: G4OpenGLViewer.hh,v 1.23 2008/06/20 13:55:06 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

    r844 r846  
    2525//
    2626//
    27 // $Id: G4OpenGLQtViewer.cc,v 1.23 2008/04/29 16:58:04 lgarnier Exp $
     27// $Id: G4OpenGLQtViewer.cc,v 1.24 2008/06/20 13:55:06 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/visualization/OpenGL/src/G4OpenGLStoredQtViewer.cc

    r844 r846  
    2525//
    2626//
    27 // $Id: G4OpenGLStoredQtViewer.cc,v 1.14 2008/04/29 16:58:04 lgarnier Exp $
     27// $Id: G4OpenGLStoredQtViewer.cc,v 1.15 2008/06/20 13:55:06 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/visualization/OpenGL/src/G4OpenGLViewer.cc

    r844 r846  
    2525//
    2626//
    27 // $Id: G4OpenGLViewer.cc,v 1.37 2008/04/04 13:32:22 allison Exp $
     27// $Id: G4OpenGLViewer.cc,v 1.38 2008/06/20 13:55:06 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/visualization/OpenGL/src/G4OpenGLXmRotationCallbacks.cc

    r798 r846  
    2525//
    2626//
    27 // $Id: G4OpenGLXmRotationCallbacks.cc,v 1.14 2006/06/29 21:19:56 gunter Exp $
     27// $Id: G4OpenGLXmRotationCallbacks.cc,v 1.15 2008/06/20 13:55:06 lgarnier Exp $
    2828// GEANT4 tag $Name:  $
    2929//

  • trunk/source/visualization/management/History

    r772 r846  
    1 $Id: History,v 1.107 2008/03/10 16:23:42 lgarnier Exp $
     1$Id: History,v 1.110 2008/04/30 10:07:28 allison Exp $
    22
    33-------------------------------------------------------------------
    … …  
    2626History file for visualization management sub-category
    2727------------------------------------------------------
     28
     2930th April 2008  John Allison  (visman-V09-01-04)
     30- Fixes more gcc-4.3.0 compiler warnings.
     31
     3228th April 2008  John Allison  (visman-V09-01-03)
     33- G4VisCommandsScene.cc: Improve warning message.
     34- G4ViewParameters.hh: Improve commenting for Software Ref. Man.
     35
     364th April 2008  John Allison  (visman-V09-01-02)
     37 - Fixed gcc-4.3.0 compiler warnings.
    2838
    29395th February 2008, Laurent Garnier

  • trunk/source/visualization/management/include/G4ViewParameters.hh

    r772 r846  
    2525//
    2626//
    27 // $Id: G4ViewParameters.hh,v 1.27 2008/03/10 16:23:42 lgarnier Exp $
     27// $Id: G4ViewParameters.hh,v 1.28 2008/04/28 16:14:12 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    210210  void SetLightsMoveWithCamera (G4bool moves);
    211211  void SetPan                  (G4double right, G4double up);
    212   /** Increment currentTarget point by following X,Y values
    213    */
    214212  void IncrementPan            (G4double right, G4double up);
    215   /** Increment currentTarget point by following X,Y,Z values
    216    */
    217   void IncrementPan            (G4double right, G4double up, G4double distance);
     213  // Increment currentTarget point perpendicular to viewpoint direction.
     214  void IncrementPan            (G4double right, G4double up, G4double forward);
     215  // Increment currentTarget point also along viewpoint direction.
    218216  void SetDefaultVisAttributes (const G4VisAttributes&);
    219217  void SetDefaultTextVisAttributes (const G4VisAttributes&);

  • trunk/source/visualization/management/src/G4ViewParameters.cc

    r772 r846  
    2525//
    2626//
    27 // $Id: G4ViewParameters.cc,v 1.30 2008/03/10 16:23:42 lgarnier Exp $
     27// $Id: G4ViewParameters.cc,v 1.31 2008/04/04 13:48:53 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929//
    … …  
    513513
    514514  if (IsExplode() &&
    515       (fExplodeFactor != v.fExplodeFactor) ||
    516       (fExplodeCentre != v.fExplodeCentre)) return true;
     515      ((fExplodeFactor != v.fExplodeFactor) ||
     516       (fExplodeCentre != v.fExplodeCentre))) return true;
    517517
    518518  return false;

  • trunk/source/visualization/management/src/G4VisCommandsScene.cc

    r606 r846  
    2525//
    2626//
    27 // $Id: G4VisCommandsScene.cc,v 1.67 2007/11/10 15:03:56 allison Exp $
     27// $Id: G4VisCommandsScene.cc,v 1.68 2008/04/28 16:12:38 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929
    … …  
    244244      G4cout << " events.";
    245245      if (maxNumberOfKeptEvents > 1 || maxNumberOfKeptEvents < 0)
    246         G4cout << "\n  This may use a lot of memory.";
     246        G4cout <<
     247          "\n  This may use a lot of memory."
     248          "\n  It may be changed with, e.g., "
     249          "\"/vis/scene/endOfEventAction accumulate 10\".";
    247250    }
    248251    G4cout << G4endl;

  • trunk/source/visualization/management/src/G4VisCommandsViewer.cc

    r772 r846  
    2525//
    2626//
    27 // $Id: G4VisCommandsViewer.cc,v 1.68 2007/01/11 16:41:30 allison Exp $
     27// $Id: G4VisCommandsViewer.cc,v 1.70 2008/04/30 10:07:28 allison Exp $
    2828// GEANT4 tag $Name:  $
    2929
    … …  
    405405  // blanks within quotation marks...
    406406  char c;
    407   while (is.get(c) && c == ' ');
     407  while (is.get(c) && c == ' '){}
    408408  if (c == '"') {
    409     while (is.get(c) && c != '"') originalName += c;
     409    while (is.get(c) && c != '"') {originalName += c;}
    410410  }
    411411  else {
    412412    originalName += c;
    413     while (is.get(c) && c != ' ') originalName += c;
     413    while (is.get(c) && c != ' ') {originalName += c;}
    414414  }
    415415  originalName = originalName.strip (G4String::both, ' ');
    … …  
    427427  originalName = originalViewer->GetName();  // Ensures long name.
    428428
    429   while (is.get(c) && c == ' ');
     429  while (is.get(c) && c == ' '){}
    430430  if (c == '"') {
    431     while (is.get(c) && c != '"') cloneName += c;
     431    while (is.get(c) && c != '"') {cloneName += c;}
    432432  }
    433433  else {
    434434    cloneName += c;
    435     while (is.get(c) && c != ' ') cloneName += c;
     435    while (is.get(c) && c != ' ') {cloneName += c;}
    436436  }
    437437  cloneName = cloneName.strip (G4String::both, ' ');
    … …  
    564564  // contains embedded blanks within quotation marks...
    565565  char c;
    566   while (is.get(c) && c == ' ');
     566  while (is.get(c) && c == ' '){}
    567567  if (c == '"') {
    568     while (is.get(c) && c != '"') newName += c;
     568    while (is.get(c) && c != '"') {newName += c;}
    569569  }
    570570  else {
    571571    newName += c;
    572     while (is.get(c) && c != ' ') newName += c;
     572    while (is.get(c) && c != ' ') {newName += c;}
    573573  }
    574574  newName = newName.strip (G4String::both, ' ');
Note: See TracChangeset for help on using the changeset viewer.