correct capitalization of SelectAtoms*

author: Bruce Smith <bruce@nanorex.com> 2008-09-17 18:22:26 +0000
committer: Bruce Smith <bruce@nanorex.com> 2008-09-17 18:22:26 +0000
commit: b414f01ada37089c245346fa025b49e4e3785bf2 (patch)
tree: 28ecd73aaa9d24e3f4ce05586c7a3e690b996a52
parent: fb3b89972c6f037266aec40ae363d59b6ef6c556 (diff)
download: nanoengineer-theirix-b414f01ada37089c245346fa025b49e4e3785bf2.tar.gz
nanoengineer-theirix-b414f01ada37089c245346fa025b49e4e3785bf2.zip
9 files changed, 44 insertions, 44 deletions
diff --git a/cad/src/commands/Select/Select_GraphicsMode.py b/cad/src/commands/Select/Select_GraphicsMode.py
index 248056905..e915f9073 100755
--- a/cad/src/commands/Select/Select_GraphicsMode.py
+++ b/cad/src/commands/Select/Select_GraphicsMode.py
@@ -131,11 +131,11 @@ def set_DRAG_STICKINESS_LIMIT_from_pref(): #bruce 060315
         prefs_key = DRAG_STICKINESS_LIMIT_prefs_key)
     return
 
-set_DRAG_STICKINESS_LIMIT_from_pref() # also called in selectAtoms_GraphicsMode.leftDown
+set_DRAG_STICKINESS_LIMIT_from_pref() # also called in SelectAtoms_GraphicsMode.leftDown
     # (ideally, clean up this pref code a lot by not passing
     # DRAG_STICKINESS_LIMIT  as an arg to the subr that uses it)
     # we do this early so the debug_pref is visible in the debug menu before
-    # entering selectAtoms_GraphicsMode.
+    # entering SelectAtoms_GraphicsMode.
 
 # ==
 
@@ -302,7 +302,7 @@ class Select_basicGraphicsMode(Select_GraphicsMode_DrawMethod_preMixin,
         This resets (or initializes) per-drag instance variables, and is called
         in Enter and at beginning of leftDown. Subclasses can override this
         to add variables, but those methods should call this version too.
-        @see L{selectAtoms_GraphicsMode.reset_drag_vars}
+        @see L{SelectAtoms_GraphicsMode.reset_drag_vars}
         """
         #IDEALLY(what we should impelment in future) --
         #in each class it would reset only that class's drag vars
@@ -687,15 +687,15 @@ class Select_basicGraphicsMode(Select_GraphicsMode_DrawMethod_preMixin,
         Returns None for all other cases, including when a bond, jig or nothing
         is under the cursor. [warning: this docstring appears wrong.]
 
-        @attention: This method was originally from class selectAtoms_GraphicsMode. See
+        @attention: This method was originally from class SelectAtoms_GraphicsMode. See
                     code comment for details
         """
 
-        #@ATTENTION: This method was originally from class selectAtoms_GraphicsMode.
+        #@ATTENTION: This method was originally from class SelectAtoms_GraphicsMode.
         # It was mostly duplicated (with some changes) in SelectChunks_GraphicsMode
         # when that mode started permitting highlighting.
         # The has been modified and moved to selectMode class so that both
-        # selectAtoms_GraphicsMode and SelectChunks_GraphicsMode can use it -Ninad 2007-10-15
+        # SelectAtoms_GraphicsMode and SelectChunks_GraphicsMode can use it -Ninad 2007-10-15
 
 
         #bruce 060331 comment: this docstring appears wrong, since the code
@@ -791,15 +791,15 @@ class Select_basicGraphicsMode(Select_GraphicsMode_DrawMethod_preMixin,
               selobj, which updates selatom and outputs whatever statusbar
               message is appropriate. ####@@@@ doit... this is not yet fully ok.
 
-        @attention: This method was originally from class selectAtoms_GraphicsMode. See
+        @attention: This method was originally from class SelectAtoms_GraphicsMode. See
                     code comment for details
         """
 
-        #@ATTENTION: This method was originally from class selectAtoms_GraphicsMode.
+        #@ATTENTION: This method was originally from class SelectAtoms_GraphicsMode.
         # It was mostly duplicated (with some changes) in SelectChunks_GraphicsMode
         # when that mode started permitting highlighting.
         # The has been modified and moved to selectMode class so that both
-        # selectAtoms_GraphicsMode and SelectChunks_GraphicsMode can use it -Ninad 2007-10-12
+        # SelectAtoms_GraphicsMode and SelectChunks_GraphicsMode can use it -Ninad 2007-10-12
 
 
 
@@ -963,11 +963,11 @@ class Select_basicGraphicsMode(Select_GraphicsMode_DrawMethod_preMixin,
         THE DEFAULT IMPLEMENTATION OF THIS METHOD DOES NOTHING. Subclasses
         should override this method as needed.
 
-        @see: selectAtoms_GraphicsMode.update_selatom for documentation.
+        @see: SelectAtoms_GraphicsMode.update_selatom for documentation.
         @see: selectMode.get_obj_under_cursor
         """
         # REVIEW: are any of the calls to this in selectMode methods,
-        # which do nothing except in subclasses of selectAtoms_GraphicsMode,
+        # which do nothing except in subclasses of SelectAtoms_GraphicsMode,
         # indications that the code they're in doesn't make sense except
         # in such subclasses? [bruce 071025 question]
         
@@ -1089,12 +1089,12 @@ class Select_basicGraphicsMode(Select_GraphicsMode_DrawMethod_preMixin,
     # - work for single atom too (with its baggage, implying all bps for real
     #   atoms in case chunk rule for that matters)
     # - (not directly related:)
-    #   review why reset_drag_vars is only called in selectAtoms_GraphicsMode but the
+    #   review why reset_drag_vars is only called in SelectAtoms_GraphicsMode but the
     #    vars are used in the superclass selectMode
     #   [later 070412: maybe because the methods calling it are themselves only
-    #    called from selectAtoms_GraphicsMode? it looks that way anyway]
+    #    called from SelectAtoms_GraphicsMode? it looks that way anyway]
     #   [later 070412: ###WARNING: in Qt3, reset_drag_vars is defined in
-    #   selectAtoms_GraphicsMode, but in Qt4, it's defined in selectMode.]
+    #   SelectAtoms_GraphicsMode, but in Qt4, it's defined in selectMode.]
     #
     bc_in_use = None # None, or a BorrowerChunk in use for the current drag,
             # which should be drawn while in use, and demolished when the drag
@@ -1196,7 +1196,7 @@ class Select_basicGraphicsMode(Select_GraphicsMode_DrawMethod_preMixin,
         """
         # Mode API method originally by bruce 050612.
         # This has been refactored further and moved to the superclass
-        # from selectAtoms_GraphicsMode. -- Ninad 2007-10-14
+        # from SelectAtoms_GraphicsMode. -- Ninad 2007-10-14
         if not self.command.isHighlightingEnabled():
             return None
 
diff --git a/cad/src/commands/Select/Select_GraphicsMode_MouseHelpers_preMixin.py b/cad/src/commands/Select/Select_GraphicsMode_MouseHelpers_preMixin.py
index a533370f1..c086e9fa8 100755
--- a/cad/src/commands/Select/Select_GraphicsMode_MouseHelpers_preMixin.py
+++ b/cad/src/commands/Select/Select_GraphicsMode_MouseHelpers_preMixin.py
@@ -170,7 +170,7 @@ class Select_GraphicsMode_MouseHelpers_preMixin(commonGraphicsMode):
     # == START of Empty Space helper methods ===================================
 
     #& The Empty Space, Atom, Bond and Singlet helper methods should probably be
-    #& moved to selectAtoms_GraphicsMode.  I put them here because I think there is a
+    #& moved to SelectAtoms_GraphicsMode.  I put them here because I think there is a
     #& good chance that we'll allow intermixing of atoms, chunks and jigs
     #&(and other stuff) in any mode. Mark 060220.
 
@@ -276,7 +276,7 @@ class Select_GraphicsMode_MouseHelpers_preMixin(commonGraphicsMode):
         @type  obj: instance
         @param event: Left drag mouse event
         @type  event: QMouseEvent instance
-        @see: selectAtoms_GraphicsMode.doObjectSpecificLeftDrag
+        @see: SelectAtoms_GraphicsMode.doObjectSpecificLeftDrag
         @see: self.doObjectSpecificLeftUp, self.objectSetup for comments
         """
         #current object is not clicked but is dragged. Important to set this
@@ -330,7 +330,7 @@ class Select_GraphicsMode_MouseHelpers_preMixin(commonGraphicsMode):
         @param a: Instance of class Atom
         @type a: B{Atom}
         @param event: the QMouseEvent.
-        @see: selectAtoms_GraphicsMode.atomLeftDown
+        @see: SelectAtoms_GraphicsMode.atomLeftDown
         """
         self.atomSetup(a, event)
 
@@ -341,7 +341,7 @@ class Select_GraphicsMode_MouseHelpers_preMixin(commonGraphicsMode):
         @param a: Instance of class Atom
         @type a: B{Atom}
         @param event: the QMouseEvent.
-        @see: selectAtoms_GraphicsMode.atomLeftUp
+        @see: SelectAtoms_GraphicsMode.atomLeftUp
         """
         pass
 
@@ -441,14 +441,14 @@ class Select_GraphicsMode_MouseHelpers_preMixin(commonGraphicsMode):
     def bondDrag(self, obj, event):
         """
         Subclasses should override this method
-        @see: selectAtoms_GraphicsMode.bondDrag
+        @see: SelectAtoms_GraphicsMode.bondDrag
         """
         pass
 
     def bondLeftDouble(self):
         """
         Subclasses should override this method
-        @see: selectAtoms_GraphicsMode.bondLeftDouble
+        @see: SelectAtoms_GraphicsMode.bondLeftDouble
         """
         pass
 
diff --git a/cad/src/commands/SelectAtoms/SelectAtoms_GraphicsMode.py b/cad/src/commands/SelectAtoms/SelectAtoms_GraphicsMode.py
index f73479890..c37f6c095 100755
--- a/cad/src/commands/SelectAtoms/SelectAtoms_GraphicsMode.py
+++ b/cad/src/commands/SelectAtoms/SelectAtoms_GraphicsMode.py
@@ -446,7 +446,7 @@ class SelectAtoms_basicGraphicsMode(Select_basicGraphicsMode):
             #k (is this always desirable? note, a few cases above return
             # early just so they can skip it.)
 
-        return # from selectAtoms_GraphicsMode.leftDown
+        return # from SelectAtoms_GraphicsMode.leftDown
 
     def call_leftClick_method(self, method, obj, event):#bruce 071022 split this
                                                         #out
@@ -646,7 +646,7 @@ class SelectAtoms_basicGraphicsMode(Select_basicGraphicsMode):
         # not clear this would be good, so *this* is what I won't do for now.
         #self.o.gl_update() #& Now handled in modkey*() methods. mark 060210.
 
-        return # from selectAtoms_GraphicsMode.leftUp
+        return # from SelectAtoms_GraphicsMode.leftUp
 
     def leftUp_reset_a_few_drag_vars(self):
         """
@@ -982,9 +982,9 @@ class SelectAtoms_basicGraphicsMode(Select_basicGraphicsMode):
 
     def drag_selected_atoms(self, offset):
         # WARNING: this (and quite a few other methods) is probably only called
-        #(ultimately) from event handlers
-        # in selectAtoms_GraphicsMode, and probably uses some attrs of self that only
-        # exist in that mode. [bruce 070412 comment]
+        # (ultimately) from event handlers in SelectAtoms_GraphicsMode,
+        # and probably uses some attrs of self that only exist in that mode.
+        # [bruce 070412 comment]
 
         if self.maybe_use_bc and self.dragatoms and self.bc_in_use is None:
             #bruce 060414 move selatoms optimization (unfinished);
@@ -1784,9 +1784,9 @@ class SelectAtoms_basicGraphicsMode(Select_basicGraphicsMode):
 
     def update_cursor_for_no_MB(self):
         """
-        Update the cursor for 'Select Atoms' mode (selectAtoms_GraphicsMode)
+        Update the cursor for 'Select Atoms' mode (SelectAtoms_GraphicsMode)
         """
-        ## print "selectAtoms_GraphicsMode.update_cursor_for_no_MB(): button=",\
+        ## print "SelectAtoms_GraphicsMode.update_cursor_for_no_MB(): button=",\
         ## self.o.button, ", modkeys=", self.o.modkeys
 
         if self.w.selection_filter_enabled:
diff --git a/cad/src/commands/SelectChunks/SelectChunks_GraphicsMode.py b/cad/src/commands/SelectChunks/SelectChunks_GraphicsMode.py
index a6276b2dc..c39040faf 100755
--- a/cad/src/commands/SelectChunks/SelectChunks_GraphicsMode.py
+++ b/cad/src/commands/SelectChunks/SelectChunks_GraphicsMode.py
@@ -633,9 +633,9 @@ class SelectChunks_basicGraphicsMode(Select_basicGraphicsMode):
         """
         Event handler for all LMB press events.
         """
-        # Note: the code of selectAtoms_GraphicsMode and SelectChunks_GraphicsMode .leftDown methods
+        # Note: the code of SelectAtoms_GraphicsMode and SelectChunks_GraphicsMode .leftDown methods
         # is very similar, so I'm removing the redundant comments from
-        # this one (SelectChunks_GraphicsMode); see selectAtoms_GraphicsMode to find them.
+        # this one (SelectChunks_GraphicsMode); see SelectAtoms_GraphicsMode to find them.
         # [bruce 071022]
 
         self.set_cmdname('ChunkClick')
@@ -656,7 +656,7 @@ class SelectChunks_basicGraphicsMode(Select_basicGraphicsMode):
 
         method = getattr(obj, 'leftClick', None)
         if method:
-            # This looks identical to the code from selectAtoms_GraphicsMode.leftDown
+            # This looks identical to the code from SelectAtoms_GraphicsMode.leftDown
             # which I just split into a separate method call_leftClick_method,
             # so I will shortly move that into our common superclass and
             # call it here instead of duplicating that code.
@@ -715,10 +715,10 @@ class SelectChunks_basicGraphicsMode(Select_basicGraphicsMode):
 
         self.current_obj_clicked = False
 
-        # Copying some drag_handler checker code from selectAtoms_GraphicsMode (with some
+        # Copying some drag_handler checker code from SelectAtoms_GraphicsMode (with some
         # modifications) -- Ninad20070601
         # [bruce 071022 removed some comments redundant with the
-        #  leftDrag method of selectAtoms_GraphicsMode]
+        #  leftDrag method of SelectAtoms_GraphicsMode]
 
 
         if self.cursor_over_when_LMB_pressed == 'Empty Space':
diff --git a/cad/src/graphics/widgets/GLPane_view_change_methods.py b/cad/src/graphics/widgets/GLPane_view_change_methods.py
index 4d9db0c8e..b96a1f679 100644
--- a/cad/src/graphics/widgets/GLPane_view_change_methods.py
+++ b/cad/src/graphics/widgets/GLPane_view_change_methods.py
@@ -55,7 +55,7 @@ class GLPane_view_change_methods(object):
     # note: is_animating is visible as a public attr of the main class
     is_animating = False # mark 060404
         # Set to True while animating between views in animateToView()
-        # so that update_selobj() in selectAtoms_GraphicsMode will not
+        # so that update_selobj() in SelectAtoms_GraphicsMode will not
         # hover highlight objects under the cursor during that time.
 
     _repaint_duration = MIN_REPAINT_TIME
@@ -325,7 +325,7 @@ class GLPane_view_change_methods(object):
         # animation action while this one is still running.
         self.win.enableViews(False)
 
-        # 'is_animating' is checked in selectAtoms_GraphicsMode.update_selobj() to determine whether the 
+        # 'is_animating' is checked in SelectAtoms_GraphicsMode.update_selobj() to determine whether the 
         # GLPane is currently animating between views.  If True, then update_selobj() will 
         # not select any object under the cursor. mark 060404.
         self.is_animating = True
diff --git a/cad/src/modelTree/ModelTree.py b/cad/src/modelTree/ModelTree.py
index 6508df0ac..c29541a6d 100755
--- a/cad/src/modelTree/ModelTree.py
+++ b/cad/src/modelTree/ModelTree.py
@@ -215,7 +215,7 @@ class modelTree(modelTreeGui.Ne1Model_api):
             # TODO: replace this by a method call or getattr on mode
             selwhat_from_mode = SELWHAT_CHUNKS
         #bruce 060403 commenting out the following, in advance of proposed removal of Select Atoms mode entirely:
-##        elif isinstance( mode, SelectAtoms_Command) and mode.commandName == selectAtoms_Command.commandName:
+##        elif isinstance( mode, SelectAtoms_Command) and mode.commandName == SelectAtoms_Command.commandName:
 ##            #bruce 060210 added commandName condition to fix bug when current mode is Build (now a subclass of Select Atoms)
 ##            selwhat_from_mode = SELWHAT_ATOMS
         change_mode_to_fit = (selwhat_from_mode is not None) # used later; someday some modes won't follow this
diff --git a/cad/src/prototype/test_commands.py b/cad/src/prototype/test_commands.py
index 04ec39855..f24ab7ffa 100755
--- a/cad/src/prototype/test_commands.py
+++ b/cad/src/prototype/test_commands.py
@@ -96,7 +96,7 @@ class ExampleCommand(_superclass):
             if self.PM_class and not self.propMgr:
                 self.propMgr = self.PM_class(self)
             _superclass.init_gui(self) # this fixed the "disconnect without connect" bug 
-            #[when _superclass was selectAtoms_Command anyway]
+            #[when _superclass was SelectAtoms_Command anyway]
                 #k will we need to do this first not last? or not do all of it? seems ok so far.
             if self.propMgr:
                 self.propMgr.show()
diff --git a/cad/src/prototype/test_commands_init.py b/cad/src/prototype/test_commands_init.py
index 1616a6542..d5dc8144b 100755
--- a/cad/src/prototype/test_commands_init.py
+++ b/cad/src/prototype/test_commands_init.py
@@ -76,8 +76,8 @@ def enter_example_command(widget, example_command_classname):
 ##            if _superclass is SelectAtoms_Command:
 ##                import commands.Select.selectMode as selectMode
 ##                reload(selectMode)
-##                import commands.SelectAtoms.selectAtoms_Command as selectAtoms_Command
-##                reload(selectAtoms_Command)
+##                import commands.SelectAtoms.SelectAtoms_Command as SelectAtoms_Command
+##                reload(SelectAtoms_Command)
 ##            
 ##            # revised 071010 (glpane == commandSequencer), new code UNTESTED:
 ##            glpane._recreate_nullmode()
diff --git a/cad/src/scratch/Drawable.py b/cad/src/scratch/Drawable.py
index 8c4f401c7..1747932df 100755
--- a/cad/src/scratch/Drawable.py
+++ b/cad/src/scratch/Drawable.py
@@ -34,7 +34,7 @@ class Drawable(Selobj_API):
     together) or BaubleBaseOrWhateverYouCallIt (if you prefer a period
     in which that and Drawable coexist and are related but different),
     and then add this new superclass to the list of things
-    selectAtoms_GraphicsMode treats specially in its event handlers, which is
+    SelectAtoms_GraphicsMode treats specially in its event handlers, which is
     now Atom, Bond, Jig.
     
     (If you are willing to let me heavily influence Drawable, as you
@@ -50,12 +50,12 @@ class Drawable(Selobj_API):
     Chunk, maybe Jig or some of its subclasses), some methods you'll
     learn about when it tracebacks (like draw_in_abs_coords and maybe
     one for highlight color), and of course a draw method, and a drag
-    method, and special cases in lots of the places in selectAtoms_GraphicsMode
+    method, and special cases in lots of the places in SelectAtoms_GraphicsMode
     that now have them for Atom, Bond, Jig -- but these should of
     course be cases for Drawable, not for Bauble. And they might as
     well come first, so if we ever wanted to make something inherit
     from both Drawable and Atom or Bond or Jig, the Drawable API would
-    win out in terms of how selectAtoms_GraphicsMode interacted with it.
+    win out in terms of how SelectAtoms_GraphicsMode interacted with it.
 
     *** __init__ must set self.glname using env.alloc_my_glselect_name
     [note, this has been revised, bruce 080220; class Atom now sets
@@ -69,7 +69,7 @@ class Drawable(Selobj_API):
     that (tomorrow I can look and see if that scheme needs cleanup or
     could reasonably be extended as-is).
 
-    *** special cases go in selectAtoms_GraphicsMode, not here
+    *** special cases go in SelectAtoms_GraphicsMode, not here
     
     The code that looks at selobj may also need cases for this, but
     maybe not, if it doesn't need a context menu and doesn't traceback
@@ -101,7 +101,7 @@ class Drawable(Selobj_API):
     *** motion relative to the jig is a good idea
     
     As for what the Bauble drag method does (when called by the new
-    Drawable special case in selectAtoms_GraphicsMode leftDrag or whatever),
+    Drawable special case in SelectAtoms_GraphicsMode leftDrag or whatever),
     that is to actually modify its own relative posn in the jig, and
     then do gl_update so that everything (including its parent jig,
     thus itself) gets redrawn, soon after the event is done being
author	Bruce Smith <bruce@nanorex.com>	2008-09-17 18:22:26 +0000
committer	Bruce Smith <bruce@nanorex.com>	2008-09-17 18:22:26 +0000
commit	b414f01ada37089c245346fa025b49e4e3785bf2 (patch)
tree	28ecd73aaa9d24e3f4ce05586c7a3e690b996a52
parent	fb3b89972c6f037266aec40ae363d59b6ef6c556 (diff)
download	nanoengineer-theirix-b414f01ada37089c245346fa025b49e4e3785bf2.tar.gz nanoengineer-theirix-b414f01ada37089c245346fa025b49e4e3785bf2.zip