Skip to content

Commit c119454

Browse files
committed
Fix some CSS, and remove some debug messages.
Removed border from SimpleDialog. Fix "Spectrum Files" tab for/back/second. boxes from breaking free of grid with spectra with long titles. Remove some debug output from energy cal tool.
1 parent 02cd64f commit c119454

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

InterSpec_resources/CompactFileManager.css

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
.CompactFileManager.LeftToRight{
1313
display: grid;
14-
grid-template-columns: 1fr 1fr 1fr;
14+
/* We need to keep too long of file selectors of titles from forcing each display from overgrowing its allotted 1/3 of width. */
15+
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr);
1516
grid-column-gap: 5px;
1617
grid-auto-rows: minmax(100px, auto) 23px;
1718
}
@@ -68,13 +69,8 @@ div.DispType > div {
6869
div.DispType .SpecFileSelect{
6970
padding-left: 5px;
7071
padding-right: 5px;
71-
display: flex;
72-
7372
}
7473

75-
div.DispType .SpecFileSelect > select{
76-
flex-grow: 1;
77-
}
7874

7975
div.DispType div.SampleSelectRow {
8076
display: flex;
@@ -107,6 +103,8 @@ div.SampleSelectRow .NextNextSample{
107103

108104
div.DispType .SpecTitle {
109105
margin-top: 15px;
106+
/* white-space: nowrap; */ /* having the title be a single line with ellipses doesnt seem to work quite right */
107+
text-overflow: ellipsis;
110108
}
111109

112110
div.DispType .BottomRow {

InterSpec_resources/SimpleDialog.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.simple-dialog
22
{
3+
border: none;
34
font-size: 16px;
45
background-color: #fff;
56
border-radius: 10px;

src/EnergyCalTool.cpp

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2889,7 +2889,7 @@ void EnergyCalTool::doRefreshFromFiles()
28892889

28902890
if( !m_specTypeMenu )
28912891
{
2892-
cout << "needStackRefresh: m_specTypeMenu == nullptr" << endl;
2892+
//cout << "needStackRefresh: m_specTypeMenu == nullptr" << endl;
28932893
needStackRefresh = true;
28942894
}
28952895

@@ -2898,24 +2898,24 @@ void EnergyCalTool::doRefreshFromFiles()
28982898
WMenuItem *typeItem = m_specTypeMenu->itemAt(i);
28992899
if( !typeItem )
29002900
{
2901+
//cout << "needStackRefresh: !typeItem" << endl;
29012902
needStackRefresh = true;
2902-
cout << "needStackRefresh: !typeItem" << endl;
29032903
continue;
29042904
}
29052905

29062906
WMenu *detMenu = m_detectorMenu[(specTypeInForgrndMenu ? 0 : i)];
29072907

29082908
if( !detMenu )
29092909
{
2910+
//cout << "needStackRefresh: !detMenu" << endl;
29102911
needStackRefresh = true;
2911-
cout << "needStackRefresh: !detMenu" << endl;
29122912
continue;
29132913
}
29142914

29152915
if( !specTypeInForgrndMenu && ((!detMenu) != (!specfiles[i])) )
29162916
{
2917+
//cout << "needStackRefresh: (!detMenu != !specfiles[i])" << endl;
29172918
needStackRefresh = true;
2918-
cout << "needStackRefresh: (!detMenu != !specfiles[i])" << endl;
29192919
continue;
29202920
}
29212921

@@ -2931,8 +2931,8 @@ void EnergyCalTool::doRefreshFromFiles()
29312931
needStackRefresh = !(item && (item->text() == WString(spec_type_labels_vert[i])));
29322932
}
29332933

2934-
if( needStackRefresh )
2935-
cout << "needStackRefresh: Did not have a menu entry for specfile[" << i << "]" << endl;
2934+
//if( needStackRefresh )
2935+
// cout << "needStackRefresh: Did not have a menu entry for specfile[" << i << "]" << endl;
29362936
}else
29372937
{
29382938
//Make sure none of the widgets have spec_type_labels_vert[i] in them
@@ -2942,8 +2942,8 @@ void EnergyCalTool::doRefreshFromFiles()
29422942
needStackRefresh = (!item || (item->text() == WString(spec_type_labels_vert[i])));
29432943
}
29442944

2945-
if( needStackRefresh )
2946-
cout << "needStackRefresh: For empty place " << i << " had a menu entry, but no spectrum file" << endl;
2945+
//if( needStackRefresh )
2946+
// cout << "needStackRefresh: For empty place " << i << " had a menu entry, but no spectrum file" << endl;
29472947
}//if( specfiles[i] ) / else
29482948
}else
29492949
{
@@ -2962,16 +2962,16 @@ void EnergyCalTool::doRefreshFromFiles()
29622962
{
29632963
//If there is no spectrum file for index i, item should be hidden, and if not need a refresh
29642964
needStackRefresh = !item->isHidden();
2965-
if( needStackRefresh )
2966-
cout << "needStackRefresh: item is not hidden for missing spectrum " << i << endl;
2965+
//if( needStackRefresh )
2966+
// cout << "needStackRefresh: item is not hidden for missing spectrum " << i << endl;
29672967
continue;
29682968
}//if( !specfiles[i] )
29692969

29702970
if( item->isHidden() )
29712971
{
29722972
//If item is hidden, but here we do have a spectrum file, we need a refresh
2973+
//cout << "needStackRefresh: item is hidden for " << i << endl;
29732974
needStackRefresh = true;
2974-
cout << "needStackRefresh: item is hidden for " << i << endl;
29752975
continue;
29762976
}//if( item->isHidden() )
29772977

@@ -2986,8 +2986,8 @@ void EnergyCalTool::doRefreshFromFiles()
29862986
}//for( int j = 0; j < detMenu->count(); ++j )
29872987

29882988
needStackRefresh = (detsInMenu != disp_det_names[i]);
2989-
if( needStackRefresh )
2990-
cout << "needStackRefresh: New det names dont equal old for type=" << i << endl;
2989+
//if( needStackRefresh )
2990+
// cout << "needStackRefresh: New det names dont equal old for type=" << i << endl;
29912991
}//if( specTypeInForgrndMenu ) / else
29922992
}//for( int i = 0; i < 3; ++i )
29932993

@@ -3002,12 +3002,11 @@ void EnergyCalTool::doRefreshFromFiles()
30023002

30033003
if( !m_specTypeMenu || (m_specTypeMenu->isHidden() != hideSpecType) )
30043004
{
3005+
//cout << "needStackRefresh: m_specTypeMenu->isHidden() != hideSpecType" << endl;
30053006
needStackRefresh = true;
3006-
cout << "needStackRefresh: m_specTypeMenu->isHidden() != hideSpecType" << endl;
30073007
}
30083008

3009-
3010-
cout << "needStackRefresh=" << needStackRefresh << endl;
3009+
//cout << "needStackRefresh=" << needStackRefresh << endl;
30113010

30123011
// TODO: instead of the above logic to catch when we need to refresh (\e.g., create all new)
30133012
// widgets, should combine it with the logic to create new widgets, but only delte or create

0 commit comments

Comments
 (0)