scopy2 main: get Scopy2 from the dev branch on main #1846
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: AlexandraTrifan <[email protected]>
Performing the scan when changing filters was also added here. Signed-off-by: andreidanila1 <[email protected]>
Signed-off-by: andreidanila1 <[email protected]>
Signed-off-by: andreidanila1 <[email protected]>
…ctxs The combo box contains the description of the devices. Signed-off-by: andreidanila1 <[email protected]>
Signed-off-by: Adrian Suciu <[email protected]>
Signed-off-by: AlexandraTrifan <[email protected]>
Signed-off-by: Andrei-Fabian-Pop <[email protected]>
Signed-off-by: Andrei-Fabian-Pop <[email protected]>
Signed-off-by: Andrei-Fabian-Pop <[email protected]>
Signed-off-by: Andrei-Fabian-Pop <[email protected]>
Signed-off-by: Adrian Suciu <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: Andrei-Fabian-Pop <[email protected]>
Signed-off-by: Bindea Cristian <[email protected]>
Signed-off-by: Bindea Cristian <[email protected]>
Signed-off-by: Bindea Cristian <[email protected]>
Signed-off-by: andreidanila1 <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: andreidanila1 <[email protected]>
Signed-off-by: andreidanila1 <[email protected]>
Signed-off-by: andreidanila1 <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: IonutMuthi <[email protected]>
Signed-off-by: Adrian Suciu <[email protected]>
Signed-off-by: Andrei Popa <[email protected]>
- remove m2k.qss comments Signed-off-by: Andrei Popa <[email protected]>
- Handle the edge case where an empty string passed to the shortenAnnotationText
function causes an infinite loop.
This fix ensures that the function returns the extension ("...") when the
text is empty or the maxWidth is too small to fit the extension.
Signed-off-by: Adrian Stanea <[email protected]>
- fixed ADC measure icons - removed StyleHelper color map Signed-off-by: Andrei Popa <[email protected]>
- added function to automatically center on parent widget Signed-off-by: Andrei Popa <[email protected]>
AlexandraTrifan
requested review from
Adrian-Stanea,
bindea-cristian,
adisuciu,
Andrei-Fabian-Pop,
IonutMuthi,
andrei47w and
andreidanila1
adisuciu
approved these changes
Dec 2, 2024
AlexandraTrifan
changed the title
Signed-off-by: Bindea Cristian <[email protected]>
Signed-off-by: Bindea Cristian <[email protected]>
Signed-off-by: Bindea Cristian <[email protected]>
|
We had to cherry-pick these last 3 commits which were skipped during rebase due to modifying the same azure-pipelines.yml file as 3 others commits on the main branch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The main (scopy1) and dev (scopy2) branches diverged at tag maint-1.4.
Various fixes were added during development on both branches. The current main branch is tagged as maint-1.5
In order to make Scopy2 the new default version for this repository, we need to get the dev branch into main. Rebasing or merging directly would raise lots of conflicts which, if not handled perfectly, would create unwanted bugs.
A clean and quick option is the following (done in this PR):
-Add a commit which reverts the last 63 commits from main (between tags maint-1.4 and maint-1.5). All those fixes are already added to the dev branch as well.
-Rebase the dev branch with the newly modified main.
Please take some time to run a quick check on artifacts and commit ranges.