a few fixes in the comments and other cosmetic changes

M    src/kalziumglhelperclasses.h
M    src/kalziumglwidget.cpp

svn path=/trunk/KDE/kdeedu/kalzium/src/kalziumglhelperclasses.h; revision=574663

diff --git a/kalzium/kalziumglhelperclasses.h b/kalzium/kalziumglhelperclasses.h
index e027b21937f0616a5a489a31a1fb99a1ef8ea5ff..72ee6c036cc5436a69e6546598906bfacc3ec273 100644 (file)
--- a/kalzium/kalziumglhelperclasses.h
+++ b/kalzium/kalziumglhelperclasses.h
@@ -48,7 +48,7 @@ namespace KalziumGLHelpers
 struct MolStyle
 {
 
-       /** This style in which the bonds are rendered (or not) */
+       /** The style in which the bonds are rendered (or not) */
        enum BondStyle
        {
                BONDS_DISABLED, /**< don't render the bonds */
@@ -58,7 +58,7 @@ struct MolStyle
                        with the color of the atom it touches */
        } m_bondStyle;
 
-       /** This style in which the atoms are rendered (or not) */
+       /** The style in which the atoms are rendered (or not) */
        enum AtomStyle
        {
                ATOMS_DISABLED,/**< don't render the atoms */
@@ -302,7 +302,7 @@ class Sphere : public VertexArray
                /** the detail-level of the sphere. Must be at least 1.
                 * This is interpreted as the number of sub-edges into which
                 * each edge of the icosahedron must be split. So the
-                * number of edges of the sphere is simply:
+                * number of faces of the sphere is simply:
                 * 20 * detail^2. When detail==1, the sphere is just the
                 * icosahedron */
                int m_detail;

diff --git a/kalzium/kalziumglwidget.cpp b/kalzium/kalziumglwidget.cpp
index f4466a3230eef4d7abbd8d4020bebcb74f786a74..b663471a8f34d7a01f0d476d334bc183d9f46961 100644 (file)
--- a/kalzium/kalziumglwidget.cpp
+++ b/kalzium/kalziumglwidget.cpp
@@ -192,17 +192,17 @@ void KalziumGLWidget::renderScene( GLenum renderMode,
 #ifdef USE_DISPLAY_LISTS
        if( m_haveToRecompileDisplayList )
        {
-       if( ! m_displayList ) m_displayList = glGenLists( 1 );
-       if( ! m_displayList ) return;
-       glNewList( m_displayList, GL_COMPILE );
+               if( ! m_displayList ) m_displayList = glGenLists( 1 );
+               if( ! m_displayList ) return;
+               glNewList( m_displayList, GL_COMPILE );
 #endif
 
-       renderAtoms();
-       renderBonds();
+               renderAtoms();
+               renderBonds();
 
 #ifdef USE_DISPLAY_LISTS
-       glEndList();
-       m_haveToRecompileDisplayList = false;
+               glEndList();
+               m_haveToRecompileDisplayList = false;
        }
        glCallList( m_displayList );
 #endif
@@ -250,7 +250,7 @@ void KalziumGLWidget::renderHighlighting()
 
        if( m_clickedAtom )
        {
-               Color( 0.6, 0.0, 1.0, 0.7 ).applyAsMaterials();
+               Color( 0.8, 0.4, 1.0, 0.7 ).applyAsMaterials();
                glLoadName( m_clickedAtom->GetIdx() );
                m_sphere.draw( m_clickedAtom->GetVector(),
                        0.18 + m_molStyle.getAtomRadius( m_clickedAtom ) );
@@ -258,7 +258,7 @@ void KalziumGLWidget::renderHighlighting()
 
        if( m_selectedAtoms.count() )
        {
-               Color( 0.0, 0.7, 1.0, 0.7 ).applyAsMaterials();
+               Color( 0.3, 0.6, 1.0, 0.7 ).applyAsMaterials();
                glEnable( GL_BLEND );
                foreach(OpenBabel::OBAtom* atom, m_selectedAtoms)
                {
@@ -294,7 +294,7 @@ void KalziumGLWidget::FPSCounter()
        }
 
        new_time = t.elapsed();
-       
+
        frames++;
 
        if( new_time - old_time > 200 )