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
ed245f90
Commit
ed245f90
authored
Mar 18, 2021
by
daniel.bub
Browse files
[REFAC
#132
] rename WDatatype to WDataType
parent
375bbe0b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
43 additions
and
43 deletions
+43
-43
src/modules/filterProtonData/WDataType.cpp
src/modules/filterProtonData/WDataType.cpp
+5
-5
src/modules/filterProtonData/WDataType.h
src/modules/filterProtonData/WDataType.h
+1
-1
src/modules/filterProtonData/WProtonData.cpp
src/modules/filterProtonData/WProtonData.cpp
+6
-6
src/modules/filterProtonData/WProtonData.h
src/modules/filterProtonData/WProtonData.h
+1
-1
src/modules/filterProtonData/WSingleSelectorName.cpp
src/modules/filterProtonData/WSingleSelectorName.cpp
+27
-27
src/modules/filterProtonData/WSingleSelectorName.h
src/modules/filterProtonData/WSingleSelectorName.h
+1
-1
src/modules/filterProtonData/propertyHandler/WColumnPropertyHandler.cpp
...lterProtonData/propertyHandler/WColumnPropertyHandler.cpp
+1
-1
src/modules/filterProtonData/propertyHandler/WColumnPropertyHandler.h
...filterProtonData/propertyHandler/WColumnPropertyHandler.h
+1
-1
No files found.
src/modules/filterProtonData/WData
t
ype.cpp
→
src/modules/filterProtonData/WData
T
ype.cpp
View file @
ed245f90
...
...
@@ -24,24 +24,24 @@
#include <string>
#include "WData
t
ype.h"
#include "WData
T
ype.h"
std
::
string
WData
t
ype
::
getInt
()
std
::
string
WData
T
ype
::
getInt
()
{
return
"int"
;
}
std
::
string
WData
t
ype
::
getDouble
()
std
::
string
WData
T
ype
::
getDouble
()
{
return
"double"
;
}
std
::
string
WData
t
ype
::
getString
()
std
::
string
WData
T
ype
::
getString
()
{
return
"string"
;
}
std
::
string
WData
t
ype
::
getDefault
()
std
::
string
WData
T
ype
::
getDefault
()
{
return
"default"
;
}
\ No newline at end of file
src/modules/filterProtonData/WData
t
ype.h
→
src/modules/filterProtonData/WData
T
ype.h
View file @
ed245f90
...
...
@@ -30,7 +30,7 @@
/**
* Holds the datatypes as string
*/
class
WData
t
ype
class
WData
T
ype
{
public:
/**
...
...
src/modules/filterProtonData/WProtonData.cpp
View file @
ed245f90
...
...
@@ -138,11 +138,11 @@ void WProtonData::detectColumnTypesFromCsvData( WDataSetCSV::ContentSPtr csvData
for
(
size_t
idx
=
0
;
idx
<
m_columnTypes
->
size
();
idx
++
)
{
if
(
m_columnTypes
->
at
(
idx
)
==
WData
t
ype
::
getDouble
()
)
if
(
m_columnTypes
->
at
(
idx
)
==
WData
T
ype
::
getDouble
()
)
{
if
(
checkIfDoubleColumnCanBeInteger
(
idx
)
)
{
m_columnTypes
->
at
(
idx
)
=
WData
t
ype
::
getInt
();
m_columnTypes
->
at
(
idx
)
=
WData
T
ype
::
getInt
();
}
}
}
...
...
@@ -155,15 +155,15 @@ std::string WProtonData::determineColumnTypeByString( std::string cellValue )
if
(
std
::
regex_search
(
cellValue
,
regexInt
)
)
{
return
WData
t
ype
::
getInt
();
return
WData
T
ype
::
getInt
();
}
else
if
(
std
::
regex_search
(
cellValue
,
regexDouble
)
)
{
return
WData
t
ype
::
getDouble
();
return
WData
T
ype
::
getDouble
();
}
else
{
return
WData
t
ype
::
getString
();
return
WData
T
ype
::
getString
();
}
}
...
...
@@ -192,7 +192,7 @@ std::vector< std::string > WProtonData::getHeaderFromType( std::string typeName
std
::
vector
<
std
::
string
>
columnTypes
=
*
m_columnTypes
;
std
::
vector
<
std
::
string
>
filterHeader
;
if
(
typeName
==
WData
t
ype
::
getDefault
()
)
if
(
typeName
==
WData
T
ype
::
getDefault
()
)
{
return
header
;
}
...
...
src/modules/filterProtonData/WProtonData.h
View file @
ed245f90
...
...
@@ -31,7 +31,7 @@
#include <vector>
#include "core/dataHandler/WDataSetCSV.h"
#include "WData
t
ype.h"
#include "WData
T
ype.h"
/**
...
...
src/modules/filterProtonData/WSingleSelectorName.cpp
View file @
ed245f90
...
...
@@ -25,7 +25,7 @@
#include <list>
#include <string>
#include "WData
t
ype.h"
#include "WData
T
ype.h"
#include "WSingleSelectorName.h"
std
::
string
WSingleSelectorName
::
getX
()
...
...
@@ -66,67 +66,67 @@ std::string WSingleSelectorName::getParentId()
WSingleSelectorName
::
NameDescriptionSearchTyp
WSingleSelectorName
::
getXwithDescription
()
{
return
WSingleSelectorName
::
NameDescriptionSearchTyp
(
getX
(),
"Choose the column which should be used to determine the x coordinate."
,
"posX"
,
WData
t
ype
::
getDouble
()
);
getX
(),
"Choose the column which should be used to determine the x coordinate."
,
"posX"
,
WData
T
ype
::
getDouble
()
);
}
WSingleSelectorName
::
NameDescriptionSearchTyp
WSingleSelectorName
::
getYwithDescription
()
{
return
WSingleSelectorName
::
NameDescriptionSearchTyp
(
getY
(),
"Choose the column which should be used to determine the y coordinate."
,
"posY"
,
WData
t
ype
::
getDouble
()
);
getY
(),
"Choose the column which should be used to determine the y coordinate."
,
"posY"
,
WData
T
ype
::
getDouble
()
);
}
WSingleSelectorName
::
NameDescriptionSearchTyp
WSingleSelectorName
::
getZwithDescription
()
{
return
WSingleSelectorName
::
NameDescriptionSearchTyp
(
getZ
(),
"Choose the column which should be used to determine the z coordinate."
,
"posZ"
,
WData
t
ype
::
getDefault
()
);
getZ
(),
"Choose the column which should be used to determine the z coordinate."
,
"posZ"
,
WData
T
ype
::
getDefault
()
);
}
WSingleSelectorName
::
NameDescriptionSearchTyp
WSingleSelectorName
::
getPDGwithDescription
()
{
return
WSingleSelectorName
::
NameDescriptionSearchTyp
(
getPDG
(),
"Choose the column which should be used to determine the particle data group."
,
"PDGEncoding"
,
WData
t
ype
::
getInt
()
);
getPDG
(),
"Choose the column which should be used to determine the particle data group."
,
"PDGEncoding"
,
WData
T
ype
::
getInt
()
);
}
WSingleSelectorName
::
NameDescriptionSearchTyp
WSingleSelectorName
::
getEdepWithDescription
()
{
return
WSingleSelectorName
::
NameDescriptionSearchTyp
(
getEdep
(),
"Choose the column which should be used to determine the energy deposition."
,
"edep"
,
WData
t
ype
::
getDouble
()
);
getEdep
(),
"Choose the column which should be used to determine the energy deposition."
,
"edep"
,
WData
T
ype
::
getDouble
()
);
}
WSingleSelectorName
::
NameDescriptionSearchTyp
WSingleSelectorName
::
getEventIdWithDescription
()
{
return
WSingleSelectorName
::
NameDescriptionSearchTyp
(
getEventId
(),
getEventId
(),
"Choose the column which should be used to determine the event id."
"Tracks will be drawn based on the the event id, all particles with the same event id will be connected."
,
"eventID"
,
WData
t
ype
::
getInt
()
);
"eventID"
,
WData
T
ype
::
getInt
()
);
}
WSingleSelectorName
::
NameDescriptionSearchTyp
WSingleSelectorName
::
getParentIdWithDescription
()
{
return
WSingleSelectorName
::
NameDescriptionSearchTyp
(
getParentId
(),
getParentId
(),
"Choose the column which should be used to determine the parent id."
"Primaries and secondaries filtering is based on that id, if a "
"particle has the parent id 0 it is a primary otherwise it is a secondary."
,
"parentID"
,
WData
t
ype
::
getInt
()
);
"parentID"
,
WData
T
ype
::
getInt
()
);
}
std
::
list
<
WSingleSelectorName
::
NameDescriptionSearchTyp
>
WSingleSelectorName
::
getListOfSelectorContent
()
...
...
src/modules/filterProtonData/WSingleSelectorName.h
View file @
ed245f90
...
...
@@ -29,7 +29,7 @@
#include <list>
#include <string>
#include "WData
t
ype.h"
#include "WData
T
ype.h"
/**
...
...
src/modules/filterProtonData/propertyHandler/WColumnPropertyHandler.cpp
View file @
ed245f90
...
...
@@ -119,7 +119,7 @@ WPropSelection WColumnPropertyHandler::addHeaderProperty( WColumnPropertyHandler
if
(
indexSingleSelector
<
0
)
{
indexSingleSelector
=
index
;
type
=
WData
t
ype
::
getDefault
();
type
=
WData
T
ype
::
getDefault
();
}
m_protonData
->
setStateIndex
(
columnName
,
index
);
...
...
src/modules/filterProtonData/propertyHandler/WColumnPropertyHandler.h
View file @
ed245f90
...
...
@@ -35,7 +35,7 @@
#include "core/common/WItemSelectionItemTyped.h"
#include "../WData
t
ype.h"
#include "../WData
T
ype.h"
#include "../WProtonData.h"
#include "../WSingleSelectorName.h"
...
...
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