Changeset 0e11ec7 in sasview for src/sas/sasgui/perspectives/file_converter/converter_panel.py

Timestamp:

Aug 9, 2016 7:23:01 AM (8 years ago)

Author:

lewis

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:

94667e27

Parents:

dc8a553

Message:

Show correct filetypes when chosing output file

File:

• src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) (3 diffs)

src/sas/sasgui/perspectives/file_converter/converter_panel.py

@@ -10 +10 @@
 from sas.sasgui.guiframe.panel_base import PanelBase
 from sas.sasgui.perspectives.calculator import calculator_widgets as widget
-from sas.sasgui.perspectives.file_converter.converter_widgets import VectorInput
+from sas.sasgui.perspectives.file_converter.converter_widgets import FileInput
 from sas.sasgui.perspectives.file_converter.meta_panels import MetadataWindow
 from sas.sasgui.perspectives.file_converter.meta_panels import DetectorPanel
@@ -486 +486 @@
             self.on_collapsible_pane(None)
             self.metadata_section.Disable()
+            self.output.SetWildcard("Red2D (*.dat)|*.dat")
         else:
             self.q_input.Enable()
             self.radiation_input.Enable()
             self.metadata_section.Enable()
+            self.output.SetWildcard("CanSAS 1D (*.xml)|*.xml")
 
     def radiationtype_changed(self, event):
@@ -575 +577 @@
         input_grid.Add(output_label, (y,0), (1,1), wx.ALIGN_CENTER_VERTICAL, 5)
 
-        self.output = wx.FilePickerCtrl(self, -1,
-            size=(_STATICBOX_WIDTH-80, -1),
-            message="Chose where to save the output file.",
-            style=wx.FLP_SAVE | wx.FLP_OVERWRITE_PROMPT | wx.FLP_USE_TEXTCTRL,
-            wildcard="CanSAS 1D (*.xml)|*.xml|Red2D (*.dat)|*.dat")
-        input_grid.Add(self.output, (y,1), (1,1), wx.ALL, 5)
+        self.output = FileInput(self,
+            wildcard="CanSAS 1D (*.xml)|*.xml")
+        input_grid.Add(self.output.GetCtrl(), (y,1), (1,1), wx.EXPAND | wx.ALL, 5)
         y += 1