Changeset 693ab78 in sasview for sansview


Ignore:
Timestamp:
Oct 20, 2008 10:37:51 AM (16 years ago)
Author:
Gervaise Alina <gervyh@…>
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:
48c7477
Parents:
24120ab
Message:

fix add error

Location:
sansview/perspectives/fitting
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sansview/perspectives/fitting/fitpage1D.py

    r9d31a8b r693ab78  
    183183            @return residuals 
    184184        """ 
     185        print self.data.x 
     186        print self.data.y 
     187        print self.data.dy 
     188         
    185189        flag=self.checkFitRange() 
    186190        if flag== True: 
  • sansview/perspectives/fitting/fitpanel.py

    r9d31a8b r693ab78  
    7878            name = 'Fit' 
    7979        if self.fit_page_name != name: 
    80             if data.__class__.__name__=='MetaData2D': 
     80            if data.__class__.__name__=='Data2D': 
    8181                 from fitpage2D import FitPage2D 
    8282                 panel = FitPage2D(self.nb,data, -1) 
  • sansview/perspectives/fitting/fitting.py

    r4274c0e r693ab78  
    55from copy import deepcopy  
    66from danse.common.plottools.plottables import Data1D, Theory1D, Data2D 
    7  
    8 from sans.guiframe.data_loader import MetaData1D, MetaTheory1D, MetaData2D 
    97from danse.common.plottools.PlotPanel import PlotPanel 
    108from sans.guicomm.events import NewPlotEvent, StatusEvent   
     
    8583        self.graph=graph 
    8684        for item in graph.plottables: 
    87             if item.__class__.__name__ is "MetaData2D": 
     85            if item.__class__.__name__ is "Data2D": 
    8886                return [["Fit Data2D", "Dialog with fitting parameters ", self._onSelect]]  
    8987            else: 
    90                 if item.name==graph.selected_plottable and (item.__class__.__name__ is  "MetaData1D"or \ 
    91                                         item.__class__.__name__ is  "Data1D" ): 
     88                if item.name==graph.selected_plottable and\ 
     89                 item.__class__.__name__ is  "Data1D": 
    9290                    return [["Fit Data1D", "Dialog with fitting parameters ", self._onSelect]]  
    9391        return []    
     
    145143        self.panel = event.GetEventObject() 
    146144        for item in self.panel.graph.plottables: 
    147             if item.name == self.panel.graph.selected_plottable or item.__class__.__name__ is "MetaData2D": 
     145            if item.name == self.panel.graph.selected_plottable or\ 
     146                 item.__class__.__name__ is "Data2D": 
    148147                #find a name for the page created for notebook 
    149148                try: 
     
    474473                    break  
    475474             
    476             if data!=None and data.__class__.__name__ != 'MetaData2D': 
     475            if data!=None and data.__class__.__name__ != 'Data2D': 
    477476                theory = Theory1D(x=[], y=[]) 
    478477                theory.name = "Model" 
Note: See TracChangeset for help on using the changeset viewer.