Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
63f797e7
Commit
63f797e7
authored
Mar 18, 2021
by
daniel.bub
Browse files
Merge remote-tracking branch 'origin/sprint_5' into top2021s5/#132_detect_column_types
parents
8e2edfe9
51b3142c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
src/modules/filterProtonData/propertyHandler/WFilterPropertyHandler.cpp
...lterProtonData/propertyHandler/WFilterPropertyHandler.cpp
+6
-0
src/modules/writeProtonCSV/test/WMWriteCSV_test.h
src/modules/writeProtonCSV/test/WMWriteCSV_test.h
+1
-1
No files found.
src/modules/filterProtonData/propertyHandler/WFilterPropertyHandler.cpp
View file @
63f797e7
...
...
@@ -195,6 +195,12 @@ void WFilterPropertyHandler::createPropToSetParticleNames()
std
::
string
WFilterPropertyHandler
::
setDefaultForRenameField
()
{
WItemSelector
selectedPdg
=
m_PdgForRenameSelection
->
get
(
true
);
if
(
selectedPdg
.
empty
()
)
{
return
""
;
}
std
::
string
particleName
=
selectedPdg
.
at
(
0
)
->
getName
();
return
particleName
.
substr
(
0
,
particleName
.
find
(
" ("
)
);
}
...
...
src/modules/writeProtonCSV/test/WMWriteCSV_test.h
View file @
63f797e7
...
...
@@ -135,7 +135,7 @@ private:
fiberStartIndexes
->
push_back
(
fiberStartIndex
);
//calculate fibers
for
(
in
t
eID
:
*
eventIDs
)
for
(
size_
t
eID
:
*
eventIDs
)
{
if
(
currentEventID
!=
eID
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment