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
685da7f2
Commit
685da7f2
authored
Mar 18, 2021
by
hungdangquoc
Browse files
[ADD
#132
] default state for single-selector-content
parent
d738a486
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
1 deletion
+20
-1
src/modules/filterProtonData/WDatatype.cpp
src/modules/filterProtonData/WDatatype.cpp
+5
-0
src/modules/filterProtonData/WDatatype.h
src/modules/filterProtonData/WDatatype.h
+6
-0
src/modules/filterProtonData/WProtonData.cpp
src/modules/filterProtonData/WProtonData.cpp
+5
-0
src/modules/filterProtonData/WSingleSelectorName.cpp
src/modules/filterProtonData/WSingleSelectorName.cpp
+1
-1
src/modules/filterProtonData/propertyHandler/WColumnPropertyHandler.h
...filterProtonData/propertyHandler/WColumnPropertyHandler.h
+3
-0
No files found.
src/modules/filterProtonData/WDatatype.cpp
View file @
685da7f2
...
...
@@ -40,3 +40,8 @@ std::string WDatatype::getString()
{
return
"string"
;
}
std
::
string
WDatatype
::
getDefault
()
{
return
"default"
;
}
\ No newline at end of file
src/modules/filterProtonData/WDatatype.h
View file @
685da7f2
...
...
@@ -50,6 +50,12 @@ public:
* \return datatype string as string
*/
static
std
::
string
getString
();
/**
* getter
* \return default as string
*/
static
std
::
string
getDefault
();
};
#endif // WDATATYPE_H
src/modules/filterProtonData/WProtonData.cpp
View file @
685da7f2
...
...
@@ -161,6 +161,11 @@ std::vector< std::string > WProtonData::getHeaderFromType( std::string typeName
std
::
vector
<
std
::
string
>
columnTypes
=
*
m_columnTypes
;
std
::
vector
<
std
::
string
>
filterHeader
;
if
(
typeName
==
WDatatype
::
getDefault
()
)
{
return
header
;
}
for
(
size_t
i
=
0
;
i
<
columnTypes
.
size
();
i
++
)
{
if
(
columnTypes
[
i
]
==
typeName
)
...
...
src/modules/filterProtonData/WSingleSelectorName.cpp
View file @
685da7f2
...
...
@@ -86,7 +86,7 @@ WSingleSelectorName::NameDescriptionSearchTyp WSingleSelectorName::getZwithDescr
getZ
(),
"Choose the column which should be used to determine the z coordinate."
,
"posZ"
,
WDatatype
::
getD
ouble
()
);
WDatatype
::
getD
efault
()
);
}
WSingleSelectorName
::
NameDescriptionSearchTyp
WSingleSelectorName
::
getPDGwithDescription
()
...
...
src/modules/filterProtonData/propertyHandler/WColumnPropertyHandler.h
View file @
685da7f2
...
...
@@ -35,9 +35,12 @@
#include "core/common/WItemSelectionItemTyped.h"
#include "../WDatatype.h"
#include "../WProtonData.h"
#include "../WSingleSelectorName.h"
/**
* Creates, updates and handles the column properties.
*/
...
...
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