diff options
| author | Mark Sims <mark@nanorex.com> | 2008-04-09 02:26:04 +0000 |
|---|---|---|
| committer | Mark Sims <mark@nanorex.com> | 2008-04-09 02:26:04 +0000 |
| commit | 27c05d41c439cf3bf10dab44049dee8e14991577 (patch) | |
| tree | 4208a299c8ede782bdd3ae8c5758e246285a0863 | |
| parent | 60abc915ac06dcc30277b72641315a282ec4535a (diff) | |
| download | nanoengineer-theirix-27c05d41c439cf3bf10dab44049dee8e14991577.tar.gz nanoengineer-theirix-27c05d41c439cf3bf10dab44049dee8e14991577.zip | |
Make gensym unique across sessions, part 2 (Bruce did part 1). Also changed name "Dna" to "DnaGroup" and removed "-" at end of some additional names.
10 files changed, 18 insertions, 18 deletions
diff --git a/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py b/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py index 825e18b31..00dd29337 100644 --- a/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py +++ b/cad/src/cnt/commands/BuildNanotube/BuildNanotube_EditCommand.py @@ -267,7 +267,7 @@ class BuildNanotube_EditCommand(EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name @@ -338,7 +338,7 @@ class BuildNanotube_EditCommand(EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name diff --git a/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py b/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py index af031d295..44b821665 100644 --- a/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py +++ b/cad/src/cnt/commands/InsertNanotube/InsertNanotube_EditCommand.py @@ -374,7 +374,7 @@ class InsertNanotube_EditCommand(EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name @@ -448,7 +448,7 @@ class InsertNanotube_EditCommand(EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name diff --git a/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py b/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py index 0f2ab0bad..a62bd4206 100644 --- a/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py +++ b/cad/src/cnt/commands/NanotubeSegment/NanotubeSegment_EditCommand.py @@ -429,7 +429,7 @@ class NanotubeSegment_EditCommand(State_preMixin, EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name @@ -516,7 +516,7 @@ class NanotubeSegment_EditCommand(State_preMixin, EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name diff --git a/cad/src/commands/BuildAtom/AtomGenerator.py b/cad/src/commands/BuildAtom/AtomGenerator.py index ebd224529..97ee9a523 100755 --- a/cad/src/commands/BuildAtom/AtomGenerator.py +++ b/cad/src/commands/BuildAtom/AtomGenerator.py @@ -63,7 +63,7 @@ class AtomGenerator( AtomGeneratorPropertyManager, GeneratorBaseClass ): """ cmd = greenmsg("Build Atom: ") - prefix = 'Atom-' # used for gensym + prefix = 'Atom' # used for gensym # Generators for DNA, nanotubes and graphene have their MT name generated # (in GeneratorBaseClass) from the prefix. diff --git a/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py b/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py index 58c1fb587..d6010d9dd 100644 --- a/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py +++ b/cad/src/dna/commands/BuildDna/BuildDna_EditCommand.py @@ -45,7 +45,7 @@ class BuildDna_EditCommand(EditCommand): """ cmd = greenmsg("Build DNA: ") sponsor_keyword = 'DNA' - prefix = 'Dna ' # used for gensym + prefix = 'DnaGroup' # used for gensym cmdname = "Build Dna" commandName = 'BUILD_DNA' featurename = 'Build_Dna' @@ -267,7 +267,7 @@ class BuildDna_EditCommand(EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name @@ -338,7 +338,7 @@ class BuildDna_EditCommand(EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name diff --git a/cad/src/dna/commands/BuildDuplex/DnaDuplex.py b/cad/src/dna/commands/BuildDuplex/DnaDuplex.py index b0b4b2e9e..91a7331cf 100644 --- a/cad/src/dna/commands/BuildDuplex/DnaDuplex.py +++ b/cad/src/dna/commands/BuildDuplex/DnaDuplex.py @@ -989,13 +989,13 @@ class Dna: if _strandA_list: strandAChunk = self._makeChunkFromAtomList( _strandA_list, - name = gensym("Strand"), + name = gensym("Strand", self.assy), group = dnaGroup, color = darkred) if _strandB_list: strandBChunk = self._makeChunkFromAtomList( _strandB_list, - name = gensym("Strand"), + name = gensym("Strand", self.assy), group = dnaGroup, color = blue) if _axis_list: diff --git a/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py b/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py index 7dd530be6..e01bd4fa2 100644 --- a/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py +++ b/cad/src/dna/commands/BuildDuplex/DnaDuplex_EditCommand.py @@ -402,7 +402,7 @@ class DnaDuplex_EditCommand(EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name @@ -587,7 +587,7 @@ class DnaDuplex_EditCommand(EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name diff --git a/cad/src/dna/commands/BuildDuplex_old/DnaGenerator.py b/cad/src/dna/commands/BuildDuplex_old/DnaGenerator.py index 8478f64cd..f0c08071c 100755 --- a/cad/src/dna/commands/BuildDuplex_old/DnaGenerator.py +++ b/cad/src/dna/commands/BuildDuplex_old/DnaGenerator.py @@ -52,7 +52,7 @@ class DnaGenerator(DnaGeneratorPropertyManager, GeneratorBaseClass): cmd = greenmsg("Build DNA: ") sponsor_keyword = 'DNA' - prefix = 'DNA-' # used for gensym + prefix = 'Dna' # used for gensym # Generators for DNA, nanotubes and graphene have their MT name # generated (in GeneratorBaseClass) from the prefix. diff --git a/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py b/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py index 1c0e5daf5..cbf1b6677 100644 --- a/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py +++ b/cad/src/dna/commands/DnaSegment/DnaSegment_EditCommand.py @@ -507,7 +507,7 @@ class DnaSegment_EditCommand(State_preMixin, EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name @@ -589,7 +589,7 @@ class DnaSegment_EditCommand(State_preMixin, EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.win.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name diff --git a/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py b/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py index 335439426..a237a855f 100644 --- a/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py +++ b/cad/src/dna/commands/DnaStrand/DnaStrand_EditCommand.py @@ -265,7 +265,7 @@ class DnaStrand_EditCommand(State_preMixin, EditCommand): # self.name needed for done message if self.create_name_from_prefix: # create a new name - name = self.name = gensym(self.prefix) # (in _build_struct) + name = self.name = gensym(self.prefix, self.assy) # (in _build_struct) self._gensym_data_for_reusing_name = (self.prefix, name) else: # use externally created name |