Changeset 3492

Timestamp:

Aug 15, 2006, 4:20:46 PM (18 years ago)

Author:

duncan

Message:

Cleaning things up

Location:

inundation/pmesh

Files:

• AppShell.py (modified) (1 diff)
• README (modified) (2 diffs)
• graphical_mesh_generator.py (modified) (1 diff)
• hull.exe (deleted)
• mesh.py (modified) (1 diff)

inundation/pmesh/AppShell.py

@@ -7 +7 @@
 created by Doug Hellmann (doughellmann@mindspring.com).
 
+Pmw copyright
+
+Copyright 1997-1999 Telstra Corporation Limited,
+Australia Copyright 2000-2002 Really Good Software Pty Ltd, Australia
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 """
+
 
 from Tkinter import *

inundation/pmesh/README

@@ -1 +1 @@
 SYSTEM REQUIREMENTS
+ Pmesh requires many bits adn peices from the rest of the ANUGA code.
  
-Python, with Pmw must be installed to use pmesh.  Read the
-starting.html file that comes with pmw with regrads to how it is
-installed.(quick install advice: install pmw in the
-python2.2/site-packages dir) (Python and pmw are in the downloads
-directory)
+ It's system requirements are the same as ANUGA
 
-The inundation directory utilities is also needed to run pmesh. 
+INSTALLATION COMMANDS
+To compile, do 
+        scones
 
-INSTALLATION COMMANDS, FOR LINUX
-
-This is necessary to complite triangle for using pmesh graphically and
-the pmesh.mesh script.
-        
-To build triangle, as root;
-        python setup.py install
-        
-To build the python package, as a user;
-        python setup.py install --prefix=~
-        
-        This will create a python directory, off the users home directory.
-        Add the path of this directory into your .bashrc 
-        for example;    
-        export PYTHONPATH=$HOME/lib/python2.2/site-packages:"${PYTHONPATH}"
-        another example;
-        export PYTHONPATH=$HOME/lib64/python2.3/site-packages:"${PYTHONPATH}"
-
-INSTALLATION COMMANDS, FOR WINDOWS
-To compile using Microsoft Visual c++,
-        python setup.py install
-
-To compile using mingw,
-        python setup.py build -cmingw32
-        python setup.py install
-
-        Note for this to work mingw has to be installed.  Plus move
-        the file libpython23.a into the python\libs directory.  If
-        'install' does not work move the triang.pyd file manually.
                 
 GENERAL RUNNING 
-To run all tests Harnesses;
-        python TestRunner.py
+To run all the unit tests;
+        python test_all.py
         
 To run pmesh;
-        python pmesh.py
+        python graphical_mesh_generator.py 
         
 INSTRUCTIONS FOR USING PMESH
@@ -62 +32 @@
 
 CREATING A PMESH EXECUTABLE 
+Note, this has not been tried for about 2 years.
 
 There is a package called py2exe which can take a Python script and

inundation/pmesh/graphical_mesh_generator.py

@@ -206 +206 @@
                 ('default', self.windowDefault, 'set default value for selected mode'),
                 ('joinVer', self.joinVerticesButton, 'add Segments to connect all vertices'),      
-             #   ('autoSegHull', self.auto_segmentHullButton, 'add Segments to form alpha shape, using Hull'),  
              #   ('autoSeg', self.auto_segmentButton, 'add Segments to form alpha shape'), 
                 ('autoSegGiveAlpha', self.auto_segmentGiveAlphaButton, 'add Segments to form alpha shape, specify alpha'),

inundation/pmesh/mesh.py

@@ -1528 +1528 @@
         fd.close()
 
-    def auto_segmentHull(self):
-        """
-        initially work by running an executable
-        Later compile the c code with a python wrapper.
-
-        Precon: There must be 3 or more vertices in the userVertices structure
-        """
-        newsegs = []
-        inputfile = 'hull_in.txt'
-        outputfile = inputfile + '-alf'
-        #write vertices to file
-        fd = open(inputfile,'w')
-        for v in self.userVertices:
-            fd.write(str(v.x))
-            fd.write(' ')
-            fd.write(str(v.y))
-            fd.write('\n')
-        fd.close()
-        
-        #run hull executable
-        #warning need to compile hull for the current operating system
-        command = 'hull.exe -A -i ' + inputfile
-        os.system(command)
-        
-        #read results into this object
-        fd = open(outputfile)
-        lines = fd.readlines()
-        fd.close()
-        #print "(*(*(*("
-        #print lines
-        #print "(*(*(*("
-        lines.pop(0) #remove the first (title) line
-        for line in lines:
-            vertindexs = line.split()
-            #print 'int(vertindexs[0])', int(vertindexs[0])
-            #print 'int(vertindexs[1])', int(vertindexs[1])
-            #print 'self.userVertices[int(vertindexs[0])]' ,self.userVertices[int(vertindexs[0])]
-            #print 'self.userVertices[int(vertindexs[1])]' ,self.userVertices[int(vertindexs[1])]
-            v1 = self.userVertices[int(vertindexs[0])]
-            v2 = self.userVertices[int(vertindexs[1])]
-            
-            if self.isUserSegmentNew(v1,v2):
-                newseg = Segment(v1, v2)
-                newsegs.append(newseg)
-            #DSG!!!
-        self.userSegments.extend(newsegs)
-        return newsegs
     def auto_segmentFilter(self,raw_boundary=True,
                     remove_holes=False,