Changeset 4ed199e in sasview for src/sas/sasgui
- Timestamp:
- Oct 8, 2016 3:29:53 PM (8 years ago)
- 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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 1404cce
- Parents:
- 47f2b5d (diff), b4818d9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - git-author:
- wpotrzebowski <Wojciech.Potrzebowski@…> (10/08/16 15:22:49)
- git-committer:
- wpotrzebowski <Wojciech.Potrzebowski@…> (10/08/16 15:29:53)
- Location:
- src/sas/sasgui
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/guiframe/gui_manager.py
r95eef00 ra4c2445 677 677 update edit menu if available 678 678 """ 679 if event !=None:679 if event is not None: 680 680 self.panel_on_focus = event.panel 681 681 if self.panel_on_focus is not None: 682 #Disable save application if the current panel is in batch mode 683 flag = self.panel_on_focus.get_save_flag() 684 if self._save_appl_menu != None: 685 self._save_appl_menu.Enable(flag) 686 687 if self.panel_on_focus not in self.plot_panels.values(): 688 for ID in self.panels.keys(): 689 if self.panel_on_focus != self.panels[ID]: 690 self.panels[ID].on_kill_focus(None) 691 692 if self._data_panel is not None and \ 693 self.panel_on_focus is not None: 694 self.set_panel_on_focus_helper() 695 #update toolbar 696 self._update_toolbar_helper() 697 #update edit menu 698 self.enable_edit_menu() 682 # Disable save application if the current panel is in batch mode 683 try: 684 flag = self.panel_on_focus.get_save_flag() 685 if self._save_appl_menu != None: 686 self._save_appl_menu.Enable(flag) 687 688 if self.panel_on_focus not in self.plot_panels.values(): 689 for ID in self.panels.keys(): 690 if self.panel_on_focus != self.panels[ID]: 691 self.panels[ID].on_kill_focus(None) 692 693 if self._data_panel is not None and \ 694 self.panel_on_focus is not None: 695 self.set_panel_on_focus_helper() 696 #update toolbar 697 self._update_toolbar_helper() 698 #update edit menu 699 self.enable_edit_menu() 700 except wx._core.PyDeadObjectError: 701 pass 699 702 700 703 def disable_app_menu(self, p_panel=None): … … 1904 1907 def _on_open_state_project(self, event): 1905 1908 """ 1909 Load in a .svs project file after removing all data from SasView 1906 1910 """ 1907 1911 path = None 1908 1912 if self._default_save_location == None: 1909 1913 self._default_save_location = os.getcwd() 1910 msg = "This operation will set SasView to its freshly opened state " 1911 msg += "before loading the project. Do you wish to continue?" 1914 msg = "This operation will set remove all data, plots and analyses from" 1915 msg += " SasView before loading the project. Do you wish to continue?" 1916 self._data_panel.selection_cbox.SetValue('Select all Data') 1917 self._data_panel._on_selection_type(None) 1918 for _, theory_dict in self._data_panel.list_cb_theory.iteritems(): 1919 for key, value in theory_dict.iteritems(): 1920 item, _, _ = value 1921 item.Check(True) 1912 1922 if not self._data_panel.on_remove(None, msg): 1913 1923 wx.PostEvent(self, StatusEvent(status="Loading Project file...")) … … 1934 1944 self._data_panel.set_panel_on_focus() 1935 1945 # Remove all loaded data 1936 self._data_panel.selection_cbox.SetValue('Select all Data')1937 self._data_panel._on_selection_type(None)1938 1946 for plugin in self.plugins: 1939 1947 plugin.clear_panel() -
src/sas/sasgui/perspectives/calculator/calculator.py
rd85c194 ra0c1e1d 80 80 ("Kiessig Thickness Calculator", 81 81 kiessig_help, self.on_calculate_kiessig), 82 (" SASResolution Estimator",82 ("Q Resolution Estimator", 83 83 resolution_help, self.on_calculate_resoltuion), 84 84 ("Generic Scattering Calculator", -
src/sas/sasgui/perspectives/calculator/pyconsole.py
rf1cbae7 r0912b405 231 231 if result.path: 232 232 self.bufferCreate(result.path) 233 234 # See if there is a corresponding C file 235 if result.path != None: 236 c_filename = os.path.splitext(result.path)[0] + ".c" 237 if os.path.isfile(c_filename): 238 self.bufferCreate(c_filename) 239 233 240 cancel = False 234 241 return cancel -
src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py
rd0248bd ra0c1e1d 63 63 """ 64 64 ## Internal nickname for the window, used by the AUI manager 65 window_name = " SASResolution Estimator"65 window_name = "Q Resolution Estimator" 66 66 ## Name to appear on the window title bar 67 67 window_caption = "" … … 1329 1329 """ 1330 1330 def __init__(self, parent=None, manager=None, 1331 title=" SASResolution Estimator",1331 title="Q Resolution Estimator", 1332 1332 size=(PANEL_WIDTH * 2, PANEL_HEIGHT), *args, **kwds): 1333 1333 kwds['title'] = title -
src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst
rda456fb rd73998c 9 9 ----------- 10 10 11 This tool converts file formats with the Q data and intensity datain separate12 files, into a single CanSAS XML or NXcanSAS HDF5file.11 This tool converts file formats with the Q data and Intensity data stored in separate 12 files, into a single CanSAS (XML) or NXcanSAS (HDF5) file. 13 13 14 It can also convert 2D BSL files into NXcanSAS HDF5 files.14 It can also convert 2D BSL/OTOKO files into a NXcanSAS file. 15 15 16 Supported input file formats :16 Supported input file formats (examples may be found in the /test/convertible_files folder): 17 17 18 * Single column ASCII data, with lines that end with a digit (no delimiter),19 comma or semi-colon.20 * ` One-Dimensional OTOKO formatted18 * Single-column ASCII data, with lines that end without any delimiter, 19 or with a comma or semi-colon delimiter 20 * `1D BSL/OTOKO format 21 21 <http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/ 22 SAXS-Software/CCP13/ XOTOKO.html>`_ data.23 * ` Two-Dimensional BSL formatted22 SAXS-Software/CCP13/BSL.html>`_ data 23 * `2D BSL/OTOKO format 24 24 <http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/ 25 SAXS-Software/CCP13/BSL.html>`_ data .25 SAXS-Software/CCP13/BSL.html>`_ data 26 26 27 Supported output file formats @27 Supported output file formats: 28 28 29 * `CanSAS XML<http://www.cansas.org/formats/canSAS1d/1.1/doc/>`_30 * `NXcanSAS HDF5<http://download.nexusformat.org/sphinx/classes/contributed_definitions/NXcanSAS.html>`_29 * `CanSAS <http://www.cansas.org/formats/canSAS1d/1.1/doc/>`_ 30 * `NXcanSAS <http://download.nexusformat.org/sphinx/classes/contributed_definitions/NXcanSAS.html>`_ 31 31 32 32 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ … … 35 35 -------------- 36 36 37 1) Select the files containing your Q- Axis and Intensity-Axis data38 2) Cho se whether the files are in ASCII, OTOKO or BSLformat39 3) Cho se where you would like to save the converted file37 1) Select the files containing your Q-axis and Intensity-axis data 38 2) Choose whether the files are in ASCII, 1D BSL/OTOKO or 2D BSL/OTOKO format 39 3) Choose where you would like to save the converted file 40 40 4) Optionally, input some metadata such as sample size, detector name, etc 41 5) Click *Convert* to save the converted file to disk41 5) Click *Convert* to save the converted file 42 42 43 43 Files With Multiple Frames 44 44 ^^^^^^^^^^^^^^^^^^^^^^^^^^ 45 45 46 If a BSL/OTOKO file with multiple frames is selected for the intensity-axis46 If a BSL/OTOKO file with multiple frames is selected for the Intensity-axis 47 47 file, a dialog will appear asking which frames you would like converted. You 48 48 may enter a start frame, end frame & increment, and all frames in that subset 49 will be converted. For example: entering 0, 50 and 10 for the first frame, last 50 frame, and increment respectively will convert frames 0, 10, 20, 30, 40 & 50. 49 will be converted. For example, entering 0, 50 and 10 will convert frames 0, 50 10, 20, 30, 40 & 50. 51 51 52 To convert a single frame, enter the same value for first frame & last frame, 52 53 and 1 as the increment. … … 54 55 CanSAS XML files can become quite large when exporting multiple frames to a 55 56 single file, so there is an option in the *Select Frame* dialog to output each 56 frame to it 's own file. The single file option will produce one file with57 multiple `<SASdata>` elements. The multiple file option will output a file for58 each frame; each file will have one `<SASdata>` element, and the frame number 59 willappended to the file name.57 frame to its own file. The single file option will produce one file with 58 multiple `<SASdata>` elements. The multiple file option will output a separate 59 file with one `<SASdata>` element for each frame. The frame number will also be 60 appended to the file name. 60 61 61 The multiple file option is not available when exporting to NXcanSAS. All 62 frames will be written to the same file, since the HDF5 format is designed for 63 handling large amounts of data. 62 The multiple file option is not available when exporting to NXcanSAS because 63 the HDF5 format is more efficient at handling large amounts of data. 64 65 66 .. note:: 67 This help document was last changed by Steve King, 08Oct2016 -
src/sas/sasgui/perspectives/fitting/basepage.py
r47f2b5d r4ed199e 514 514 def initialize_combox(self): 515 515 """ 516 put default value in the combobox 517 """ 518 ## fill combox box 519 if self.model_list_box is None: 520 return 521 if len(self.model_list_box) > 0: 516 put default value in the combo box 517 """ 518 if self.model_list_box is not None and len(self.model_list_box) > 0: 522 519 self._populate_box(self.structurebox, 523 520 self.model_list_box["Structure Factors"]) … … 528 525 self.structurebox.Disable() 529 526 self.text2.Disable() 530 531 if self.model.__class__ in self.model_list_box["P(Q)*S(Q)"]:532 self.structurebox.Show()533 self.text2.Show()534 self.structurebox.Enable()535 self.text2.Enable()536 527 537 528 def set_dispers_sizer(self): … … 1962 1953 form_factor = self.formfactorbox.GetClientData(f_id) 1963 1954 1964 if not form_factor in self.model_list_box["multiplication"]:1955 if form_factor is None or not form_factor.is_form_factor: 1965 1956 self.structurebox.Hide() 1966 1957 self.text2.Hide() -
src/sas/sasgui/perspectives/fitting/fitpage.py
r4c3be25 rb4818d9 364 364 self.Bind(wx.EVT_RADIOBUTTON, self.onSlitSmear, 365 365 id=self.slit_smearer.GetId()) 366 self. disable_smearer.SetValue(True)366 self.enable_smearer.SetValue(True) 367 367 368 368 sizer_smearer.Add(self.disable_smearer, 0, wx.LEFT, 10)
Note: See TracChangeset
for help on using the changeset viewer.