diff options
author | Bruce Smith <bruce@nanorex.com> | 2009-02-20 17:25:17 +0000 |
---|---|---|
committer | Bruce Smith <bruce@nanorex.com> | 2009-02-20 17:25:17 +0000 |
commit | 78f43971930d211014e19116eac3338283096417 (patch) | |
tree | 45a52950c9a1e2d85790345783d7524efe104e9e | |
parent | eb0d50f35c28f519d6274ed4e5f5d936caff4d42 (diff) | |
download | nanoengineer-78f43971930d211014e19116eac3338283096417.tar.gz nanoengineer-78f43971930d211014e19116eac3338283096417.zip |
comment cleanup
-rwxr-xr-x | cad/src/graphics/drawables/handles.py | 4 | ||||
-rw-r--r-- | cad/src/graphics/drawing/Guides.py | 6 | ||||
-rwxr-xr-x | cad/src/graphics/drawing/drawDnaRibbons.py | 8 | ||||
-rwxr-xr-x | cad/src/graphics/drawing/draw_bond_vanes.py | 4 | ||||
-rw-r--r-- | cad/src/graphics/drawing/texture_helpers.py | 2 | ||||
-rw-r--r-- | cad/src/graphics/model_drawing/ChunkDrawer.py | 2 | ||||
-rwxr-xr-x | cad/src/model/PovrayScene.py | 10 | ||||
-rwxr-xr-x | cad/src/model/chem.py | 4 | ||||
-rw-r--r-- | cad/src/model/virtual_site_indicators.py | 2 |
9 files changed, 23 insertions, 19 deletions
diff --git a/cad/src/graphics/drawables/handles.py b/cad/src/graphics/drawables/handles.py index e48ce9c97..615efe684 100755 --- a/cad/src/graphics/drawables/handles.py +++ b/cad/src/graphics/drawables/handles.py @@ -51,7 +51,7 @@ class HandleSet: """ color = (0.5,0.5,0.5) # default color (gray50) radius_multiplier = 1.0 # this might be patched to some other value by our owner; - # should affect all internal computations using radii, but not returned radii inside handle tuples ######NIM + # should affect all internal computations using radii, but not returned radii inside handle tuples ####NIM def __init__(self): self.origin = V(0,0,0) # changed from this only by certain subclasses, in practice self.handles = [] # list of (pos,radius,info) tuples @@ -106,7 +106,7 @@ class HandleSet: ## def findHandles_near(self, point, radius = None): ## """return a list (in arbitrary order) of pairs (dist, handle) for all the handles ## which are near the given point (within the given radius (default very large###e???), -## *or* within their own sphere-radius). ####### WRONG CODE +## *or* within their own sphere-radius). #### WRONG CODE ## """ ## assert 0 def findHandles_exact(self, p1, p2, cutoff = 0.0, backs_ok = 1, offset = V(0,0,0)): diff --git a/cad/src/graphics/drawing/Guides.py b/cad/src/graphics/drawing/Guides.py index 5b4e7aa8c..7d29bbb5a 100644 --- a/cad/src/graphics/drawing/Guides.py +++ b/cad/src/graphics/drawing/Guides.py @@ -618,7 +618,7 @@ class Guides(object): # can still be highlighted/selected. glDepthMask(GL_FALSE) - # Draw v/h ruler rectangles in the user defined color and opacity. ##### + # == Draw v/h ruler rectangles in the user defined color and opacity. glColor4fv(list(ruler_color) + [ruler_opacity]) glEnable(GL_BLEND) @@ -651,7 +651,7 @@ class Guides(object): if env.prefs[displayHorzRuler_prefs_key]: self.drawLine(hr_line_pt1, hr_line_pt2) - # Draw vertical ruler line(s) and tick marks ########################## + # == Draw vertical ruler line(s) and tick marks if env.prefs[displayVertRuler_prefs_key] and draw_ticks_and_text: @@ -696,7 +696,7 @@ class Guides(object): # End vertical ruler - # Draw horizontal ruler line(s) and tick marks ######################### + # == Draw horizontal ruler line(s) and tick marks if env.prefs[displayHorzRuler_prefs_key] and draw_ticks_and_text: # Draw horizontal line along top/bottom edge of ruler. diff --git a/cad/src/graphics/drawing/drawDnaRibbons.py b/cad/src/graphics/drawing/drawDnaRibbons.py index c57f15d07..b53628d58 100755 --- a/cad/src/graphics/drawing/drawDnaRibbons.py +++ b/cad/src/graphics/drawing/drawDnaRibbons.py @@ -1,10 +1,10 @@ -# Copyright 2007-2008 Nanorex, Inc. See LICENSE file for details. +# Copyright 2007-2009 Nanorex, Inc. See LICENSE file for details. """ Draws the DNA ribbons where each strand is represented as a ribbon. DNA ribbons are drawn as sine waves @author: Ninad -@copyright: 2007-2008 Nanorex, Inc. See LICENSE file for details. +@copyright: 2007-2009 Nanorex, Inc. See LICENSE file for details. @version: $Id$ @license: GPL @@ -208,7 +208,7 @@ def drawDnaSingleRibbon(glpane, pass del vectorAlongLadderStep - ##################################################################### + ###=== #Following limits the arrowHead Size to the given value. When you zoom out, #the rest of ladder drawing becomes smaller (expected) and the following #check ensures that the arrowheads are drawn proportionately. @@ -440,7 +440,7 @@ def drawDnaRibbons(glpane, unitVectorAlongLength = norm(endCenter2 - endCenter1) - ############## + ###=== pointOnAxis = endCenter1 axial_shift_1 = V(0.0, 0.0, 0.0) # might be changed below diff --git a/cad/src/graphics/drawing/draw_bond_vanes.py b/cad/src/graphics/drawing/draw_bond_vanes.py index de528a1ff..a0f3084e0 100755 --- a/cad/src/graphics/drawing/draw_bond_vanes.py +++ b/cad/src/graphics/drawing/draw_bond_vanes.py @@ -113,7 +113,7 @@ def draw_vane( bond, a1p, a2p, ord_pi, rad, col ): color = col else: #bruce 050804: initial test of bond color prefs; inadequate in several - # ways #######@@@@@@@ + # ways ###@@@ from foundation.preferences import prefs_context prefs = prefs_context() from utilities.prefs_constants import bondVaneColor_prefs_key @@ -123,7 +123,7 @@ def draw_vane( bond, a1p, a2p, ord_pi, rad, col ): # maybe in PyOpenGL) assert len(color) == 3 - #####@@@@@ it would be much faster to update this pref (or almost any + ###@@@ it would be much faster to update this pref (or almost any # graphics color pref) if the OpenGL command to set the color was in its # own display list, redefined when the redraw starts, and called from # inside every other display list that needs it. Then when you changed diff --git a/cad/src/graphics/drawing/texture_helpers.py b/cad/src/graphics/drawing/texture_helpers.py index 6ff2ab6d9..3e31c834a 100644 --- a/cad/src/graphics/drawing/texture_helpers.py +++ b/cad/src/graphics/drawing/texture_helpers.py @@ -162,7 +162,7 @@ def _initTextureEnv(have_mipmaps): # ideally it'd be controllable per-jig for side-by-side comparison; # also, changing its menu item ought to gl_update but doesn't ##e glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR) - if have_mipmaps: #####@@@@@ + if have_mipmaps: ###@@@ glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR) else: diff --git a/cad/src/graphics/model_drawing/ChunkDrawer.py b/cad/src/graphics/model_drawing/ChunkDrawer.py index 550d51e05..7af2b5160 100644 --- a/cad/src/graphics/model_drawing/ChunkDrawer.py +++ b/cad/src/graphics/model_drawing/ChunkDrawer.py @@ -755,7 +755,7 @@ class ChunkDrawer(TransformedDisplayListsDrawer): # note: accessing part.drawing_frame allocates it on demand # if it wasn't already allocated during that call of Part.draw. - ##### REVIEW: drawing_frame is probably the misnamed, + #### REVIEW: drawing_frame is probably the misnamed, # now that it's not the same as GLPane.csdl_collector; # see related docstrings in Part or its helper class for this attr # for better description, explaining when we'd use more than diff --git a/cad/src/model/PovrayScene.py b/cad/src/model/PovrayScene.py index dc48143d1..36e66ca42 100755 --- a/cad/src/model/PovrayScene.py +++ b/cad/src/model/PovrayScene.py @@ -1,10 +1,10 @@ -# Copyright 2004-2008 Nanorex, Inc. See LICENSE file for details. +# Copyright 2004-2009 Nanorex, Inc. See LICENSE file for details. """ PovrayScene.py - The POV-Ray Scene class. @author: Mark @version: $Id$ -@copyright: 2004-2008 Nanorex, Inc. See LICENSE file for details. +@copyright: 2004-2009 Nanorex, Inc. See LICENSE file for details. History: @@ -62,6 +62,8 @@ def get_povrayscene_filename_derived_from_name(assy, name): #print "get_povrayscene_filename_derived_from_name(): povrayscene_file=", povrayscene_file return povrayscene_file +# == + class PovrayScene(SimpleCopyMixin, Node): """ A POV-Ray Scene is a .pov file that can be used to render images, accessible from the Model Tree as a node. @@ -408,7 +410,7 @@ class PovrayScene(SimpleCopyMixin, Node): # or (if other nodes also point to it) to copy it so this node owns a unique one. Node.kill(self) - # Context menu item methods ####################################### + # == Context menu item methods def __CM_Raytrace_Scene(self): """ @@ -418,6 +420,8 @@ class PovrayScene(SimpleCopyMixin, Node): pass # end of class PovrayScene +# == + # ImageViewer class for displaying the image after it is rendered. Mark 060701. class ImageViewer(QDialog): """ diff --git a/cad/src/model/chem.py b/cad/src/model/chem.py index 25832d55f..d125e20e6 100755 --- a/cad/src/model/chem.py +++ b/cad/src/model/chem.py @@ -2215,7 +2215,7 @@ class Atom( PAM_Atom_methods, AtomBase, InvalMixin, StateMixin, Selobj_API): # Now that we have higher-order bonds, we also need to check valence more generally. # The check for glpane class is a kluge to prevent this from showing in thumbviews: # should remove ASAP. - #####@@@@@ need to do this in atom.getinfo(). + ####@@@@ need to do this in atom.getinfo(). #e We might need to be able to turn this [what?] off by a preference setting; # or, only do it in Build mode. # Don't check prefs until we know we need them, to avoid needless @@ -4812,7 +4812,7 @@ class Atom( PAM_Atom_methods, AtomBase, InvalMixin, StateMixin, Selobj_API): for atom in bn: if not atom.is_singlet(): pass ###e record element and position - atom.mvElement(Singlet) ####k ??? #####@@@@@ kluge to kill it w/o + atom.mvElement(Singlet) ####k ??? ####@@@@ kluge to kill it w/o # replacing w/ singlet; better to just tell kill that atom.kill() # (since atom is a singlet, this kill doesn't replace it with a singlet) self.make_enough_bondpoints() ###e might pass old posns to ask this to imitate them if it can diff --git a/cad/src/model/virtual_site_indicators.py b/cad/src/model/virtual_site_indicators.py index ece24de30..c2b234897 100644 --- a/cad/src/model/virtual_site_indicators.py +++ b/cad/src/model/virtual_site_indicators.py @@ -446,7 +446,7 @@ def make_virtual_bond( assy, atoms, bond_params, MT_name = None ): jig = VirtualBondJig( assy, atoms ) jig.setProps( bond_params) # also put them into the model somewhere? not for now. just make it findable/drawable from its atoms. NIM - ###### PROBLEM: how will two chemical atoms draw one of these? + #### PROBLEM: how will two chemical atoms draw one of these? # - could put it in the model # - only needed if both atoms are chem, since VirtualSiteChunk could draw it itself # (best implem?: ask each atom's chunk if it has a special property that says it'll draw it) |