Skip to content

Commit 51a7dcc

Browse files
marinerhemantmarinerhemant
committed
Corrections to qt guis
1 parent f6ad454 commit 51a7dcc

2 files changed

Lines changed: 30 additions & 29 deletions

File tree

‎gui/ff_asym_qt.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -492,12 +492,12 @@ def _build_file_panel(self):
492492

493493
lay.addWidget(QtWidgets.QLabel("FileNr"), 1, 0)
494494
self.file_nr_edit = QtWidgets.QLineEdit(str(self.first_file_nr))
495-
self.file_nr_edit.setMaximumWidth(60)
495+
self.file_nr_edit.setMinimumWidth(70)
496496
lay.addWidget(self.file_nr_edit, 1, 1)
497497

498498
lay.addWidget(QtWidgets.QLabel("nFr/File"), 1, 2)
499499
self.nframes_edit = QtWidgets.QLineEdit("1")
500-
self.nframes_edit.setMaximumWidth(60)
500+
self.nframes_edit.setMinimumWidth(70)
501501
lay.addWidget(self.nframes_edit, 1, 3)
502502

503503
lay.addWidget(QtWidgets.QLabel("H5 Data"), 2, 0)
@@ -521,22 +521,22 @@ def _build_image_panel(self):
521521

522522
lay.addWidget(QtWidgets.QLabel("NrPixH"), 0, 0)
523523
self.nz_edit = QtWidgets.QLineEdit(str(self.nz))
524-
self.nz_edit.setMaximumWidth(60)
524+
self.nz_edit.setMinimumWidth(70)
525525
lay.addWidget(self.nz_edit, 0, 1)
526526

527527
lay.addWidget(QtWidgets.QLabel("NrPixV"), 1, 0)
528528
self.ny_edit = QtWidgets.QLineEdit(str(self.ny))
529-
self.ny_edit.setMaximumWidth(60)
529+
self.ny_edit.setMinimumWidth(70)
530530
lay.addWidget(self.ny_edit, 1, 1)
531531

532532
lay.addWidget(QtWidgets.QLabel("Header"), 2, 0)
533533
self.header_edit = QtWidgets.QLineEdit(str(self.header_size))
534-
self.header_edit.setMaximumWidth(60)
534+
self.header_edit.setMinimumWidth(70)
535535
lay.addWidget(self.header_edit, 2, 1)
536536

537537
lay.addWidget(QtWidgets.QLabel("Byt/Px"), 3, 0)
538538
self.bpp_edit = QtWidgets.QLineEdit(str(self.bytes_per_pixel))
539-
self.bpp_edit.setMaximumWidth(60)
539+
self.bpp_edit.setMinimumWidth(70)
540540
lay.addWidget(self.bpp_edit, 3, 1)
541541

542542
self.hflip_check = QtWidgets.QCheckBox("HFlip")
@@ -548,7 +548,7 @@ def _build_image_panel(self):
548548

549549
lay.addWidget(QtWidgets.QLabel("PixSz(μm)"), 6, 0)
550550
self.px_edit = QtWidgets.QLineEdit(str(self.pixel_size))
551-
self.px_edit.setMaximumWidth(60)
551+
self.px_edit.setMinimumWidth(70)
552552
lay.addWidget(self.px_edit, 6, 1)
553553

554554
return grp
@@ -576,12 +576,12 @@ def _build_display_panel(self):
576576

577577
lay.addWidget(QtWidgets.QLabel("MinI"), 4, 0)
578578
self.min_intensity_edit = QtWidgets.QLineEdit("0")
579-
self.min_intensity_edit.setMaximumWidth(70)
579+
self.min_intensity_edit.setMinimumWidth(80)
580580
lay.addWidget(self.min_intensity_edit, 4, 1)
581581

582582
lay.addWidget(QtWidgets.QLabel("MaxI"), 4, 2)
583583
self.max_intensity_edit = QtWidgets.QLineEdit("1000")
584-
self.max_intensity_edit.setMaximumWidth(70)
584+
self.max_intensity_edit.setMinimumWidth(80)
585585
lay.addWidget(self.max_intensity_edit, 5, 0)
586586

587587
apply_btn = QtWidgets.QPushButton("Apply")
@@ -604,17 +604,17 @@ def _build_processing_panel(self):
604604

605605
lay.addWidget(QtWidgets.QLabel("Lsd"), 1, 0)
606606
self.lsd_edit = QtWidgets.QLineEdit(str(self.lsd_local))
607-
self.lsd_edit.setMaximumWidth(100)
607+
self.lsd_edit.setMinimumWidth(100)
608608
lay.addWidget(self.lsd_edit, 1, 1)
609609

610610
lay.addWidget(QtWidgets.QLabel("BC_Y"), 2, 0)
611611
self.bcy_edit = QtWidgets.QLineEdit(str(self.bc_local[0]))
612-
self.bcy_edit.setMaximumWidth(80)
612+
self.bcy_edit.setMinimumWidth(90)
613613
lay.addWidget(self.bcy_edit, 2, 1)
614614

615615
lay.addWidget(QtWidgets.QLabel("BC_Z"), 3, 0)
616616
self.bcz_edit = QtWidgets.QLineEdit(str(self.bc_local[1]))
617-
self.bcz_edit.setMaximumWidth(80)
617+
self.bcz_edit.setMinimumWidth(90)
618618
lay.addWidget(self.bcz_edit, 3, 1)
619619

620620
return grp
@@ -1172,7 +1172,7 @@ def _build_material_page(self):
11721172
lay.addRow("Wavelength (Å) or Energy (keV):", self.wl_edit)
11731173
lc_row = QtWidgets.QHBoxLayout()
11741174
for e in self.lc_edits:
1175-
e.setMaximumWidth(60)
1175+
e.setMinimumWidth(70)
11761176
lc_row.addWidget(e)
11771177
lay.addRow("Lattice Const (Å):", lc_row)
11781178
lay.addRow("Lsd (μm):", self.lsd_edit)

‎gui/nf_qt.py‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def _build_file_panel(self):
340340

341341
lay.addWidget(QtWidgets.QLabel("Folder"), 0, 1)
342342
self.folder_edit = QtWidgets.QLineEdit(self.folder)
343-
self.folder_edit.setMaximumWidth(150)
343+
self.folder_edit.setMinimumWidth(160)
344344
lay.addWidget(self.folder_edit, 0, 2)
345345

346346
btn_browse = QtWidgets.QPushButton("Browse")
@@ -349,17 +349,17 @@ def _build_file_panel(self):
349349

350350
lay.addWidget(QtWidgets.QLabel("FNStem"), 0, 4)
351351
self.fnstem_edit = QtWidgets.QLineEdit(self.fnstem)
352-
self.fnstem_edit.setMaximumWidth(120)
352+
self.fnstem_edit.setMinimumWidth(120)
353353
lay.addWidget(self.fnstem_edit, 0, 5)
354354

355355
lay.addWidget(QtWidgets.QLabel("NrPixY"), 1, 0)
356356
self.ny_edit = QtWidgets.QLineEdit(str(self.ny))
357-
self.ny_edit.setMaximumWidth(60)
357+
self.ny_edit.setMinimumWidth(70)
358358
lay.addWidget(self.ny_edit, 1, 1)
359359

360360
lay.addWidget(QtWidgets.QLabel("NrPixZ"), 1, 2)
361361
self.nz_edit = QtWidgets.QLineEdit(str(self.nz))
362-
self.nz_edit.setMaximumWidth(60)
362+
self.nz_edit.setMinimumWidth(70)
363363
lay.addWidget(self.nz_edit, 1, 3)
364364
return grp
365365

@@ -379,17 +379,17 @@ def _build_image_panel(self):
379379

380380
lay.addWidget(QtWidgets.QLabel("nDist"), 0, 4)
381381
self.ndist_edit = QtWidgets.QLineEdit(str(self.n_distances))
382-
self.ndist_edit.setMaximumWidth(30)
382+
self.ndist_edit.setMinimumWidth(50)
383383
lay.addWidget(self.ndist_edit, 0, 5)
384384

385385
lay.addWidget(QtWidgets.QLabel("nFl/D"), 0, 6)
386386
self.nfiles_edit = QtWidgets.QLineEdit(str(self.n_files_per_dist))
387-
self.nfiles_edit.setMaximumWidth(40)
387+
self.nfiles_edit.setMinimumWidth(55)
388388
lay.addWidget(self.nfiles_edit, 0, 7)
389389

390390
lay.addWidget(QtWidgets.QLabel("PxSz"), 1, 0)
391391
self.px_edit = QtWidgets.QLineEdit(str(self.pixel_size))
392-
self.px_edit.setMaximumWidth(50)
392+
self.px_edit.setMinimumWidth(60)
393393
lay.addWidget(self.px_edit, 1, 1)
394394
return grp
395395

@@ -399,7 +399,7 @@ def _build_processing_panel(self):
399399

400400
lay.addWidget(QtWidgets.QLabel("StartNr"), 0, 0)
401401
self.startframe_edit = QtWidgets.QLineEdit(str(self.start_frame_nr))
402-
self.startframe_edit.setMaximumWidth(50)
402+
self.startframe_edit.setMinimumWidth(60)
403403
lay.addWidget(self.startframe_edit, 0, 1)
404404

405405
btn_median = QtWidgets.QPushButton("CalcMedian")
@@ -414,17 +414,17 @@ def _build_processing_panel(self):
414414

415415
lay.addWidget(QtWidgets.QLabel("Lsd(μm)"), 1, 0)
416416
self.lsd_edit = QtWidgets.QLineEdit(str(self.lsd))
417-
self.lsd_edit.setMaximumWidth(80)
417+
self.lsd_edit.setMinimumWidth(90)
418418
lay.addWidget(self.lsd_edit, 1, 1, 1, 2)
419419

420420
lay.addWidget(QtWidgets.QLabel("MinI"), 2, 0)
421421
self.min_intensity_edit = QtWidgets.QLineEdit("0")
422-
self.min_intensity_edit.setMaximumWidth(60)
422+
self.min_intensity_edit.setMinimumWidth(70)
423423
lay.addWidget(self.min_intensity_edit, 2, 1)
424424

425425
lay.addWidget(QtWidgets.QLabel("MaxI"), 2, 2)
426426
self.max_intensity_edit = QtWidgets.QLineEdit("1000")
427-
self.max_intensity_edit.setMaximumWidth(60)
427+
self.max_intensity_edit.setMinimumWidth(70)
428428
lay.addWidget(self.max_intensity_edit, 2, 3)
429429

430430
apply_btn = QtWidgets.QPushButton("Apply")
@@ -491,10 +491,10 @@ def _build_mic_panel(self):
491491

492492
lay.addWidget(QtWidgets.QLabel("ConfCut"), row, 0)
493493
self.cut_conf_edit = QtWidgets.QLineEdit("0")
494-
self.cut_conf_edit.setMaximumWidth(40)
494+
self.cut_conf_edit.setMinimumWidth(55)
495495
lay.addWidget(self.cut_conf_edit, row, 1)
496496
self.max_conf_edit = QtWidgets.QLineEdit("1")
497-
self.max_conf_edit.setMaximumWidth(40)
497+
self.max_conf_edit.setMinimumWidth(55)
498498
lay.addWidget(self.max_conf_edit, row, 2)
499499

500500
btn_grain = QtWidgets.QPushButton("LoadGrain")
@@ -692,6 +692,7 @@ def _load_and_display(self):
692692
else:
693693
self.imarr2 = imarr
694694

695+
self.imarr2 = self.imarr2[::-1, ::-1].copy()
695696
self.image_view.set_image_data(self.imarr2.astype(float))
696697
self.frame_label.setText(f"Frame {self.frame_nr} Dist {self.dist}")
697698

@@ -1072,7 +1073,7 @@ def _build_ui(self):
10721073
self.om_edits = []
10731074
for i in range(9):
10741075
e = QtWidgets.QLineEdit(str(self.viewer.om[i]))
1075-
e.setMaximumWidth(65)
1076+
e.setMinimumWidth(75)
10761077
om_row.addWidget(e)
10771078
self.om_edits.append(e)
10781079
lay.addRow("Orient. Matrix:", om_row)
@@ -1082,7 +1083,7 @@ def _build_ui(self):
10821083
self.pos_edits = []
10831084
for i in range(3):
10841085
e = QtWidgets.QLineEdit(str(self.viewer.pos[i]))
1085-
e.setMaximumWidth(80)
1086+
e.setMinimumWidth(90)
10861087
pos_row.addWidget(e)
10871088
self.pos_edits.append(e)
10881089
lay.addRow("Position (μm):", pos_row)
@@ -1092,7 +1093,7 @@ def _build_ui(self):
10921093
self.lc_edits = []
10931094
for i in range(6):
10941095
e = QtWidgets.QLineEdit(str(self.viewer.latC[i]))
1095-
e.setMaximumWidth(65)
1096+
e.setMinimumWidth(75)
10961097
lc_row.addWidget(e)
10971098
self.lc_edits.append(e)
10981099
lay.addRow("Lattice Const:", lc_row)

0 commit comments

Comments
 (0)