Changeset 5188

Timestamp:

Apr 2, 2008, 11:35:48 AM (16 years ago)

Author:

duncan

Message:

abstracting colour information

Location:

anuga_core/source/anuga/pmesh

Files:

• graphical_mesh_generator.py (modified) (3 diffs)
• mesh.py (modified) (4 diffs)

anuga_core/source/anuga/pmesh/graphical_mesh_generator.py

@@ -5 +5 @@
 from   tkSimpleDialog import Dialog
 import mesh
+from mesh import SEG_COLOUR
 from Tkinter import  FALSE,TRUE, Frame,X, LEFT,YES,BOTH,ALL,Widget,CURRENT, \
      Label,W, Entry, E, StringVar, END, Checkbutton, Radiobutton, IntVar, \
@@ -20 +21 @@
 VERT_SELECT_ADDING_SEG_COLOR = 'orange'
 SELECT_COLOR = 'red'
-SEG_COLOUR = 'blue'
 TRIANGLE_COLOUR = 'green'
 APPLICATION_NAME = 'Pmesh'
@@ -229 +229 @@
 
     def clearSelection(self,parent):
+    #FIXME looks like self.clearSelections - change name (Peter)
         """
         """

anuga_core/source/anuga/pmesh/mesh.py

@@ -54 +54 @@
 # FIXME: maybe make this a switch that the user can change? - DSG
 initialconversions = ['', 'exterior', '']
+SEG_COLOUR = 'blue'
 
 
@@ -157 +158 @@
         #                   y+ 2*cornerOffset,
         #                        text=tags)
+        
+        # This gives points info.  It is a mess though, since numbers are
+        # not deleted when zaooming in.
+        #canvas.create_text(x+ 2*cornerOffset,
+        #                   y+ 2*cornerOffset,
+        #                        text=str(x)+','+str(y))
         
         return canvas.create_rectangle(x-cornerOffset,
@@ -309 +316 @@
             
         
-    def draw(self, canvas, tags,scale=1, xoffset=0, yoffset=0,colour='blue'):
+    def draw(self, canvas, tags,scale=1, xoffset=0,
+             yoffset=0, colour=SEG_COLOUR):
         x=[]
         y=[]
@@ -1537 +1545 @@
         """
         Precon: There must be 3 or more vertices in the userVertices structure
+        
+        This returns alpha_segs_no_user_segs, segs2delete, optimum_alpha
         """
         self._createBoundary(alpha=alpha)