Changeset 3437 for inundation/pmesh
- Timestamp:
- Aug 2, 2006, 2:14:46 PM (19 years ago)
- Location:
- inundation/pmesh
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
inundation/pmesh/graphical_mesh_generator.py
r3213 r3437 130 130 'add Segments to form alpha shape' , 131 131 label='Auto segment', 132 command=self.auto Segment)132 command=self.auto_segment) 133 133 self.menuBar.addmenuitem('File', 'command', 134 134 'modify the alpha boundary by applying filters', 135 135 label='filter alpha boundary', 136 command=self.auto SegmentFilter)136 command=self.auto_segmentFilter) 137 137 self.menuBar.addmenuitem('File', 'command', 'Normalise mesh', 138 138 label='Normalise mesh', command=self.normaliseMesh) … … 206 206 ('default', self.windowDefault, 'set default value for selected mode'), 207 207 ('joinVer', self.joinVerticesButton, 'add Segments to connect all vertices'), 208 # ('autoSegHull', self.auto SegmentHullButton, 'add Segments to form alpha shape, using Hull'),209 # ('autoSeg', self.auto SegmentButton, 'add Segments to form alpha shape'),210 ('autoSegGiveAlpha', self.auto SegmentGiveAlphaButton, 'add Segments to form alpha shape, specify alpha'),208 # ('autoSegHull', self.auto_segmentHullButton, 'add Segments to form alpha shape, using Hull'), 209 # ('autoSeg', self.auto_segmentButton, 'add Segments to form alpha shape'), 210 ('autoSegGiveAlpha', self.auto_segmentGiveAlphaButton, 'add Segments to form alpha shape, specify alpha'), 211 211 ('meshGen', self.windowMeshGen, 'Generate Mesh')]: 212 212 ToolBarButton(self, self.toolbar, key, '%s.gif' % key, … … 669 669 self.UserMeshChanged) 670 670 671 def auto SegmentButton (self, parent):672 self.auto Segment()673 674 675 def auto SegmentGiveAlphaButton (self, parent):676 dialog = AutoSegmentDialog(self.canvas, self.meshLastAlpha)671 def auto_segmentButton (self, parent): 672 self.auto_segment() 673 674 675 def auto_segmentGiveAlphaButton (self, parent): 676 dialog = auto_segmentDialog(self.canvas, self.meshLastAlpha) 677 677 if dialog.use_optimum.get() == SET_ALPHA: 678 678 if dialog.alphaValueOk: 679 self.auto Segment(alpha = dialog.alpha,679 self.auto_segment(alpha = dialog.alpha, 680 680 raw_boundary=dialog.raw_boundary.get(), 681 681 remove_holes=dialog.remove_holes.get(), … … 686 686 'Bad alpha value.') 687 687 else: 688 self.auto Segment(raw_boundary=dialog.raw_boundary.get(),688 self.auto_segment(raw_boundary=dialog.raw_boundary.get(), 689 689 remove_holes=dialog.remove_holes.get(), 690 690 smooth_indents=dialog.smooth_indents.get(), … … 692 692 693 693 694 def auto Segment (self, alpha = None,694 def auto_segment (self, alpha = None, 695 695 raw_boundary=True, 696 696 remove_holes=False, … … 704 704 try: 705 705 newsegs, ObjectsToVisuallyDelete, self.meshLastAlpha = \ 706 self.mesh.auto Segment(alpha=alpha,706 self.mesh.auto_segment(alpha=alpha, 707 707 remove_holes=remove_holes, 708 708 smooth_indents=smooth_indents, … … 710 710 except AlphaError: 711 711 showerror('pMesh', 712 'Unable to auto segment.')712 'Unable to auto_segment.') 713 713 else: 714 714 … … 726 726 else: 727 727 showerror('pMesh', 728 'Three or more vetices are needed to be able to auto segment.')729 730 731 def auto SegmentFilter (self):732 dialog = AutoSegmentFilterDialog(self.canvas)728 'Three or more vetices are needed to be able to auto_segment.') 729 730 731 def auto_segmentFilter (self): 732 dialog = auto_segmentFilterDialog(self.canvas) 733 733 newsegs, ObjectsToVisuallyDelete, self.meshLastAlpha = \ 734 self.mesh.auto SegmentFilter(raw_boundary=dialog.raw_boundary.get(),734 self.mesh.auto_segmentFilter(raw_boundary=dialog.raw_boundary.get(), 735 735 remove_holes=dialog.remove_holes.get(), 736 736 smooth_indents=dialog.smooth_indents.get(), … … 1499 1499 1500 1500 1501 class AutoSegmentDialog(Dialog):1501 class auto_segmentDialog(Dialog): 1502 1502 """ 1503 1503 Dialog box for adding segments … … 1584 1584 1585 1585 1586 class AutoSegmentFilterDialog(Dialog):1586 class auto_segmentFilterDialog(Dialog): 1587 1587 """ 1588 1588 Dialog box for adding segments -
inundation/pmesh/mesh.py
r3435 r3437 1504 1504 self.regions.append(Object) 1505 1505 1506 def Testauto Segment(self):1506 def Testauto_segment(self): 1507 1507 newsegs = [] 1508 1508 s1 = Segment(self.userVertices[0], … … 1528 1528 fd.close() 1529 1529 1530 def auto SegmentHull(self):1530 def auto_segmentHull(self): 1531 1531 """ 1532 1532 initially work by running an executable … … 1575 1575 self.userSegments.extend(newsegs) 1576 1576 return newsegs 1577 def auto SegmentFilter(self,raw_boundary=True,1577 def auto_segmentFilter(self,raw_boundary=True, 1578 1578 remove_holes=False, 1579 1579 smooth_indents=False, … … 1591 1591 1592 1592 1593 def auto Segment(self, alpha = None,1593 def auto_segment(self, alpha = None, 1594 1594 raw_boundary=True, 1595 1595 remove_holes=False, -
inundation/pmesh/test_mesh.py
r3351 r3437 317 317 'Segment should not be new. ') 318 318 319 def testauto Segment(self):319 def testauto_segment(self): 320 320 p0 = Vertex (0.0, 0.0) 321 321 p1 = Vertex (0.0, 4.0) … … 326 326 327 327 m = Mesh(userVertices=[p0, p1, p2, p3], userSegments=[s1] ) 328 m.auto Segment()328 m.auto_segment() 329 329 330 330 #print 'Len', len(m.userSegments) … … 332 332 'userSegments is wrong!') 333 333 334 m.auto Segment()334 m.auto_segment() 335 335 self.failUnless(len(m.getUserSegments()) == 4 , 336 336 'userSegments is wrong!') 337 337 338 def testauto SegmentII(self):338 def testauto_segmentII(self): 339 339 p1 = Vertex (3.0, 4.0) 340 340 p2 = Vertex (3.0,2.0) … … 351 351 userSegments=[s1, s2]) 352 352 353 m.auto Segment()353 m.auto_segment() 354 354 355 355 s3 = m.representedAlphaUserSegment(p3,p0) … … 362 362 'userSegments is wrong!') 363 363 364 # remove a segment, add a point, auto segment364 # remove a segment, add a point, auto_segment 365 365 m.alphaUserSegments.remove(s3) 366 366 p6 = Vertex (1.0, 2.0) 367 367 m.userVertices.append(p6) 368 368 369 m.auto Segment()369 m.auto_segment() 370 370 371 371 s1_now = m.representedUserSegment(p3,p2) -
inundation/pmesh/timing.py
r349 r3437 39 39 times.append(("user_outline_created",time.time() - tinitial )) 40 40 #------------------------------------------ 41 #mesh.auto Segment()42 #times.append(("mesh_auto segmented",time.time() - tinitial ))41 #mesh.auto_segment() 42 #times.append(("mesh_auto_segmented",time.time() - tinitial )) 43 43 #------------------------------------------ 44 44 mesh.generateMesh(mode = "Q",maxArea = 1)
Note: See TracChangeset
for help on using the changeset viewer.