Start working on configuration dialog.

This commit is contained in:
salman 2010-06-11 07:46:44 +00:00
parent fb8523d8bf
commit 9a01530097
3 changed files with 251 additions and 132 deletions

View File

@ -1,6 +1,6 @@
# Form implementation generated from reading ui file 'MuSRFit.ui' # Form implementation generated from reading ui file 'MuSRFit.ui'
# #
# Created: Tue Jun 8 13:53:29 2010 # Created: Fri Jun 11 09:45:46 2010
# by: The PerlQt User Interface Compiler (puic) # by: The PerlQt User Interface Compiler (puic)
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -10,7 +10,7 @@ use strict;
use utf8; use utf8;
package MuSRFitformR; package MuSRFitform;
use Qt; use Qt;
use Qt::isa qw(Qt::MainWindow); use Qt::isa qw(Qt::MainWindow);
use Qt::slots use Qt::slots
@ -43,7 +43,8 @@ use Qt::slots
RunSelectionToggle => [], RunSelectionToggle => [],
fileBrowse => [], fileBrowse => [],
AppendToFunctions => [], AppendToFunctions => [],
InitializeFunctions => []; InitializeFunctions => [],
optionCustromize => [];
use Qt::attributes qw( use Qt::attributes qw(
musrfit_tabs musrfit_tabs
RUNSPage RUNSPage
@ -240,6 +241,7 @@ use Qt::attributes qw(
T0 T0
optionsFourier optionsFourier
optionsT0 optionsT0
optionsCustomise
); );
@ -247,27 +249,32 @@ our $image0;
our $image0_data = pack 'C*', our $image0_data = pack 'C*',
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16,
0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c, 0x3b, 0x00, 0x00, 0x00, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c, 0x3b, 0x00, 0x00, 0x01,
0xd3, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xb5, 0x94, 0x51, 0x0e, 0x84, 0x11, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xa5, 0x54, 0xcb, 0x12, 0xc2,
0x20, 0x0c, 0x44, 0xa7, 0x86, 0x4b, 0xd9, 0xfb, 0x67, 0x3c, 0x16, 0xfe, 0x20, 0x0c, 0xdc, 0xe0, 0x63, 0xc6, 0xbb, 0x07, 0x3c, 0xfa, 0xff, 0x3f,
0x50, 0xb7, 0xa9, 0x55, 0x01, 0xdd, 0x97, 0x10, 0x49, 0x83, 0x43, 0x5b, 0xe6, 0x57, 0xb8, 0x1e, 0x5a, 0x68, 0x58, 0x42, 0x8b, 0x9a, 0x19, 0xa6,
0x06, 0x84, 0x24, 0x22, 0xab, 0x6a, 0xb5, 0xf9, 0x46, 0xca, 0x69, 0x41, 0x34, 0x24, 0x9b, 0xcd, 0x03, 0x0c, 0x81, 0xd0, 0xed, 0x2d, 0x32, 0x98,
0x07, 0x4b, 0x0c, 0xa8, 0x13, 0xcd, 0x36, 0xea, 0xa5, 0xf8, 0x9f, 0x05, 0x92, 0x4c, 0x1e, 0x1b, 0x81, 0xb2, 0x20, 0xdf, 0xee, 0x3c, 0x45, 0x2c,
0x00, 0x49, 0x81, 0x13, 0x52, 0xd5, 0x3a, 0xac, 0x8a, 0x96, 0xb1, 0x65, 0x01, 0x24, 0xf6, 0xba, 0xfb, 0x6a, 0x7f, 0x95, 0xa0, 0x09, 0xc0, 0xd3,
0x64, 0x02, 0x56, 0xfe, 0x46, 0x8a, 0xc5, 0x46, 0xb3, 0x3e, 0xb5, 0xc2, 0xed, 0x6f, 0x95, 0x31, 0x01, 0x2a, 0x90, 0xd0, 0x8a, 0xd2, 0x52, 0x55,
0x98, 0xed, 0xed, 0xa3, 0xf0, 0x5b, 0x16, 0x55, 0xad, 0xbe, 0xf4, 0xb8, 0xf3, 0x6f, 0x94, 0x92, 0x6a, 0x4d, 0x09, 0xc0, 0xe2, 0xb2, 0x13, 0x6d,
0xc0, 0x62, 0xa3, 0xe9, 0x2f, 0xbc, 0x11, 0x7d, 0x83, 0x64, 0x3e, 0xbe, 0x0b, 0x9a, 0xff, 0x84, 0xb1, 0x98, 0x47, 0x01, 0x70, 0x02, 0x70, 0x01,
0x62, 0x75, 0xd5, 0x3d, 0xd1, 0xdd, 0x63, 0x73, 0x45, 0xaf, 0x3b, 0x3e, 0x70, 0xde, 0xf1, 0xa9, 0xd2, 0x18, 0x09, 0x5b, 0x4d, 0xf5, 0xbd, 0xae,
0x3b, 0xbc, 0xb8, 0xe1, 0x94, 0x70, 0x76, 0x3b, 0x23, 0xdd, 0xc2, 0xde, 0x29, 0x49, 0xb6, 0x31, 0xfb, 0x7d, 0xb2, 0x86, 0xbe, 0x7d, 0x03, 0xb5,
0x39, 0x24, 0xc5, 0x8b, 0x67, 0x6d, 0x2a, 0x67, 0x89, 0x7b, 0x71, 0x7f, 0x44, 0x06, 0xf4, 0x93, 0x73, 0x18, 0x6e, 0x05, 0xad, 0xe0, 0x00, 0x1e,
0x4b, 0x25, 0xdc, 0xd8, 0x48, 0xf5, 0xa3, 0xb9, 0xe4, 0xf8, 0xc6, 0x51, 0x81, 0x4d, 0x57, 0x1b, 0x27, 0x77, 0x55, 0x14, 0x26, 0xbb, 0x93, 0xe1,
0xdd, 0x20, 0x09, 0x92, 0xc8, 0x62, 0x05, 0x68, 0x0f, 0x4f, 0x82, 0xc5, 0xd9, 0x8e, 0xea, 0xa5, 0x23, 0xd2, 0xa5, 0xe3, 0x67, 0x29, 0x62, 0x39,
0x55, 0xb5, 0x1e, 0x6b, 0x92, 0xfe, 0x5a, 0x25, 0x02, 0xc0, 0xcc, 0x3b, 0x73, 0x4d, 0x2b, 0xf0, 0x64, 0x03, 0xe9, 0x03, 0x47, 0xc1, 0xe2, 0x37,
0xd4, 0x0a, 0x13, 0xb9, 0x8a, 0x13, 0x3f, 0xaf, 0x17, 0xcb, 0x28, 0x66, 0x66, 0x7d, 0x33, 0xf8, 0x32, 0xd8, 0x72, 0x71, 0x46, 0x44, 0x4d, 0x37,
0x39, 0x83, 0x3f, 0xc4, 0xdb, 0x56, 0xbc, 0xe1, 0x7f, 0xaf, 0xdb, 0x97, 0xd1, 0x61, 0x43, 0xc0, 0xd7, 0xda, 0xb3, 0xd7, 0x1e, 0x78, 0x17, 0x25,
0x62, 0xde, 0xeb, 0x43, 0x8f, 0xd0, 0x08, 0x3b, 0xbf, 0x32, 0x98, 0xdf, 0x51, 0x0e, 0x8f, 0x47, 0x46, 0xc4, 0x32, 0x69, 0x79, 0x9b, 0x4c, 0x2e,
0x1b, 0xba, 0x5b, 0x87, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xe0, 0x15, 0xb4, 0x90, 0xd8, 0x05, 0x2e, 0x46, 0x96, 0xb7, 0x44, 0xf8,
0xae, 0x42, 0x60, 0x82; 0xea, 0x87, 0x46, 0x27, 0xa2, 0x03, 0xf6, 0x4d, 0xa4, 0x63, 0x54, 0x74,
0x56, 0x00, 0x04, 0xdc, 0x32, 0x59, 0x2e, 0x99, 0xf7, 0x69, 0xc5, 0x19,
0x95, 0xb5, 0x97, 0x51, 0xad, 0xc9, 0x94, 0xcf, 0x24, 0xf0, 0x20, 0xd0,
0xb1, 0xcf, 0x37, 0xa0, 0xff, 0xf8, 0x7c, 0x05, 0xfc, 0x01, 0x1a, 0xec,
0x94, 0x3b, 0x34, 0xe2, 0x89, 0xc2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82;
our $image1; our $image1;
our $image1_data = pack 'C*', our $image1_data = pack 'C*',
@ -1544,54 +1551,102 @@ our $image20_data = pack 'C*',
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16,
0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c, 0x3b, 0x00, 0x00, 0x01, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c, 0x3b, 0x00, 0x00, 0x01,
0x06, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xad, 0x54, 0xd1, 0x0e, 0x84, 0x09, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xa5, 0x54, 0x41, 0x0e, 0xc3,
0x20, 0x0c, 0xeb, 0x0c, 0x3f, 0x65, 0xff, 0x3f, 0xf5, 0xb3, 0x76, 0x0f, 0x20, 0x0c, 0xb3, 0xd1, 0xf6, 0x83, 0x1d, 0xd8, 0xff, 0x3f, 0xb7, 0x57,
0x32, 0x83, 0x13, 0x3c, 0x39, 0xaf, 0x09, 0x09, 0x59, 0xa0, 0xeb, 0xca, 0xcc, 0x3b, 0x8c, 0xd0, 0x34, 0xa4, 0x94, 0x6e, 0x91, 0x90, 0x20, 0xc4,
0x86, 0x49, 0x42, 0xc6, 0x4a, 0x7a, 0xec, 0x37, 0xc9, 0x2e, 0x07, 0x1e, 0x8e, 0x49, 0x00, 0x22, 0x31, 0xb9, 0x39, 0xb3, 0x80, 0x25, 0xab, 0xd2,
0x60, 0xc9, 0x01, 0x92, 0xb7, 0x89, 0x9e, 0xa2, 0xb4, 0x97, 0x0d, 0x30, 0x79, 0xd0, 0x25, 0x23, 0x00, 0xdc, 0x6c, 0x25, 0xec, 0xd4, 0x15, 0x01,
0x49, 0x40, 0x43, 0x4e, 0x12, 0xd3, 0xac, 0xa8, 0x8a, 0x43, 0x91, 0x63, 0x6f, 0x6c, 0xbe, 0x98, 0x9c, 0x0e, 0x92, 0x09, 0x63, 0x69, 0x28, 0x05,
0xe7, 0x88, 0xf2, 0x37, 0xc9, 0x22, 0x36, 0xab, 0xfa, 0x62, 0x45, 0xe0, 0x74, 0x27, 0x35, 0x9f, 0xbe, 0x4b, 0x1b, 0x31, 0x09, 0x87, 0xb9, 0x00,
0x57, 0x6f, 0x01, 0x80, 0xa4, 0x0f, 0x89, 0xdf, 0x90, 0x02, 0xc0, 0x42, 0xb9, 0x31, 0x58, 0xf3, 0x65, 0x7b, 0xd1, 0xb5, 0x5b, 0x97, 0x84, 0xcb,
0xf2, 0x54, 0x7a, 0x3e, 0x18, 0x31, 0x03, 0x1e, 0x57, 0x20, 0xc9, 0x96, 0x2b, 0xf1, 0x52, 0xd4, 0xc0, 0xf7, 0x09, 0xa6, 0xdb, 0xcd, 0x2f, 0xc2,
0x68, 0xb7, 0x37, 0xa5, 0x67, 0xb5, 0x40, 0x74, 0xc1, 0x43, 0xac, 0xa4, 0x19, 0xb3, 0xba, 0x2e, 0x5b, 0xe1, 0xa6, 0xec, 0xf7, 0x9b, 0x95, 0x60,
0x8f, 0x04, 0x04, 0xa9, 0xa2, 0xc2, 0x96, 0xb8, 0xcd, 0xa8, 0x44, 0x30, 0x0b, 0x00, 0xb0, 0xca, 0x6a, 0x6d, 0x32, 0xd3, 0x12, 0x4d, 0xee, 0x65,
0x1a, 0x9a, 0xd1, 0x1d, 0x03, 0xce, 0x6d, 0x2a, 0xc9, 0xd8, 0x69, 0xad, 0xbe, 0x95, 0x34, 0xf0, 0x99, 0x21, 0x27, 0xc4, 0x8f, 0xe8, 0xa0, 0x11,
0x36, 0x90, 0x25, 0x4b, 0xb2, 0x5c, 0x4d, 0xc9, 0xca, 0x7a, 0x6a, 0x3b, 0x7b, 0x5f, 0x56, 0x13, 0x0b, 0x38, 0xaa, 0x57, 0x78, 0x07, 0xe3, 0x91,
0x89, 0xbe, 0x5a, 0xf8, 0xb3, 0xc7, 0x24, 0x11, 0x77, 0x7b, 0x36, 0x95, 0xe9, 0x02, 0x33, 0x95, 0xab, 0xcf, 0xb4, 0x34, 0xb2, 0x95, 0x06, 0xca,
0x2e, 0xc3, 0x00, 0x5b, 0x2d, 0x19, 0xd8, 0xad, 0x31, 0xd2, 0x62, 0xdf, 0x27, 0xce, 0x92, 0xe5, 0x7f, 0x4c, 0xfb, 0x33, 0xf4, 0x22, 0x08, 0x30,
0x83, 0x37, 0x2b, 0x54, 0xf8, 0xa0, 0x12, 0x07, 0xe0, 0x5e, 0x17, 0xfa, 0x28, 0x4b, 0x31, 0x9c, 0x6c, 0xee, 0x04, 0xf8, 0x5a, 0x7b, 0xf5, 0xb1,
0x0b, 0x92, 0xf6, 0x91, 0x96, 0x64, 0xd5, 0xd7, 0xfc, 0x90, 0x68, 0x12, 0x07, 0x1e, 0x12, 0x45, 0xd8, 0xe6, 0xec, 0xe5, 0xa5, 0xc6, 0x2a, 0xb1,
0xb8, 0xf6, 0xbf, 0xe3, 0x78, 0xbc, 0xe6, 0x1e, 0x6a, 0xf8, 0xb0, 0x76, 0x6e, 0x37, 0x53, 0x5f, 0xf2, 0x4e, 0x6a, 0x22, 0xa6, 0xc4, 0x16, 0xc4,
0x7a, 0xa4, 0xef, 0xa6, 0x54, 0xd2, 0xe1, 0x77, 0x01, 0x4e, 0xaf, 0xfe, 0xba, 0x1d, 0x44, 0xaf, 0xf1, 0xd2, 0xc4, 0x1b, 0x31, 0x10, 0xfb, 0x26,
0x6a, 0xfa, 0x82, 0x74, 0x25, 0xbd, 0xd4, 0x4c, 0xaf, 0xc7, 0x39, 0xe3, 0xba, 0x1f, 0xcf, 0x9a, 0xc6, 0xfe, 0x75, 0x05, 0x72, 0x56, 0x09, 0x55,
0x6f, 0xbf, 0x5b, 0x7e, 0xec, 0x61, 0xbb, 0xa5, 0xa1, 0x30, 0x00, 0x96, 0x8a, 0x98, 0xbd, 0xb9, 0x20, 0x1b, 0xb3, 0x13, 0xf5, 0x9a, 0x2c, 0x61,
0xff, 0x83, 0x8c, 0xad, 0x99, 0xc0, 0xa9, 0x01, 0x99, 0xc1, 0x07, 0x9e, 0x16, 0x89, 0x0f, 0x12, 0x9d, 0x63, 0xae, 0x90, 0xfe, 0x83, 0xb9, 0x44,
0x7c, 0xbe, 0x7e, 0xc1, 0xd5, 0xa3, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xfc, 0x01, 0x52, 0x03, 0x8c, 0xe6, 0xe0, 0x98, 0x60, 0xab, 0x00, 0x00,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82; 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82;
our $image21; our $image21;
our $image21_data = pack 'C*', our $image21_data = pack 'C*',
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16,
0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c, 0x3b, 0x00, 0x00, 0x00, 0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c, 0x3b, 0x00, 0x00, 0x01,
0xbc, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xd5, 0x95, 0xc1, 0x0d, 0xc2, 0x41, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0xa5, 0x54, 0x41, 0x4e, 0xc4,
0x30, 0x0c, 0x45, 0xbf, 0x51, 0x2f, 0xdd, 0x82, 0x39, 0x2c, 0xb1, 0x48, 0x30, 0x0c, 0x9c, 0xa9, 0x58, 0xa4, 0x15, 0x12, 0x02, 0xb1, 0x08, 0x1f,
0x17, 0xe9, 0x0c, 0x5d, 0xa4, 0xa3, 0xf8, 0xca, 0x38, 0x3d, 0x86, 0x93, 0xf7, 0x77, 0xbc, 0x83, 0xe7, 0xf0, 0x2a, 0xae, 0x3d, 0x70, 0x42, 0xe2,
0xd1, 0x57, 0x20, 0x36, 0x69, 0x41, 0xc0, 0x3f, 0x35, 0x72, 0xf2, 0x6c, 0x80, 0x84, 0x34, 0x1c, 0x1a, 0xb7, 0x8e, 0x9b, 0xb6, 0xdb, 0xc5, 0x52,
0xfd, 0x38, 0xae, 0x5c, 0xce, 0xd7, 0x82, 0x4a, 0xcb, 0xba, 0x09, 0x00, 0xd4, 0xc4, 0x71, 0xc6, 0x33, 0x8e, 0x53, 0xa2, 0x61, 0x0a, 0x73, 0xb6,
0xcc, 0xd3, 0x58, 0x78, 0xdd, 0x23, 0x31, 0x33, 0x38, 0x84, 0x01, 0xbc, 0x02, 0x2e, 0x32, 0x53, 0x17, 0xf0, 0x7c, 0xb4, 0x72, 0xe4, 0xdc, 0x39,
0xae, 0x63, 0xaf, 0xe8, 0xd4, 0x5b, 0xc9, 0xef, 0x81, 0x55, 0xf5, 0xc1, 0xae, 0x1a, 0x1d, 0x80, 0xbb, 0x44, 0x90, 0x65, 0xf3, 0xb0, 0x02, 0x4a,
0x73, 0x8e, 0x45, 0xf1, 0x10, 0x1c, 0x41, 0xcd, 0x4c, 0xb2, 0xe4, 0x29, 0x00, 0x5d, 0x00, 0x67, 0xc0, 0xb9, 0x1d, 0xd6, 0x26, 0xa9, 0x64, 0x29,
0x78, 0x59, 0x37, 0x99, 0xa7, 0xb1, 0xd4, 0x17, 0xe7, 0xf0, 0x4c, 0x03, 0x51, 0x87, 0x70, 0x40, 0x0a, 0x68, 0x0d, 0x15, 0x59, 0x91, 0xe2, 0x6c,
0x83, 0x9e, 0xc1, 0x5b, 0x07, 0xbd, 0xea, 0x56, 0xa2, 0x5d, 0x97, 0x67, 0x04, 0x6e, 0x49, 0xbc, 0x16, 0xb8, 0x4b, 0x5e, 0x02, 0x38, 0x46, 0x1f,
0x66, 0x92, 0x55, 0x7e, 0xb8, 0x2b, 0x5a, 0x7e, 0x1f, 0x02, 0x47, 0x55, 0xd3, 0x77, 0xc5, 0x6e, 0xe2, 0xa2, 0x02, 0x66, 0xc3, 0xb7, 0xc3, 0x7e,
0x7f, 0xf7, 0x81, 0x70, 0xab, 0xb5, 0xe2, 0xbb, 0xc0, 0x91, 0xb8, 0xb7, 0xab, 0x2c, 0x04, 0x28, 0x97, 0x60, 0x45, 0x79, 0xcf, 0x48, 0x30, 0x77,
0xf9, 0x01, 0x0d, 0xf1, 0xb1, 0x3e, 0xb8, 0x27, 0x00, 0x3e, 0xe4, 0xb1, 0x1f, 0x51, 0x5f, 0x9a, 0xdb, 0x69, 0x9e, 0xcb, 0xe4, 0xb5, 0x1e, 0xc0,
0xaa, 0x96, 0xb4, 0xe2, 0xcc, 0xdf, 0x5a, 0xbe, 0xf7, 0x8f, 0xc7, 0x26, 0x4d, 0xb9, 0x76, 0xbb, 0xdb, 0x99, 0x85, 0x52, 0xc5, 0x8a, 0x11, 0xb8,
0xb7, 0x8c, 0x7f, 0xf7, 0xda, 0xc0, 0x12, 0x00, 0xf7, 0x61, 0x52, 0x8f, 0xb0, 0x6f, 0x51, 0x4c, 0x6c, 0x3f, 0xb7, 0x81, 0x9d, 0x79, 0x32, 0xf5,
0xc6, 0xbd, 0x50, 0x80, 0xfe, 0x79, 0xef, 0xd6, 0x0d, 0x86, 0x74, 0x6a, 0xe4, 0x12, 0x75, 0x6f, 0xee, 0x45, 0x60, 0x4e, 0xbe, 0x61, 0x6d, 0x7a,
0xd3, 0xb7, 0x10, 0xae, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x01, 0xf0, 0x06, 0xe0, 0xb5, 0x89, 0x18, 0x14, 0x35, 0x93, 0x0a, 0x78,
0x44, 0xae, 0x42, 0x60, 0x82; 0xcf, 0x0c, 0xc6, 0xa6, 0x36, 0x3d, 0x29, 0xf4, 0xf4, 0x68, 0x7e, 0x1f,
0x79, 0x54, 0x49, 0x4c, 0x00, 0x70, 0x56, 0xcf, 0x8f, 0xd2, 0x29, 0x39,
0x4f, 0xa5, 0x32, 0x4e, 0xaa, 0xcd, 0x46, 0x09, 0xc7, 0x57, 0x98, 0x6a,
0x5e, 0xfb, 0x4d, 0xf7, 0x41, 0x8d, 0x66, 0xea, 0x8a, 0x5d, 0xf3, 0x18,
0xbe, 0x68, 0x7a, 0xc6, 0x04, 0xaa, 0xf8, 0x3a, 0x3d, 0xd9, 0x2a, 0xb0,
0x07, 0x71, 0xfa, 0xb5, 0x52, 0x3d, 0x01, 0xe0, 0x3b, 0xc5, 0x6d, 0x37,
0x7a, 0x90, 0xe7, 0xf2, 0x7f, 0x60, 0x9a, 0x9d, 0x4b, 0xe5, 0x01, 0x4c,
0xc7, 0xa5, 0x52, 0x0e, 0x66, 0xea, 0x60, 0x7a, 0x5c, 0x0f, 0xaa, 0xc0,
0xbd, 0x73, 0x4e, 0xdb, 0x67, 0x4c, 0x0f, 0x97, 0x00, 0xaf, 0xaa, 0xd8,
0x0a, 0xbc, 0x14, 0xf4, 0x3f, 0x67, 0x76, 0x01, 0xff, 0x01, 0x44, 0x83,
0xce, 0xde, 0x45, 0xa9, 0xc1, 0x38, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82;
our $image22;
our $image22_data = pack 'C*',
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x16,
0x08, 0x06, 0x00, 0x00, 0x00, 0xc4, 0xb4, 0x6c, 0x3b, 0x00, 0x00, 0x01,
0x5b, 0x49, 0x44, 0x41, 0x54, 0x38, 0x8d, 0x8d, 0x55, 0x41, 0x72, 0xc3,
0x30, 0x08, 0x5c, 0x14, 0x27, 0x39, 0xf4, 0x9a, 0x83, 0x7a, 0xeb, 0xff,
0x3f, 0xd6, 0x7c, 0xa0, 0x97, 0xb6, 0xd3, 0xed, 0xc1, 0x20, 0x23, 0x40,
0x49, 0x98, 0xd1, 0xc8, 0xb6, 0x60, 0x59, 0x2f, 0x48, 0x02, 0x0a, 0xa3,
0x0e, 0x74, 0xb2, 0x5a, 0x7f, 0xc5, 0x1a, 0x3a, 0x5b, 0xf8, 0x26, 0x72,
0xe0, 0x57, 0x39, 0x01, 0x40, 0x9e, 0xe0, 0xbe, 0x37, 0x00, 0x7f, 0x31,
0x98, 0x35, 0xa8, 0xd9, 0x69, 0x91, 0xf4, 0x02, 0xe0, 0xac, 0x49, 0x3f,
0x9b, 0xa3, 0xd1, 0x1c, 0x9d, 0xc1, 0x88, 0xc7, 0x64, 0xcb, 0xbf, 0x0b,
0xe0, 0x6f, 0x00, 0xd7, 0xb1, 0xa6, 0x11, 0xe7, 0xe8, 0x45, 0x80, 0xe8,
0x1c, 0x22, 0x73, 0x9a, 0x86, 0x5d, 0xeb, 0x9f, 0x02, 0x9a, 0x52, 0xff,
0xf1, 0x8c, 0xbd, 0x49, 0x98, 0x83, 0x9d, 0xdc, 0xf3, 0xa6, 0x63, 0x50,
0x90, 0x45, 0x95, 0xc8, 0xac, 0xf7, 0xea, 0xd9, 0x13, 0x2d, 0x3c, 0x3a,
0x05, 0x7d, 0x48, 0x64, 0x52, 0x44, 0x00, 0xd3, 0x5b, 0xc2, 0xfb, 0xe4,
0xd7, 0x00, 0x40, 0x3a, 0xf7, 0x95, 0xbb, 0x92, 0xef, 0x65, 0x53, 0x7c,
0xe8, 0x2c, 0x3a, 0xbc, 0x53, 0xad, 0x14, 0xc3, 0xc0, 0x9e, 0x68, 0x30,
0x36, 0xd6, 0x8b, 0x1e, 0x2c, 0x19, 0x6f, 0xa5, 0xeb, 0xfd, 0x59, 0xff,
0x4f, 0x26, 0x86, 0xee, 0xa3, 0x0c, 0x78, 0x6c, 0x94, 0x47, 0x90, 0x02,
0x64, 0x99, 0x16, 0x24, 0xa6, 0x8d, 0xe0, 0x5d, 0x08, 0x50, 0x3a, 0x41,
0x17, 0x28, 0x31, 0x6f, 0xae, 0xc5, 0xae, 0xfd, 0x94, 0xac, 0xd3, 0xb4,
0x1d, 0xc0, 0xbe, 0x2b, 0x5c, 0xfb, 0x25, 0x8b, 0xf5, 0x49, 0x09, 0x43,
0x11, 0xe9, 0x4e, 0x37, 0xd3, 0x91, 0x21, 0x79, 0x06, 0x56, 0x8b, 0x27,
0x5b, 0xf9, 0xcd, 0xf7, 0x32, 0xef, 0x42, 0x6b, 0xcf, 0xb8, 0x2b, 0x7d,
0x0f, 0x46, 0x90, 0x37, 0xe4, 0xd3, 0x0e, 0x0e, 0x68, 0xc7, 0x50, 0x0d,
0x3d, 0xe3, 0x58, 0x42, 0x03, 0xbe, 0x69, 0xc6, 0x2f, 0x01, 0x6e, 0xa1,
0x88, 0x13, 0x2b, 0xfb, 0x03, 0x41, 0x66, 0x1c, 0x25, 0xea, 0x3a, 0x5f,
0xa0, 0xed, 0x37, 0x36, 0x85, 0x3b, 0xdd, 0xbc, 0x15, 0x67, 0x48, 0x6d,
0x93, 0x86, 0x47, 0x81, 0xf6, 0xe2, 0xe5, 0x1b, 0x66, 0x02, 0x0f, 0xb1,
0x47, 0x11, 0xbd, 0x43, 0x1c, 0xaf, 0xdc, 0x79, 0x45, 0x1c, 0x00, 0x60,
0x4b, 0x4d, 0x9f, 0xe2, 0x1e, 0x5b, 0xb8, 0x6d, 0x08, 0x05, 0xff, 0x07,
0x3e, 0x4c, 0xd2, 0xff, 0x1f, 0x38, 0x0e, 0x92, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82;
sub NEW sub NEW
@ -1643,10 +1698,12 @@ sub NEW
$image20->loadFromData($image20_data, length ($image20_data), "PNG"); $image20->loadFromData($image20_data, length ($image20_data), "PNG");
$image21 = Qt::Pixmap(); $image21 = Qt::Pixmap();
$image21->loadFromData($image21_data, length ($image21_data), "PNG"); $image21->loadFromData($image21_data, length ($image21_data), "PNG");
$image22 = Qt::Pixmap();
$image22->loadFromData($image22_data, length ($image22_data), "PNG");
if ( name() eq "unnamed" ) if ( name() eq "unnamed" )
{ {
setName("MuSRFitformR" ); setName("MuSRFitform" );
} }
setSizePolicy(Qt::SizePolicy(3, 3, 1, 1, this->sizePolicy()->hasHeightForWidth()) ); setSizePolicy(Qt::SizePolicy(3, 3, 1, 1, this->sizePolicy()->hasHeightForWidth()) );
setMinimumSize(Qt::Size(21, 275) ); setMinimumSize(Qt::Size(21, 275) );
@ -2844,16 +2901,17 @@ sub NEW
parametersAppend_ToAction= Qt::Action(this, "parametersAppend_ToAction"); parametersAppend_ToAction= Qt::Action(this, "parametersAppend_ToAction");
parametersAppend_ToAction->setIconSet( Qt::IconSet($image19) ); parametersAppend_ToAction->setIconSet( Qt::IconSet($image19) );
Fit= Qt::Action(this, "Fit"); Fit= Qt::Action(this, "Fit");
Fit->setIconSet( Qt::IconSet($image0) ); Fit->setIconSet( Qt::IconSet($image20) );
Plot= Qt::Action(this, "Plot"); Plot= Qt::Action(this, "Plot");
Plot->setToggleAction( 0 ); Plot->setToggleAction( 0 );
Plot->setIconSet( Qt::IconSet($image20) ); Plot->setIconSet( Qt::IconSet($image21) );
T0= Qt::Action(this, "T0"); T0= Qt::Action(this, "T0");
T0->setIconSet( Qt::IconSet($image21) ); T0->setIconSet( Qt::IconSet($image22) );
optionsFourier= Qt::Action(this, "optionsFourier"); optionsFourier= Qt::Action(this, "optionsFourier");
optionsFourier->setToggleAction( 1 ); optionsFourier->setToggleAction( 1 );
optionsT0= Qt::Action(this, "optionsT0"); optionsT0= Qt::Action(this, "optionsT0");
optionsT0->setToggleAction( 1 ); optionsT0->setToggleAction( 1 );
optionsCustomise= Qt::Action(this, "optionsCustomise");
FileToolBar = Qt::ToolBar("", this, &DockTop); FileToolBar = Qt::ToolBar("", this, &DockTop);
@ -2911,6 +2969,7 @@ sub NEW
ManualFile->addTo( Options ); ManualFile->addTo( Options );
optionsFourier->addTo( Options ); optionsFourier->addTo( Options );
optionsT0->addTo( Options ); optionsT0->addTo( Options );
optionsCustomise->addTo( Options );
MenuBar->insertItem( "", Options, 6 ); MenuBar->insertItem( "", Options, 6 );
helpMenu = Qt::PopupMenu( this ); helpMenu = Qt::PopupMenu( this );
@ -2956,6 +3015,7 @@ sub NEW
Qt::Object::connect(FitType2, SIGNAL "activated(const QString&)", this, SLOT "InitializeFunctions()"); Qt::Object::connect(FitType2, SIGNAL "activated(const QString&)", this, SLOT "InitializeFunctions()");
Qt::Object::connect(FitType3, SIGNAL "activated(const QString&)", this, SLOT "InitializeFunctions()"); Qt::Object::connect(FitType3, SIGNAL "activated(const QString&)", this, SLOT "InitializeFunctions()");
Qt::Object::connect(AddConstraint, SIGNAL "clicked()", this, SLOT "AppendToFunctions()"); Qt::Object::connect(AddConstraint, SIGNAL "clicked()", this, SLOT "AppendToFunctions()");
Qt::Object::connect(optionsCustomise, SIGNAL "activated()", this, SLOT "optionCustromize()");
setTabOrder(musrfit_tabs, RunNumbers); setTabOrder(musrfit_tabs, RunNumbers);
setTabOrder(RunNumbers, BeamLine); setTabOrder(RunNumbers, BeamLine);
@ -3333,6 +3393,8 @@ sub languageChange
optionsFourier->setMenuText( trUtf8("Fourier") ); optionsFourier->setMenuText( trUtf8("Fourier") );
optionsT0->setText( trUtf8("T0 and Bg bins") ); optionsT0->setText( trUtf8("T0 and Bg bins") );
optionsT0->setMenuText( trUtf8("T0 and Bg bins") ); optionsT0->setMenuText( trUtf8("T0 and Bg bins") );
optionsCustomise->setText( trUtf8("Customise") );
optionsCustomise->setMenuText( trUtf8("Customise") );
FileToolBar->setLabel( trUtf8("File Menu") ); FileToolBar->setLabel( trUtf8("File Menu") );
ActionsToolBar->setLabel( trUtf8("Actions Menu") ); ActionsToolBar->setLabel( trUtf8("Actions Menu") );
MenuBar->findItem( 2 )->setText( trUtf8("&File") ); MenuBar->findItem( 2 )->setText( trUtf8("&File") );
@ -3405,7 +3467,7 @@ sub fileChangeDir
sub filePrint sub filePrint
{ {
print "MuSRFitformR->filePrint(): Not implemented yet.\n"; print "MuSRFitform->filePrint(): Not implemented yet.\n";
} }
sub fileExit sub fileExit
@ -3470,37 +3532,37 @@ sub parametersAppend
sub editUndo sub editUndo
{ {
print "MuSRFitformR->editUndo(): Not implemented yet.\n"; print "MuSRFitform->editUndo(): Not implemented yet.\n";
} }
sub editRedo sub editRedo
{ {
print "MuSRFitformR->editRedo(): Not implemented yet.\n"; print "MuSRFitform->editRedo(): Not implemented yet.\n";
} }
sub editCut sub editCut
{ {
print "MuSRFitformR->editCut(): Not implemented yet.\n"; print "MuSRFitform->editCut(): Not implemented yet.\n";
} }
sub editCopy sub editCopy
{ {
print "MuSRFitformR->editCopy(): Not implemented yet.\n"; print "MuSRFitform->editCopy(): Not implemented yet.\n";
} }
sub editPaste sub editPaste
{ {
print "MuSRFitformR->editPaste(): Not implemented yet.\n"; print "MuSRFitform->editPaste(): Not implemented yet.\n";
} }
sub helpIndex sub helpIndex
{ {
print "MuSRFitformR->helpIndex(): Not implemented yet.\n"; print "MuSRFitform->helpIndex(): Not implemented yet.\n";
} }
sub helpContents sub helpContents
{ {
print "MuSRFitformR->helpContents(): Not implemented yet.\n"; print "MuSRFitform->helpContents(): Not implemented yet.\n";
} }
sub helpAbout sub helpAbout
@ -4206,6 +4268,8 @@ sub InitializeFunctions
my $ParCount=0; my $ParCount=0;
CParamsCombo->clear(); CParamsCombo->clear();
# Possibly use the parameters block to axtract names for the dropdown menu
# this makes sense if we can use fun in map line. Check!
my $Component=1; my $Component=1;
foreach my $FitType (@FitTypes) { foreach my $FitType (@FitTypes) {
my $Parameters=$Paramcomp[$Component-1]; my $Parameters=$Paramcomp[$Component-1];
@ -4241,6 +4305,22 @@ sub InitializeFunctions
ConstraintLine->setText(""); ConstraintLine->setText("");
FunctionsBlock->setText(""); FunctionsBlock->setText("");
}
sub optionCustromize
{
use Customize;
my $Customize = Qt::Dialog(this);
my $w = Customize;
$w->setModal(1);
$w->exec();
# $Customize->setMainWidget($w);
# $w->show;
# exit $Customize->exec;
} }
1; 1;
@ -4249,10 +4329,10 @@ sub InitializeFunctions
package main; package main;
use Qt; use Qt;
use MuSRFitformR; use MuSRFitform;
my $a = Qt::Application(\@ARGV); my $a = Qt::Application(\@ARGV);
my $w = MuSRFitformR; my $w = MuSRFitform;
$a->setMainWidget($w); $a->setMainWidget($w);
$w->show; $w->show;
exit $a->exec; exit $a->exec;

View File

@ -1,8 +1,8 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>MuSRFitformR</class> <class>MuSRFitform</class>
<widget class="QMainWindow"> <widget class="QMainWindow">
<property name="name"> <property name="name">
<cstring>MuSRFitformR</cstring> <cstring>MuSRFitform</cstring>
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
@ -4734,6 +4734,7 @@
<action name="ManualFile"/> <action name="ManualFile"/>
<action name="optionsFourier"/> <action name="optionsFourier"/>
<action name="optionsT0"/> <action name="optionsT0"/>
<action name="optionsCustomise"/>
</item> </item>
<item text="&amp;Help" name="helpMenu"> <item text="&amp;Help" name="helpMenu">
<action name="helpContentsAction"/> <action name="helpContentsAction"/>
@ -5172,7 +5173,7 @@
<cstring>Fit</cstring> <cstring>Fit</cstring>
</property> </property>
<property name="iconSet"> <property name="iconSet">
<iconset>image0</iconset> <iconset>image20</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Fit and Plot</string> <string>Fit and Plot</string>
@ -5189,7 +5190,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="iconSet"> <property name="iconSet">
<iconset>image20</iconset> <iconset>image21</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Plot</string> <string>Plot</string>
@ -5203,7 +5204,7 @@
<cstring>T0</cstring> <cstring>T0</cstring>
</property> </property>
<property name="iconSet"> <property name="iconSet">
<iconset>image21</iconset> <iconset>image22</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Show t0 and Bg Bins</string> <string>Show t0 and Bg Bins</string>
@ -5240,10 +5241,21 @@
<string>T0 and Bg bins</string> <string>T0 and Bg bins</string>
</property> </property>
</action> </action>
<action>
<property name="name">
<cstring>optionsCustomise</cstring>
</property>
<property name="text">
<string>Customise</string>
</property>
<property name="menuText">
<string>Customise</string>
</property>
</action>
</actions> </actions>
<images> <images>
<image name="image0"> <image name="image0">
<data format="PNG" length="268">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d349444154388db594510e84200c44a7864bd9fb673c16fe50b7a95501dd97104983435b06842422ab6ab5f946ca6941074b0ca813cd36eaa5f89f050049811352d53aac8a96b165640256fe468ac546b33eb5c298ededa3f05b1655adbef4b8c062a3e92fbc117d83643ebe6275d53dd1dd637345af3b3e3bbcb8e19470763b23ddc2de3924c58b676d2a67897b717f4b25dcd848f5a3b9e4f8c651dd200992c86205680f4f82c555b51e6b92fe5a2502c0cc3bd40a13b98a133faf17cb286639833fc4db56bce17fafdb9762deeb438fd0083bbf3298df1bba5b870000000049454e44ae426082</data> <data format="PNG" length="330">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000011149444154388da554cb12c2200cdce063c6bb073cfaff3fe657b81e5a6858428b9a19a634249bcd030c81d0ed2d3298924c1e1b81b220dfee3c452c0124f6bafb6a7f95a009c0d3ed6f9531012a90d08ad25255f36f94926a4d09c0e2b2136d0b9aff84b19847017002700170def1a9d218095b4df5bdae2949b631fb7db286be7d03b54406f49373186e05ade0001e814d571b2777551426bb93e1d98eeaa523d2a5e367296239734d2bf06403e90347c1e237667d33f832d8727146444d37d16143c0d7dab3d71e781725510e8f4746c43269799b4c2ee015b490d8052e4696b744f8ea874627a203f64da4635474560004dc32592e99f769c51995b59751adc994cf24f020d0b1cf37a0fff87c05fc011aec943b34e289c20000000049454e44ae426082</data>
</image> </image>
<image name="image1"> <image name="image1">
<data format="PNG" length="263">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000ce49444154388dd553c911c3200c5c31f9b82428c58db80637e252e492fc541e1965988d1598d83cb22f21c16ad121aa8a11486e2cf3641c5ce6c96a3fdff1f3993fb9b16e8730c9ba1dc2fe089c24390100442467f1fa5d1d735f6212bec8899820c2a3961f29ed21aaefbf157b2deb404f5d9b8aa3ec4edea3962143e7389762b9944b5f678801b6ab8a2770fb323197e22ef28f39de55e58eb2840b3284b84775abe13f29f63e440272292600c2ac0680bbd8f2195e3f6e2e483d25df26c6957bbc6bf3f8510fc6aef45f113f01c3eca579cdbc94f70000000049454e44ae426082</data> <data format="PNG" length="263">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000ce49444154388dd553c911c3200c5c31f9b82428c58db80637e252e492fc541e1965988d1598d83cb22f21c16ad121aa8a11486e2cf3641c5ce6c96a3fdff1f3993fb9b16e8730c9ba1dc2fe089c24390100442467f1fa5d1d735f6212bec8899820c2a3961f29ed21aaefbf157b2deb404f5d9b8aa3ec4edea3962143e7389762b9944b5f678801b6ab8a2770fb323197e22ef28f39de55e58eb2840b3284b84775abe13f29f63e440272292600c2ac0680bbd8f2195e3f6e2e483d25df26c6957bbc6bf3f8510fc6aef45f113f01c3eca579cdbc94f70000000049454e44ae426082</data>
@ -5303,181 +5315,190 @@
<data format="PNG" length="297">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000f049444154388dbd926b1283300884978e970af79ff558f487a2481313b52d334e1ec2025f1092383355b5782629aa6abe667f920200532db0e5dcbaf744f1dfd40a7a6a4315bbcf9522862abed3d547c54f0537e15f3116005dc6b7847b735cb3a26a73a78003e36f62f9df1cbbd512660467482e332ea19033ceb7a662e4f19a159784280b155593353efbba59fc4882246cddaf0e66a133df5bead642fcd0540820514c1684dbbd9fa34daaeaf90c100180888724769fbad57c5e8b88998b67e6355147e35d3412efa271cd4c7b5ce39ee43e15aac5c8f930fc51c039ee4c177491b101db1806e876101a33693efc1b7858d21f6a6c70020000000049454e44ae426082</data> <data format="PNG" length="297">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000f049444154388dbd926b1283300884978e970af79ff558f487a2481313b52d334e1ec2025f1092383355b5782629aa6abe667f920200532db0e5dcbaf744f1dfd40a7a6a4315bbcf9522862abed3d547c54f0537e15f3116005dc6b7847b735cb3a26a73a78003e36f62f9df1cbbd512660467482e332ea19033ceb7a662e4f19a159784280b155593353efbba59fc4882246cddaf0e66a133df5bead642fcd0540820514c1684dbbd9fa34daaeaf90c100180888724769fbad57c5e8b88998b67e6355147e35d3412efa271cd4c7b5ce39ee43e15aac5c8f930fc51c039ee4c177491b101db1806e876101a33693efc1b7858d21f6a6c70020000000049454e44ae426082</data>
</image> </image>
<image name="image20"> <image name="image20">
<data format="PNG" length="319">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000010649444154388dad54d10e84200ceb0c3f65ff3ff5b3760f3283133c39af090959a0ebca864942c64a7aec37c92e071e60c90192b7899ea2b4970d304940434e12d3aca88a439163e788f237c92236abfa6245e0576f0180a40f89df9002c042f2547a3e1831031e5720c99668b737a567b54074c143aca48f0404a9a2c296b8cda844301a9ad11d03ce6d2ac9d869ad3690254bb25c4dc9ca7a6a3b89be5af8b3c72411777b36952ec3005b2d19d8ad31d262df83372b54f8a01207e05e17fa0b92f6919664d5d7fc906812b8f6bfe378bce61e6af8b0767aa4efa654d2e177014eaffe6afa827425bdd44cafc739e36fbf5b7eec61bba5a1300096ff838cad99c0a90199c1079e7cbe7ec1d5a3e00000000049454e44ae426082</data> <data format="PNG" length="322">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000010949444154388da554410ec3200cb3d1f6831dd8ff3fb757cc3b8cd034a4946e919020c48e49002231b939b38025abd279d0252300dc6c25ecd415016f6cbe989c0e9209636928057427359fbe4b1b310987b900b93158f3657bd1b55b9784cb2bf152d4c0f709a6dbcd2fc219b3ba2e5be1a6ecf79b95600b00b0ca6a6d32d3124dee65be9534f0992127c48fe8a0117b5f56130b38aa577807e391e9023395abcfb434b29506ca27ce92e57f4cfb33f4220830284b319c6cee04f85a7bf5b1071e1245d8e6ece5a5c62ab16e37535ff24e6a22a6c416c4ba1d44aff1d2c41b3110fb26ba1fcf9ac6fe7505725609558a98bdb9201bb313f59a2c6116890f129d63ae90fe83b944fc0152038ce6e09860ab0000000049454e44ae426082</data>
</image> </image>
<image name="image21"> <image name="image21">
<data format="PNG" length="245">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000bc49444154388dd595c10dc2300c45bf512fdd82392cb14817e90c5da4a3f8ca383d8693d15720366941c03f3572f26cfd38ae5cced7824acbba0900ccd35878dd233133388401bcae63afe8d45bc9ef8155f5c1738e45f1101c41cd4cb2e42978593799a7b1d417e7f04c03839ec15b07bdea56a25d97676692557eb82b5a7e1f0247557ff78170abb5e2bbc091b8b7f9010df1b13eb827003ee4b1aa96b4e2ccdf5abef78fc726b78c7ff7dac01200f761528fc6bd5080fe79efd60d86746ad3b710aeb60000000049454e44ae426082</data> <data format="PNG" length="378">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000014149444154388da554414ec4300c9ca958a4151202b1081ff777bc83e7f02aae3d7042e28084341c1ab78e9bb6dbc552d4c471c6338e53a2610a73b6022e325317f07cb472e4dc39ae1a1d80bb449065f3b0024a005d0067c0b91dd626a96429518770400a680d155991e26c046e49bc16b84b5e0238461fd377c56ee2a20266c3b7c37eab2c042897604579cf4830771f515f9adb699ecbe4b51ec04db976bbdb998552c58a11b8b06f514c6c3fb7819d7932f5e412756fee45604ebe616d7a01f006e0b589181435930a78cf0cc6a6363d29f4f4687e1f7954494c007056cf8fd229394fa5324eaacd4609c757986a5efb4df7418d66ea8a5df318be687ac604aaf83a3dd92ab00771fab5523d01e03bc56d377a90e7f27f609a9d4be5014cc7a5520e66ea607a5c0faac0bd734edb674c0f9700afaad80abc14f43f677601ff014483cede45a9c1380000000049454e44ae426082</data>
</image>
<image name="image22">
<data format="PNG" length="404">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000015b49444154388d8d554172c330085c142739f49a837aebff3fd67ca097b6d3edc12023404998d1c8b660592f48020aa30e74b25a7fc51a3a5bf82672e0573901409ee0be37007f319835a8d96991f402e0ac493f9ba3d11c9dc188c764cbbf0be06f00d7b1a611e7e84580e81c22739a865deb9f029a52fff18cbd4998839ddcf3a66350904595c8acf7ead9132d3c3a057d4864524400d35bc2fbe4d700403af795bb92ef65537ce82c3abc53ad14c3c09e683036d68b1e2c196fa5ebfd59ff4f2686eea30c786c9447900264991624a68de05d08503a411728316faec5aefd94acd3b41dc0be2b5cfb258bf549094311e94e37d391217906568b275bf9cdf732ef426bcfb82b7d0f469037e4d30e0e68c7500d3de3584203be69c62f016ea188132bfb0341661c25ea3a5fa0ed3736853bddbc1567486d93864781f6e2e51b66020fb14711bd431cafdc79451c00604b4d9fe21e5bb86d0805ff073e4cd2ff1f380e920000000049454e44ae426082</data>
</image> </image>
</images> </images>
<connections> <connections>
<connection> <connection>
<sender>Fit</sender> <sender>Fit</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>GoFit()</slot> <slot>GoFit()</slot>
</connection> </connection>
<connection> <connection>
<sender>parametersAppend_ToAction</sender> <sender>parametersAppend_ToAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>parametersAppend()</slot> <slot>parametersAppend()</slot>
</connection> </connection>
<connection> <connection>
<sender>parametersExport_AsAction</sender> <sender>parametersExport_AsAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>parametersExport()</slot> <slot>parametersExport()</slot>
</connection> </connection>
<connection> <connection>
<sender>BeamLine</sender> <sender>BeamLine</sender>
<signal>activated(int)</signal> <signal>activated(int)</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>T0Update()</slot> <slot>T0Update()</slot>
</connection> </connection>
<connection> <connection>
<sender>Browse</sender> <sender>Browse</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>fileBrowse()</slot> <slot>fileBrowse()</slot>
</connection> </connection>
<connection> <connection>
<sender>InitParamTable</sender> <sender>InitParamTable</sender>
<signal>valueChanged(int,int)</signal> <signal>valueChanged(int,int)</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>CallMSRCreate()</slot> <slot>CallMSRCreate()</slot>
</connection> </connection>
<connection> <connection>
<sender>musrfit_tabs</sender> <sender>musrfit_tabs</sender>
<signal>selected(const QString&amp;)</signal> <signal>selected(const QString&amp;)</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>TabChanged()</slot> <slot>TabChanged()</slot>
</connection> </connection>
<connection> <connection>
<sender>fileChangeDirAction</sender> <sender>fileChangeDirAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>fileChangeDir()</slot> <slot>fileChangeDir()</slot>
</connection> </connection>
<connection> <connection>
<sender>fileOpenAction</sender> <sender>fileOpenAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>fileOpen()</slot> <slot>fileOpen()</slot>
</connection> </connection>
<connection> <connection>
<sender>fileSaveAction</sender> <sender>fileSaveAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>fileSave()</slot> <slot>fileSave()</slot>
</connection> </connection>
<connection> <connection>
<sender>filePrintAction</sender> <sender>filePrintAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>filePrint()</slot> <slot>filePrint()</slot>
</connection> </connection>
<connection> <connection>
<sender>fileExitAction</sender> <sender>fileExitAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>fileExit()</slot> <slot>fileExit()</slot>
</connection> </connection>
<connection> <connection>
<sender>editUndoAction</sender> <sender>editUndoAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>editUndo()</slot> <slot>editUndo()</slot>
</connection> </connection>
<connection> <connection>
<sender>editRedoAction</sender> <sender>editRedoAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>editRedo()</slot> <slot>editRedo()</slot>
</connection> </connection>
<connection> <connection>
<sender>editCutAction</sender> <sender>editCutAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>editCut()</slot> <slot>editCut()</slot>
</connection> </connection>
<connection> <connection>
<sender>editCopyAction</sender> <sender>editCopyAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>editCopy()</slot> <slot>editCopy()</slot>
</connection> </connection>
<connection> <connection>
<sender>editPasteAction</sender> <sender>editPasteAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>editPaste()</slot> <slot>editPaste()</slot>
</connection> </connection>
<connection> <connection>
<sender>helpIndexAction</sender> <sender>helpIndexAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>helpIndex()</slot> <slot>helpIndex()</slot>
</connection> </connection>
<connection> <connection>
<sender>helpContentsAction</sender> <sender>helpContentsAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>helpContents()</slot> <slot>helpContents()</slot>
</connection> </connection>
<connection> <connection>
<sender>helpAboutAction</sender> <sender>helpAboutAction</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>helpAbout()</slot> <slot>helpAbout()</slot>
</connection> </connection>
<connection> <connection>
<sender>T0</sender> <sender>T0</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>ShowMuSRT0()</slot> <slot>ShowMuSRT0()</slot>
</connection> </connection>
<connection> <connection>
<sender>Plot</sender> <sender>Plot</sender>
<signal>activated()</signal> <signal>activated()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>GoPlot()</slot> <slot>GoPlot()</slot>
</connection> </connection>
<connection> <connection>
<sender>ManualFile</sender> <sender>ManualFile</sender>
<signal>toggled(bool)</signal> <signal>toggled(bool)</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>RunSelectionToggle()</slot> <slot>RunSelectionToggle()</slot>
</connection> </connection>
<connection> <connection>
<sender>ResetFunc</sender> <sender>ResetFunc</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>InitializeFunctions()</slot> <slot>InitializeFunctions()</slot>
</connection> </connection>
<connection> <connection>
<sender>FitType1</sender> <sender>FitType1</sender>
<signal>activated(const QString&amp;)</signal> <signal>activated(const QString&amp;)</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>InitializeFunctions()</slot> <slot>InitializeFunctions()</slot>
</connection> </connection>
<connection> <connection>
<sender>FitType2</sender> <sender>FitType2</sender>
<signal>activated(const QString&amp;)</signal> <signal>activated(const QString&amp;)</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>InitializeFunctions()</slot> <slot>InitializeFunctions()</slot>
</connection> </connection>
<connection> <connection>
<sender>FitType3</sender> <sender>FitType3</sender>
<signal>activated(const QString&amp;)</signal> <signal>activated(const QString&amp;)</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>InitializeFunctions()</slot> <slot>InitializeFunctions()</slot>
</connection> </connection>
<connection> <connection>
<sender>AddConstraint</sender> <sender>AddConstraint</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>MuSRFitformR</receiver> <receiver>MuSRFitform</receiver>
<slot>AppendToFunctions()</slot> <slot>AppendToFunctions()</slot>
</connection> </connection>
<connection>
<sender>optionsCustomise</sender>
<signal>activated()</signal>
<receiver>MuSRFitform</receiver>
<slot>optionCustromize()</slot>
</connection>
</connections> </connections>
<tabstops> <tabstops>
<tabstop>musrfit_tabs</tabstop> <tabstop>musrfit_tabs</tabstop>
@ -5586,6 +5607,7 @@
<slot>fileBrowse()</slot> <slot>fileBrowse()</slot>
<slot>AppendToFunctions()</slot> <slot>AppendToFunctions()</slot>
<slot>InitializeFunctions()</slot> <slot>InitializeFunctions()</slot>
<slot>optionCustromize()</slot>
</slots> </slots>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
</UI> </UI>

View File

@ -28,7 +28,7 @@
# Copyright 2009 by Zaher Salman and the LEM Group. # Copyright 2009 by Zaher Salman and the LEM Group.
# <zaher.salman@psi.ch> # <zaher.salman@psi.ch>
void Form1::fileOpen() void MuSRFitMenu::fileOpen()
{ {
my $file=Qt::FileDialog::getOpenFileName( my $file=Qt::FileDialog::getOpenFileName(
".", ".",
@ -45,7 +45,7 @@ void Form1::fileOpen()
} }
void Form1::fileSave() void MuSRFitMenu::fileSave()
{ {
my %All=CreateAllInput(); my %All=CreateAllInput();
my $FILENAME=$All{"FILENAME"}.".msr"; my $FILENAME=$All{"FILENAME"}.".msr";
@ -71,7 +71,7 @@ void Form1::fileSave()
} }
} }
void Form1::fileChangeDir() void MuSRFitMenu::fileChangeDir()
{ {
my $newdir=Qt::FileDialog::getExistingDirectory( my $newdir=Qt::FileDialog::getExistingDirectory(
"", "",
@ -82,13 +82,13 @@ void Form1::fileChangeDir()
chdir ("$newdir"); chdir ("$newdir");
} }
void Form1::filePrint() void MuSRFitMenu::filePrint()
{ {
} }
void Form1::fileExit() void MuSRFitMenu::fileExit()
{ {
my $Ans = Qt::MessageBox::question( this, "Quit?","Are you sure you want to quit?","&Yes","&No","",0,1); my $Ans = Qt::MessageBox::question( this, "Quit?","Are you sure you want to quit?","&Yes","&No","",0,1);
if ($Ans==0) { if ($Ans==0) {
@ -98,7 +98,7 @@ void Form1::fileExit()
# Otherwize go back # Otherwize go back
} }
void Form1::parametersExport() void MuSRFitMenu::parametersExport()
{ {
my %All=CreateAllInput(); my %All=CreateAllInput();
# Add also a flag for header # Add also a flag for header
@ -121,7 +121,7 @@ void Form1::parametersExport()
} }
void Form1::parametersAppend() void MuSRFitMenu::parametersAppend()
{ {
my %All=CreateAllInput(); my %All=CreateAllInput();
# Add also a flag for header # Add also a flag for header
@ -144,48 +144,48 @@ void Form1::parametersAppend()
} }
void Form1::editUndo() void MuSRFitMenu::editUndo()
{ {
} }
void Form1::editRedo() void MuSRFitMenu::editRedo()
{ {
} }
void Form1::editCut() void MuSRFitMenu::editCut()
{ {
} }
void Form1::editCopy() void MuSRFitMenu::editCopy()
{ {
} }
void Form1::editPaste() void MuSRFitMenu::editPaste()
{ {
} }
void Form1::helpIndex() void MuSRFitMenu::helpIndex()
{ {
} }
void Form1::helpContents() void MuSRFitMenu::helpContents()
{ {
} }
void Form1::helpAbout() void MuSRFitMenu::helpAbout()
{ {
my $AboutText=" my $AboutText="
This is a GUI that uses the musrfit binary, developed by Andreas Suter, This is a GUI that uses the musrfit binary, developed by Andreas Suter,
@ -861,6 +861,8 @@ void MuSRFitform::InitializeFunctions()
my $ParCount=0; my $ParCount=0;
CParamsCombo->clear(); CParamsCombo->clear();
# Possibly use the parameters block to axtract names for the dropdown menu
# this makes sense if we can use fun in map line. Check!
my $Component=1; my $Component=1;
foreach my $FitType (@FitTypes) { foreach my $FitType (@FitTypes) {
my $Parameters=$Paramcomp[$Component-1]; my $Parameters=$Paramcomp[$Component-1];
@ -896,3 +898,18 @@ void MuSRFitform::InitializeFunctions()
ConstraintLine->setText(""); ConstraintLine->setText("");
FunctionsBlock->setText(""); FunctionsBlock->setText("");
} }
void MuSRFitform::optionCustromize()
{
use Customize;
my $Customize = Qt::Dialog(this);
my $w = Customize;
$w->setModal(1);
$w->exec();
# $Customize->setMainWidget($w);
# $w->show;
# exit $Customize->exec;
}