Changeset 3ea9371 in sasview

Timestamp:

Jul 20, 2016 11:00:17 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:

072b52c

Parents:

55775e8

Message:

Set sample ID to SASentry.Title to agree with Mantid output

Files:

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

Vagrantfile

@@ -2 +2 @@
 # vi: set ft=ruby :
 
-# This allows you to build sasview using vagrant 
+# This allows you to build sasview using vagrant
 # for the moment you can build Ubuntu on any platform supported by vagrant
 # (Linux, Mac, Windows)
-# You will need VirtualBox as well. 
+# You will need VirtualBox as well.
 # Download pages:
 # http://www.vagrantup.com/downloads
@@ -21 +21 @@
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "ubuntu1404"
-  config.vm.box_url = "https://github.com/hnakamur/packer-templates/releases/download/v1.0.2/ubuntu-14-04-x64-virtualbox.box"
+  config.vm.box = "ubuntu/trusty64"
   #config.vm.box = "fedora19"
   #config.vm.box_url = "https://dl.dropboxusercontent.com/u/86066173/fedora-19.box"
   #config.vm.box = "fedora20"
   #config.vm.box_url = "https://dl.dropboxusercontent.com/u/15733306/vagrant/fedora-20-netinst-2014_01_05-minimal-puppet-guestadditions.box"
+
+  config.ssh.password = "vagrant"
 
   # Provider-specific configuration so you can fine-tune various
@@ -39 +40 @@
      vb.memory = "1024"
      vb.cpus = "1"
+     vb.gui = true
   end
   #

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

@@ -106 +106 @@
             return
 
+        self.metadata['sample'].ID = self.metadata['title']
+
         try:
             if self.data_type == 'ascii':