Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue-30 | Add a simple text based protocol to the project to display continuous measurement results #36

Merged
merged 14 commits into from
Jan 12, 2021

Conversation

KGergo88
Copy link
Owner

Issue: #30

@KGergo88 KGergo88 added enhancement New, or improved functionality do not merge This pull request should not be merged labels Aug 29, 2020
@KGergo88 KGergo88 added this to the v2.2.0 milestone Aug 29, 2020
@KGergo88 KGergo88 self-assigned this Aug 29, 2020
@KGergo88 KGergo88 changed the title Issue-30 | Add a simple text based protocol to the project to display continuous measurement results WIP Issue-30 | Add a simple text based protocol to the project to display continuous measurement results Aug 29, 2020
@KGergo88
Copy link
Owner Author

Force pushed the branch to rebase it onto master.

@KGergo88 KGergo88 added in progress The issue is currently being worked on and removed in progress The issue is currently being worked on labels Aug 30, 2020
@KGergo88
Copy link
Owner Author

Force pushed the branch to rebase it onto master.

Details:
	- Breaking up the DataProcessingInterface to:
		- ProtocolInterface
		- DataProcessingInterface
		- DataExportingInterface
	- Adding the empty CMDP implementation
	- Adapting the MDP implementation to the new interfaces
Details:
	- Adding new methods to the DataLine class
	- Adding new methods to the Diagram class
Details:
	- The solving the diamond inheritance problem of the ProtocolInterface
	- Extending the DataExportingInterface
	- Updating the MeasurementDataProtocol
Details:
	- Implementing the regex patterns
	- Adding the methods required by the interfaces
	- Starting to implement the statemachine of the ProcessData()
Details:
 - Turning off optimizations for the Tests in debug build
 - Adding type definitions for the test_data_line.cpp
 - Updating the DataLine constructor calls
Details:
 - The call needed to be updated after the introduction of the DataLine ID
 - Removed an unused local
Details:
 - ProtocolInterface --> I_Protocol
 - Merging the DataExportingInterface and
   DataProcessingInterface into I_Protocol
 - Updating the MDP implementation
 - Updating the CMDP implementation
 - Updating the NetworkHandler implementation
Details:
 - Adding tests for the already implemented CMDP methods
 - Extracting the common parts from the MDP tests that
   can be used for the CMDP and future protocols and
   storing them into the test_protocol_common.h
 - Updating the MDP unit tests
@github-actions
Copy link

Coverage after merging CMDP_#30 into master

91.03%

Coverage Report
FileBranchesFuncsLinesUncovered Lines
application/sources
   configuration.cpp100%100%100%
   configuration.hpp100%100%100%
   continous_measurement_data_protocol.cpp100%87.50%20.27%100, 104, 107, 109, 111, 115, 118, 120, 122, 124, 126, 127, 130, 131, 135, 138, 140, 142, 147, 149, 152, 156, 157, 161, 162, 164, 166, 171, 173, 177, 181, 182, 183, 187, 189, 209, 213, 49, 53, 55, 57, 59, 62, 63, 65, 68, 70, 75, 76, 79, 81, 84, 85, 90, 91, 92, 95, 97, 98
   continous_measurement_data_protocol.hpp100%0%100%
   data_line.hpp100%100%100%
   data_point.hpp100%100%100%
   diagram.hpp100%100%100%
   measurement_data_protocol.cpp100%85.71%88.46%165, 166, 167, 171, 173, 232, 236, 238, 243
   measurement_data_protocol.hpp100%0%100%
   ordered_dict.h100%69.23%93.75%107, 136
tests/sources
   test_backend.cpp100%80%100%
   test_configuration.cpp100%75%97.26%55, 82
   test_continous_measurement_data_protocol.cpp100%70%100%
   test_data_line.cpp100%69.57%100%
   test_data_point.cpp100%71.43%100%
   test_diagram.cpp100%68.75%100%
   test_diagram_container.cpp100%80%100%
   test_main.cpp100%100%100%
   test_measurement_data_protocol.cpp100%75%97.37%45
   test_ordered_dict.cpp100%70.59%100%
   test_protocol_common.h100%100%100%
   test_serial_port.cpp100%80%100%

Details:
 - Adding the cmdp testfiles to QMake file
 - Switching to Qt regexes in the CMDP
 - Fixing the CMDP state machine and regex patterns
 - Adding the missing override for the virtual methods
 - Reworking the regex pattern definition
 - Adding a unit test for the TEST_1C_0E_CMDP.cmdp
 - Adding the TestFileReader to the common protocol test header
@github-actions
Copy link

Coverage after merging CMDP_#30 into master

96.91%

Coverage Report
FileBranchesFuncsLinesUncovered Lines
application/sources
   configuration.cpp100%100%100%
   configuration.hpp100%100%100%
   continous_measurement_data_protocol.cpp100%87.50%85.19%110, 122, 164, 168, 169, 170, 191, 195, 78, 79, 82, 84
   continous_measurement_data_protocol.hpp100%50%100%
   data_line.hpp100%100%100%
   data_point.hpp100%100%100%
   diagram.hpp100%100%100%
   measurement_data_protocol.cpp100%85.71%88.46%165, 166, 167, 171, 173, 232, 236, 238, 243
   measurement_data_protocol.hpp100%0%100%
   ordered_dict.h100%69.23%93.75%107, 136
tests/sources
   test_backend.cpp100%80%100%
   test_configuration.cpp100%75%97.26%55, 82
   test_continous_measurement_data_protocol.cpp100%73.08%100%
   test_data_line.cpp100%69.57%100%
   test_data_point.cpp100%71.43%100%
   test_diagram.cpp100%68.75%100%
   test_diagram_container.cpp100%80%100%
   test_main.cpp100%100%100%
   test_measurement_data_protocol.cpp100%73.91%100%
   test_ordered_dict.cpp100%70.59%100%
   test_protocol_common.h100%100%88.89%58
   test_serial_port.cpp100%80%100%

@github-actions
Copy link

github-actions bot commented Jan 2, 2021

Coverage after merging CMDP_#30 into master

97.26%

Coverage Report
FileBranchesFuncsLinesUncovered Lines
application/sources
   configuration.cpp100%100%100%
   configuration.hpp100%100%100%
   continous_measurement_data_protocol.cpp100%87.50%89.02%110, 122, 160, 173, 177, 178, 179, 200, 204
   continous_measurement_data_protocol.hpp100%50%100%
   data_line.hpp100%100%100%
   data_point.hpp100%100%100%
   diagram.hpp100%100%100%
   measurement_data_protocol.cpp100%85.71%88.61%167, 168, 169, 173, 175, 234, 238, 240, 245
   measurement_data_protocol.hpp100%0%100%
   ordered_dict.h100%71.43%95.12%124, 153
tests/sources
   test_backend.cpp100%80%100%
   test_configuration.cpp100%75%97.26%55, 82
   test_continous_measurement_data_protocol.cpp100%73.08%100%
   test_data_line.cpp100%69.57%100%
   test_data_point.cpp100%71.43%100%
   test_diagram.cpp100%68.75%100%
   test_diagram_container.cpp100%80%100%
   test_main.cpp100%100%100%
   test_measurement_data_protocol.cpp100%73.91%100%
   test_ordered_dict.cpp100%70.59%100%
   test_protocol_common.h100%100%88.89%58
   test_serial_port.cpp100%80%100%

Details:
 - Making the types accessible in DataLine
 - Making the types accessible in DataPoint
 - Making the types accessible in Diagram
 - Removing the DataLineId feature from DataLine
 - Switching to using OrderedDict as the container in Diagram
 - Not removing the whitespaces from the data in MDP and CMDP to fix messing up the titles with spaces
 - Added checks for duplicate DataLine IDs
 - Added checks for not-existing DataLine IDs
 - Updating the MDP with DataLine IDs (not used in MDP)
 - Adding copy and move constructors and operators to OrderedDict
 - Adding duplicate key check for push_back() and emplace_back() in OrderedDict
 - Fixing the push_back() signature in OrderedDict
 - Adding begin() and end() to OrderedDict
 - Adding new tests for the rest of the CMDP test files
 - Updating the DataLine unit tests
 - Updating the OrderedDict unit tests
 - Removing the #warning directives from the codebase as they break the Windows CI job
@github-actions
Copy link

github-actions bot commented Jan 2, 2021

Coverage after merging CMDP_#30 into master

97.26%

Coverage Report
FileBranchesFuncsLinesUncovered Lines
application/sources
   configuration.cpp100%100%100%
   configuration.hpp100%100%100%
   continous_measurement_data_protocol.cpp100%87.50%89.02%110, 122, 160, 173, 177, 178, 179, 200, 204
   continous_measurement_data_protocol.hpp100%50%100%
   data_line.hpp100%100%100%
   data_point.hpp100%100%100%
   diagram.hpp100%100%100%
   measurement_data_protocol.cpp100%85.71%88.46%163, 164, 165, 169, 171, 230, 234, 236, 241
   measurement_data_protocol.hpp100%0%100%
   ordered_dict.h100%71.43%95.12%124, 153
tests/sources
   test_backend.cpp100%80%100%
   test_configuration.cpp100%75%97.26%55, 82
   test_continous_measurement_data_protocol.cpp100%73.08%100%
   test_data_line.cpp100%69.57%100%
   test_data_point.cpp100%71.43%100%
   test_diagram.cpp100%68.75%100%
   test_diagram_container.cpp100%80%100%
   test_main.cpp100%100%100%
   test_measurement_data_protocol.cpp100%73.91%100%
   test_ordered_dict.cpp100%70.59%100%
   test_protocol_common.h100%100%88.89%58
   test_serial_port.cpp100%80%100%

@KGergo88 KGergo88 merged commit 93b6882 into master Jan 12, 2021
@KGergo88 KGergo88 deleted the CMDP_#30 branch January 12, 2021 21:42
@KGergo88 KGergo88 restored the CMDP_#30 branch January 12, 2021 21:49
@KGergo88
Copy link
Owner Author

KGergo88 commented Jan 12, 2021

The PR was closed trough #47. The development of CMDP continues in #30 and a new PR will be created.

@KGergo88 KGergo88 removed the do not merge This pull request should not be merged label Jan 12, 2021
@KGergo88 KGergo88 changed the title WIP Issue-30 | Add a simple text based protocol to the project to display continuous measurement results Issue-30 | Add a simple text based protocol to the project to display continuous measurement results Jan 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New, or improved functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add a simple text based protocol to the project to display continuous measurement results
1 participant