/[escript]/trunk/pycad/py_src/primitives.py

Diff of /trunk/pycad/py_src/primitives.py

Parent Directory | Revision Log | View Patch Patch

-revision 918 by gross,
Tue Jan  2 02:46:53 2007 UTC
+revision 919 by gross,
Wed Jan  3 22:54:50 2007 UTC
 Line 353 
 class Curve(Primitive1D):
            if len(primitive) == len(self):
               cp0=self.getControlPoints()
               cp1=primitive.getControlPoints()
+              match=True
               for i in range(len(cp0)):
                  if not cp0[i].isColocated(cp1[i]):
-                    return False
+                    match=False
+                    break
+              if not match:
+                 for i in range(len(cp0)):
+                    if not cp0[i].isColocated(cp1[len(cp0)-1-i]):
+                       return False
               return True
            else:
               return False
-Line 498 
 class Arc(Primitive1D):
+Line 504 
 class Arc(Primitive1D):
         returns True curves are on the same position
         """
         if isinstance(primitive,Arc):
-             if not self.getCenterPoint().isColocated(primitive.getCenterPoint()): return False
+             return (self.getCenterPoint().isColocated(primitive.getCenterPoint())) and ( \
-             if not self.getEndPoint().isColocated(primitive.getEndPoint()): return False
+                    (self.getEndPoint().isColocated(primitive.getEndPoint()) and self.getStartPoint().isColocated(primitive.getStartPoint()) ) \
-             if not self.getStartPoint().isColocated(primitive.getStartPoint()): return False
+                 or (self.getEndPoint().isColocated(primitive.getStartPoint()) and self.getStartPoint().isColocated(primitive.getEndPoint()) ) )
-             return True
         else:
            return False
- #=================================================================================================================================
+ class Primitive2D(Primitive):
- class CurveLoop(Primitive):
+       """
+       general two-dimensional primitive
+       """
+       def __init__(self,*args):
+           """
+           create a two-dimensional primitive
+           """
+           super(Primitive2D, self).__init__()
+ class CurveLoop(Primitive2D):
      """
      An oriented loop of curves.
-Line 520 
 class CurveLoop(Primitive):
+Line 533 
 class CurveLoop(Primitive):
         self.__curves=[]
         self.addCurve(*curves)
      def addCurve(self,*curves):
+        """
+        adds curves to the curves defining the object
+        """
         for i in range(len(curves)):
-            if not curves[i].isCurve():
+            if not isinstance(curves[i],Primitive1D):
-               raise TypeError("%s-th argument is not a Curve object."%i)
+               raise TypeError("%s-th argument is not a Primitive1D object."%i)
         self.__curves+=curves
-     def isCurveLoop(self):
-         return True
      def getCurves(self):
+        """
+        returns the curves defining the CurveLoop
+        """
         return self.__curves
-     def __add__(self,other):
-        return CurveLoop(*tuple([c+other for c in self.getCurves()[::-1]]))
      def __len__(self):
+        """
+        return the number of curves in the CurveLoop
+        """
         return len(self.__curves)
      def getPrimitives(self):
-           out=set([self])
+        """
-           for i in self.getCurves(): out|=i.getPrimitives()
+        returns primitives used to construct the CurveLoop
-           return out
+        """
-     def getConstructionPoints(self):
+        out=set()
-           out=set()
+        for c in self.getCurves(): out|=set(c.getPrimitives())
-           for i in self.getCurves(): out|=i.getConstructionPoints()
+        out.add(self)
-           return out
+        return list(out)
+     def copy(self):
+        """
+        returns a deep copy
+        """
+        new_c=[]
+        for c in self.getCurves(): new_c.append(c.copy())
+        return CurveLoop(*tuple(new_c))
+     def apply(self,transformation):
+         """
+         applies transformation
+         """
+         new_c=[]
+         for c in self.getCurves(): new_c.append(c.apply(transformation))
+         return CurveLoop(*tuple(new_c))
+     def isColocated(self,primitive):
+        """
+        returns True if each curve is collocted with a curve in primitive
+        """
+        if isinstance(primitive,CurveLoop):
+           if len(primitive) == len(self):
+              cp0=self.getCurves()
+              cp1=primitive.getCurves()
+              for c0 in cp0:
+                  collocated = False
+                  for c1 in cp1: collocated = collocated or c0.isColocated(c1)
+                  if not collocated: return False
+              return True
+           else:
+              return False
+        else:
+           return False
      def getGmshCommand(self):
          out=""
          for i in self.getCurves():
-Line 550 
 class CurveLoop(Primitive):
+Line 605 
 class CurveLoop(Primitive):
                  out="%s"%i.getID()
          return "Line Loop(%s) = {%s};"%(self.getID(),out)
+ #=================================================================================================================================
  class Surface(Primitive):
      """
      a surface

 Legend:



Removed from v.918
 


changed lines


 
Added in v.919
 Legend:



Removed from v.918
 


changed lines


 
Added in v.919
-Removed from v.918
+Added in v.919

	ViewVC Help
Powered by ViewVC 1.1.26