Skip to content

Commit b8c2eab

Browse files
committed
Small changes.
Slightly fixup color selector to hopefully display better. Fix button displaying in file query widget. Force macOS quick look to be arm and x64. Add link to "Isotopics by nuclides" to documentation.
1 parent eac2fed commit b8c2eab

File tree

6 files changed

+21
-13
lines changed

6 files changed

+21
-13
lines changed

InterSpec_resources/MakeDrf.css

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,9 @@
100100
height: 28px;
101101
vertical-align: middle;
102102
margin-bottom: 3px;
103-
}
104-
105-
.DrfPeak > span, .DrfPeak > label {
106-
display: inline-block;
107-
padding-top: 6px;
103+
display: flex;
104+
flex-direction: row;
105+
align-items: center;
108106
}
109107

110108
.DrfPeakUseCb {
@@ -132,7 +130,7 @@
132130

133131

134132
.DrfPeakShowChart, .DrfPeakShowChart:hover {
135-
display: inline-block;
133+
/* display: inline-block; */
136134
background: none;
137135
border: none;
138136
outline: none;
@@ -143,9 +141,8 @@
143141
/* position: absolute;
144142
right: 20px;
145143
*/
146-
float: right;
147144
margin-right: 0.5em;
148-
margin-top: 5px;
145+
margin-left: auto;
149146
}
150147

151148
.DrfPeakShowChart.active {

InterSpec_resources/static_text/help.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
},
121121
{
122122
"id":"rel-act-dialog",
123-
"title":"Relative Activity Isotopics",
123+
"title":"Isotopics by nuclides",
124124
"help-xml":"rel_act_help.xml",
125125
"keywords":"Relative Activity Efficiency Isotopics"
126126
},
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<div align="center">
22
<h1 id="rel-act-dialog">
3-
<b>Relative Activity Isotopics Tool</b>
3+
<b>Isotopics by nuclides</b>
44
</h1>
55
<hr />
66
</div>
77

88

99
<div style="display:table-row">
1010
<h4>Overview</h4>
11-
The <em>Relative Activity Isotopics Tool</em> is under active development, and is not suitable for general use yet, and documentation or use instructions has not been created.
11+
Please see use instructions and information
12+
at <a href="https://sandialabs.github.io/InterSpec/tutorials/#enrichment-and-isotopics-by-nuclides-tool-sep-2025" target="_blank">https://sandialabs.github.io/InterSpec/tutorials/#enrichment-and-isotopics-by-nuclides-tool-sep-2025</a>
1213
</div>
1314

src/ColorSelect.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,16 @@ ColorSelect::ColorSelect( Wt::WFlags<ColorSelectOptions> options, Wt::WContainer
173173
{
174174
wApp->require( "InterSpec_resources/assets/js/spectrum_1.8.0/spectrum.min.js" );
175175
wApp->useStyleSheet( "InterSpec_resources/assets/js/spectrum_1.8.0/spectrum.min.css" );
176-
176+
177+
WCssStyleSheet &style = wApp->styleSheet();
178+
const string rulename = "ColorPickStyle";
179+
if( !style.isDefined(rulename) )
180+
{
181+
style.addRule( "div.sp-replacer.sp-light, div.sp-replacer.sp-dark",
182+
"display: flex; flex-direction: row; flex-wrap: nowrap; overflow: unset; flex-wrap: nowrap; margin-right: 2px;",
183+
rulename );
184+
}
185+
177186
string init_js = "$('#" + id() + "').spectrum({"
178187
"showSelectionPalette: true, "
179188
//"showInitial: true, "

src/SpecFileQueryWidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1540,7 +1540,7 @@ void SpecFileQueryWidget::init()
15401540
m_optionsBtn->addStyleClass( "SpecFileQueryOptionsBtn" );
15411541

15421542
m_optionsMenu = new PopupDivMenu( m_optionsBtn, PopupDivMenu::MenuType::TransientMenu );
1543-
linelayout->addWidget( m_optionsBtn, 0, 1 );
1543+
linelayout->addWidget( m_optionsBtn, 0, 1, AlignMiddle );
15441544

15451545
auto item = m_optionsMenu->addMenuItem( "recursive" );
15461546
item->setCheckable( true );

target/macOsQuickLook/SpecFilePreview/SpecFilePreview/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ project( SpecFilePreview )
66
set( CMAKE_CXX_STANDARD 14 )
77
set( CMAKE_CXX_STANDARD_REQUIRED ON )
88

9+
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
910

1011
find_package( ZLIB REQUIRED )
1112
find_package( Threads REQUIRED )

0 commit comments

Comments
 (0)