Changeset 3c75696 in sasview for sansrealspace/src/realspace/VolumeCanvas.py

Timestamp:

Oct 18, 2007 1:36:17 PM (17 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

8c050c1

Parents:

f98961f

Message:

• Added method to add an object to the canvas instead of using the canvas object as a factory.
• Completed unit tests and added stimuli to automated testing class.

File:

• sansrealspace/src/realspace/VolumeCanvas.py (modified) (1 diff)

sansrealspace/src/realspace/VolumeCanvas.py

@@ -214 +214 @@
         self.hasPr = False        
         
+    def addObject(self, shapeDesc, id = None):
+        """
+            Adds a real-space object to the canvas.
+        
+            @param shapeDesc: object to add to the canvas [ShapeDescriptor]
+            @param id: string handle for the object [string] [optional]
+            @return: string handle for the object
+        """
+        # If the handle is not provided, create one
+        if id == None:
+            id = shapeDesc.params["type"]+str(self.shapecount)
+         
+        # Self the order number
+        shapeDesc.params['order'] = self.shapecount
+        # Store the shape in a dictionary entry associated
+        # with the handle
+        self.shapes[id] = shapeDesc
+        self.shapecount += 1
+
+        #model changed, need to recalculate P(r)
+        self.hasPr = False
+
+        return id
+            
+    
     def add(self, shape, id = None):
         """
+            The intend of this method is to eventually be able to use it
+            as a factory for the canvas and unify the simulation with the
+            analytical solutions. For instance, if one adds a cylinder and
+            it is the only shape on the canvas, the analytical solution
+            could be called. If multiple shapes are involved, then 
+            simulation has to be performed.
+        
             @param shape: name of the object to add to the canvas [string]
             @param id: string handle for the object [string] [optional]