diff --git a/prepareView.py b/prepareView.py
index f820e1f..af719c4 100644
--- a/prepareView.py
+++ b/prepareView.py
@@ -162,9 +162,9 @@ class Buttons00(QWidget):
c.sectorMagButton.setText('Prepare Sector Mag')
grid.addWidget(c.sectorMagButton,3,0)
- c.sectorMagButton = QPushButton()
- c.sectorMagButton.setText('Place holder for read Info')
- grid.addWidget(c.sectorMagButton,4,0)
+ c.readInfoButton = QPushButton()
+ c.readInfoButton.setText('Place holder for read Info')
+ grid.addWidget(c.readInfoButton, 4,0)
class NucButtons11(QWidget):
diff --git a/zebra.uxf b/zebra.uxf
index 8e1733f..a124bc8 100644
--- a/zebra.uxf
+++ b/zebra.uxf
@@ -4,48 +4,9 @@
UMLClass
- 808
- 0
- 168
- 24
-
- Prep Experiment Zebra
-bg=#777777
-halign=left
-
-
-
- UMLClass
-
- 808
- 24
- 136
- 24
-
- Load Crystal File
-bg=#BBBBBB
-halign=left
-
-
-
- UMLClass
-
- 808
- 48
- 160
- 24
-
- Load Instrument File
-bg=#BBBBBB
-halign=left
-
-
-
- UMLClass
-
- 808
- 96
- 160
+ 648
+ 560
+ 128
24
Sector Nuc
@@ -56,12 +17,12 @@ halign=left
UMLClass
- 1208
- 280
- 272
- 352
+ 800
+ 472
+ 360
+ 240
- Table
+ Nuc Table
1.1.3
generated by code
@@ -73,23 +34,12 @@ columns= {h,k,l} and others (see 1.1.4)
sort ascending , descending
-
- Relation
-
- 960
- 96
- 392
- 184
-
- lt=<.
- 470.0;210.0;250.0;130.0;10.0;10.0
-
UMLClass
- 1184
- 264
- 320
+ 624
+ 456
+ 576
424
@@ -100,8 +50,8 @@ fg=blue
UMLClass
- 1208
- 640
+ 880
+ 736
56
32
@@ -111,8 +61,8 @@ fg=blue
UMLClass
- 1264
- 640
+ 960
+ 736
64
32
@@ -122,8 +72,8 @@ fg=blue
UMLClass
- 1328
- 640
+ 1024
+ 736
80
32
@@ -133,21 +83,10 @@ fg=blue
UMLClass
- 1408
- 640
- 72
- 32
-
- Save
-
-
-
- UMLClass
-
- 808
- 120
+ 1320
+ 560
160
- 24
+ 32
Sector Mag
halign=left
@@ -158,80 +97,20 @@ bg=#BBBBBB
UMLClass
1552
- 280
- 264
- 352
-
- Table
-1.1.5-6
-
-columns= {h,k,l} and others
-
-
-
- UMLClass
-
- 1528
- 264
- 320
- 424
-
-
-layer=-1
-fg=blue
-
-
-
- UMLClass
-
- 1552
- 640
+ 736
56
32
Run
-
- Relation
-
- 960
- 120
- 728
- 160
-
- lt=<.
- 890.0;180.0;890.0;70.0;10.0;10.0
-
-
- UMLClass
-
- 1608
- 640
- 56
- 32
-
- Sort
-
-
-
- UMLClass
-
- 1664
- 640
- 80
- 32
-
- Optimize
-
-
UMLClass
- 1744
- 640
+ 1104
+ 736
72
- 32
+ 64
Save
@@ -239,10 +118,10 @@ fg=blue
UMLClass
- 816
- 1056
+ 872
+ 1248
328
- 352
+ 248
Table
halign=left
@@ -257,10 +136,10 @@ FILE 1+2 ID | X | Y
UMLClass
- 480
- 696
- 504
- 104
+ 296
+ 1224
+ 88
+ 472
1D Mode
bg=#777777
@@ -270,49 +149,36 @@ halign=left
UMLClass
- 504
- 960
+ 632
+ 1248
136
24
- Load Data
-bg=#BBBBBB
+ Load Crystal File
halign=left
UMLClass
- 816
- 824
+ 416
+ 1664
160
- 24
+ 40
Manipulate
-bg=#BBBBBB
-halign=left
-
-
-
- UMLClass
-
- 816
- 848
- 160
- 24
-
- Integrate Intensities
-bg=#BBBBBB
++ Integrate Intensities
+bg=#EEEEEE
halign=left
UMLClass
- 1488
- 840
+ 1592
+ 1024
160
- 24
+ 32
Visualize Measured Int
bg=#BBBBBB
@@ -322,21 +188,21 @@ halign=left
Relation
- 944
- 856
- 136
- 176
+ 568
+ 1624
+ 64
+ 56
lt=<.
- 10.0;200.0;150.0;150.0;40.0;10.0
+ 60.0;10.0;10.0;50.0
UMLClass
- 512
- 1016
- 1000
- 592
+ 616
+ 1232
+ 880
+ 384
layer=-1
@@ -347,8 +213,8 @@ fg=blue
UMLClass
- 816
- 1448
+ 632
+ 1568
80
32
@@ -358,8 +224,8 @@ fg=blue
UMLClass
- 896
- 1448
+ 712
+ 1568
64
32
@@ -369,8 +235,8 @@ fg=blue
UMLClass
- 960
- 1448
+ 776
+ 1568
80
32
@@ -380,8 +246,8 @@ fg=blue
UMLClass
- 1896
- 840
+ 2000
+ 1032
184
24
@@ -393,8 +259,8 @@ bg=#BBBBBB
UMLClass
- 1560
- 1056
+ 1664
+ 1248
272
352
@@ -404,8 +270,8 @@ bg=#BBBBBB
UMLClass
- 1536
- 1040
+ 1640
+ 1232
320
424
@@ -417,8 +283,8 @@ fg=blue
Relation
- 1640
- 848
+ 1744
+ 1040
80
208
@@ -428,8 +294,8 @@ fg=blue
UMLClass
- 1880
- 1040
+ 1984
+ 1232
320
64
@@ -441,8 +307,8 @@ fg=blue
UMLClass
- 1952
- 1056
+ 2056
+ 1248
56
32
@@ -452,8 +318,8 @@ fg=blue
UMLClass
- 2008
- 1056
+ 2112
+ 1248
104
32
@@ -463,8 +329,8 @@ fg=blue
UMLClass
- 2112
- 1056
+ 2216
+ 1248
72
32
@@ -474,8 +340,8 @@ fg=blue
Relation
- 2024
- 840
+ 2128
+ 1032
72
216
@@ -485,54 +351,8 @@ fg=blue
UMLClass
- 1072
- 800
- 200
- 24
-
- Open File Dialogue
-halign=left
-
-
-
- Relation
-
- 960
- 32
- 120
- 48
-
- lt=<.
- 130.0;10.0;10.0;40.0
-
-
- UMLClass
-
- 1064
- 32
- 200
- 24
-
- Open File Dialogue
-halign=left
-
-
-
- Relation
-
- 936
- 24
- 144
- 32
-
- lt=<.
- 160.0;20.0;10.0;10.0
-
-
- UMLClass
-
- 816
- 1416
+ 632
+ 1536
56
32
@@ -542,8 +362,8 @@ halign=left
UMLClass
- 872
- 1416
+ 688
+ 1536
64
32
@@ -553,9 +373,9 @@ halign=left
UMLClass
- 936
- 1416
- 80
+ 752
+ 1536
+ 104
32
Substract
@@ -564,8 +384,8 @@ halign=left
UMLClass
- 1016
- 1416
+ 1216
+ 1568
72
32
@@ -575,8 +395,8 @@ halign=left
UMLClass
- 1896
- 1184
+ 2000
+ 1376
136
96
@@ -586,8 +406,8 @@ halign=left
UMLClass
- 2072
- 1184
+ 2176
+ 1376
136
96
@@ -597,8 +417,8 @@ halign=left
UMLClass
- 1880
- 1152
+ 1984
+ 1344
168
160
@@ -610,8 +430,8 @@ fg=blue
UMLClass
- 2056
- 1152
+ 2160
+ 1344
168
160
@@ -623,8 +443,8 @@ fg=blue
Relation
- 2048
- 1080
+ 2152
+ 1272
104
88
@@ -634,8 +454,8 @@ fg=blue
Relation
- 1952
- 1080
+ 2056
+ 1272
40
88
@@ -643,114 +463,590 @@ fg=blue
10.0;90.0;30.0;10.0
- Text
+ UMLClass
- 1320
- 736
- 80
- 56
+ 0
+ 944
+ 224
+ 232
- Extra Features
+ List of Files loaded
++ File 1
++ File 2
+halign=left
- Relation
+ UMLClass
- 736
- 96
- 80
- 136
+ 1216
+ 1248
+ 256
+ 304
- lt=.
- 80.0;10.0;10.0;150.0
+
+halign=left
+visualize
+e.g. integration
+
+
+
+
+
+
- Text
+ UMLClass
- 704
- 224
- 80
- 56
+ 1288
+ 1568
+ 184
+ 32
- Button
+ Viualize
Relation
- 1432
- 664
- 24
- 72
+ 1464
+ 1576
+ 216
+ 120
- lt=.
- 10.0;70.0;10.0;10.0
+ lt=<.
+ 250.0;100.0;220.0;130.0;10.0;10.0
- Text
+ Relation
- 1432
- 728
- 80
- 56
+ 1464
+ 1496
+ 664
+ 256
- Base Feature
-
+ lt=<.
+ 810.0;10.0;730.0;300.0;10.0;120.0
Relation
- 1344
- 664
- 24
- 72
+ 568
+ 1256
+ 56
+ 24
- lt=.
- 10.0;70.0;10.0;10.0
+ lt=<<-
+fg=#449944
+group=1
+ 50.0;10.0;10.0;10.0
- Relation
+ UMLClass
- 1280
- 672
- 64
- 80
+ 520
+ 1256
+ 56
+ 16
- lt=.
- 60.0;80.0;10.0;10.0
+ fg=#449944
+ROW 0
+valign=top
+halign=left
+
+group=1
+
Relation
- 1232
- 664
- 96
- 96
+ 568
+ 1296
+ 56
+ 24
- lt=.
- 100.0;100.0;10.0;10.0
+ lt=<<-
+fg=#449944
+group=2
+ 50.0;10.0;10.0;10.0
UMLClass
- 536
- 1080
- 192
- 160
+ 520
+ 1296
+ 56
+ 16
- List of Files loaded
-+ File 1
-+ File 2
-halign=left
+ fg=#449944
+ROW 1
+valign=top
+halign=left
+
+group=2
- UMLClass
+ Relation
- 1152
- 1056
- 328
- 352
+ 560
+ 1544
+ 56
+ 24
+
+ lt=<<-
+fg=#449944
+group=3
+ 50.0;10.0;10.0;10.0
+
+
+ UMLClass
+
+ 512
+ 1544
+ 56
+ 16
+
+ fg=#449944
+ROW 2
+valign=top
+halign=left
+
+group=3
+
+
+
+ Relation
+
+ 560
+ 1576
+ 56
+ 24
+
+ lt=<<-
+fg=#449944
+group=4
+ 50.0;10.0;10.0;10.0
+
+
+ UMLClass
+
+ 512
+ 1576
+ 56
+ 16
+
+ fg=#449944
+ROW 3
+valign=top
+halign=left
+
+group=4
+
+
+
+ Relation
+
+ 720
+ 1648
+ 24
+ 56
+
+ lt=<<-
+fg=#449944
+group=5
+ 10.0;10.0;10.0;50.0
+
+
+ UMLClass
+
+ 704
+ 1688
+ 48
+ 16
+
+ fg=#449944
+COL 0
+valign=top
+halign=left
+
+group=5
+
+
+
+ UMLClass
+
+ 1000
+ 1688
+ 48
+ 16
+
+ fg=#449944
+COL 1
+valign=top
+halign=left
+
+group=6
+
+
+
+ Relation
+
+ 1016
+ 1648
+ 24
+ 56
+
+ lt=<<-
+fg=#449944
+group=6
+ 10.0;10.0;10.0;50.0
+
+
+ UMLClass
+
+ 1312
+ 1696
+ 48
+ 16
+
+ fg=#449944
+COL 2
+valign=top
+halign=left
+
+group=7
+
+
+
+ Relation
+
+ 1328
+ 1656
+ 24
+ 56
+
+ lt=<<-
+fg=#449944
+group=7
+ 10.0;10.0;10.0;50.0
+
+
+ UMLClass
+
+ 304
+ 448
+ 88
+ 472
+
+ Zebra
+Mode
+bg=#777777
+halign=left
+
+
+
+ Relation
+
+ 536
+ 480
+ 56
+ 24
+
+ lt=<<-
+fg=#449944
+group=8
+ 50.0;10.0;10.0;10.0
+
+
+ UMLClass
+
+ 488
+ 480
+ 56
+ 16
+
+ fg=#449944
+ROW 0
+valign=top
+halign=left
+
+group=8
+
+
+
+ Relation
+
+ 536
+ 536
+ 56
+ 24
+
+ lt=<<-
+fg=#449944
+group=9
+ 50.0;10.0;10.0;10.0
+
+
+ UMLClass
+
+ 488
+ 536
+ 56
+ 16
+
+ fg=#449944
+ROW 1
+valign=top
+halign=left
+
+group=9
+
+
+
+ Relation
+
+ 528
+ 768
+ 56
+ 24
+
+ lt=<<-
+fg=#449944
+group=10
+ 50.0;10.0;10.0;10.0
+
+
+ UMLClass
+
+ 480
+ 768
+ 56
+ 16
+
+ fg=#449944
+ROW 2
+valign=top
+halign=left
+
+group=10
+
+
+
+ Relation
+
+ 528
+ 808
+ 56
+ 24
+
+ lt=<<-
+fg=#449944
+group=11
+ 50.0;10.0;10.0;10.0
+
+
+ UMLClass
+
+ 480
+ 808
+ 56
+ 16
+
+ fg=#449944
+ROW 3
+valign=top
+halign=left
+
+group=11
+
+
+
+ Relation
+
+ 744
+ 912
+ 24
+ 56
+
+ lt=<<-
+fg=#449944
+group=12
+ 10.0;10.0;10.0;50.0
+
+
+ UMLClass
+
+ 728
+ 952
+ 48
+ 16
+
+ fg=#449944
+COL 0
+valign=top
+halign=left
+
+group=12
+
+
+
+ Relation
+
+ 1192
+ 920
+ 24
+ 56
+
+ lt=<<-
+fg=#449944
+group=13
+ 10.0;10.0;10.0;50.0
+
+
+ UMLClass
+
+ 1176
+ 960
+ 48
+ 16
+
+ fg=#449944
+COL 1
+valign=top
+halign=left
+
+group=13
+
+
+
+ UMLClass
+
+ 296
+ 1832
+ 88
+ 472
+
+ 2D Mode
+bg=#777777
+halign=left
+
+
+
+ UMLClass
+
+ 576
+ 1824
+ 1320
+ 584
+
+
+layer=-1
+
+fg=blue
+
+
+
+ UMLClass
+
+ 912
+ 1880
+ 328
+ 352
+
+ Worksheet
+(Table)
+halign=left
+
+File 1 ID | X | Y
+FILE 2 ID | X | Y
+
+FILE 1+2 ID | X | Y
+
+
+
+
+ UMLClass
+
+ 664
+ 2248
+ 136
+ 64
+
+ Load Data (File)
+halign=left
+
+
+
+ UMLClass
+
+ 664
+ 1888
+ 160
+ 232
+
+ List of Files loaded
++ File 1
++ File 2
+halign=left
+
+
+
+ UMLClass
+
+ 912
+ 2240
+ 64
+ 32
+
+ Search
+
+
+
+ UMLClass
+
+ 912
+ 2296
+ 80
+ 72
+
+ Integrate
+1
+2
+3
+4
+halign=left
+
+
+
+ UMLClass
+
+ 1304
+ 2248
+ 72
+ 32
+
+ Q-Maps
+
+
+
+ UMLClass
+
+ 1280
+ 2296
+ 96
+ 32
+
+ Plot Data VS
+
+
+
+ UMLClass
+
+ 1264
+ 1880
+ 256
+ 304
halign=left
@@ -766,34 +1062,322 @@ e.g. integration
UMLClass
- 1280
- 1456
- 200
+ 976
+ 2240
+ 64
+ 32
+
+ Add
+
+
+
+ UMLClass
+
+ 1048
+ 2240
+ 80
+ 32
+
+ Substract
+
+
+
+ UMLClass
+
+ 1152
+ 2240
+ 72
+ 88
+
+ Save
+
+
+
+ UMLClass
+
+ 992
+ 2296
+ 64
+ 32
+
+ Lorentz
+
+
+
+ UMLClass
+
+ 1056
+ 2296
+ 80
32
- Very Special Button
+ Absorption
+
+
+
+ UMLClass
+
+ 1408
+ 2240
+ 72
+ 88
+
+ Save
+
+
+
+ UMLClass
+
+ 728
+ 2528
+ 48
+ 16
+
+ fg=#449944
+COL 0
+valign=top
+halign=left
+
+group=14
Relation
- 1472
- 1456
- 104
- 48
+ 744
+ 2488
+ 24
+ 56
- lt=<.
- 110.0;10.0;80.0;40.0;10.0;20.0
+ lt=<<-
+fg=#449944
+group=14
+ 10.0;10.0;10.0;50.0
Relation
- 1472
- 1304
- 552
- 256
+ 464
+ 1984
+ 56
+ 24
- lt=<.
- 670.0;10.0;590.0;300.0;10.0;220.0
+ lt=<<-
+fg=#449944
+group=15
+ 50.0;10.0;10.0;10.0
+
+
+ UMLClass
+
+ 416
+ 1984
+ 56
+ 16
+
+ fg=#449944
+ROW 0
+valign=top
+halign=left
+
+group=15
+
+
+
+ Relation
+
+ 472
+ 2280
+ 56
+ 24
+
+ lt=<<-
+fg=#449944
+group=16
+ 50.0;10.0;10.0;10.0
+
+
+ UMLClass
+
+ 424
+ 2280
+ 56
+ 16
+
+ fg=#449944
+ROW 1
+valign=top
+halign=left
+
+group=16
+
+
+
+ UMLClass
+
+ 632
+ 1288
+ 136
+ 24
+
+ Load Instrumentfile
+halign=left
+
+
+
+ UMLClass
+
+ 872
+ 1504
+ 64
+ 64
+
+ Prepare
+
+
+
+ UMLClass
+
+ 656
+ 480
+ 136
+ 24
+
+ Load Crystal File
+halign=left
+
+
+
+ UMLClass
+
+ 656
+ 520
+ 136
+ 24
+
+ Load Instrumentfile
+halign=left
+
+
+
+ UMLClass
+
+ 1512
+ 472
+ 328
+ 240
+
+ Mag Table
+1.1.3
+
+generated by code
+(called by button prepare sector)
+
+columns= {h,k,l} and others (see 1.1.4)
+
+1.1.4
+sort ascending , descending
+
+
+
+ UMLClass
+
+ 800
+ 728
+ 64
+ 40
+
+ Prepare
+
+
+
+ UMLClass
+
+ 1912
+ 480
+ 328
+ 240
+
+ Mag Table
+1.1.3
+
+generated by code
+(called by button prepare sector)
+
+columns= {h,k,l} and others (see 1.1.4)
+
+1.1.4
+sort ascending , descending
+
+
+
+ UMLClass
+
+ 1944
+ 744
+ 56
+ 32
+
+ Sort
+
+
+
+ UMLClass
+
+ 2040
+ 744
+ 80
+ 32
+
+ Optimize
+
+
+
+ UMLClass
+
+ 2152
+ 752
+ 72
+ 64
+
+ Save
+
+
+
+ UMLClass
+
+ 1296
+ 440
+ 976
+ 424
+
+
+layer=-1
+fg=blue
+
+
+
+ UMLClass
+
+ 1328
+ 504
+ 136
+ 24
+
+ Load Instrumentfile
+halign=left
+
+
+
+ UMLClass
+
+ 1328
+ 464
+ 136
+ 24
+
+ Load Crystal File
+halign=left
+