Open feat 031224 #190
Merged
Open feat 031224 #190
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
(cherry picked from commit e75b5c0336df1f69d4c944e31abb8fc1bfd0f0d6)
First WIP version. (cherry picked from commit eda8eaf2eb6b8bceb40779f1b6e4bbec19adca91)
(cherry picked from commit b76c13ae07b583d7254594196430d7f241922f5a) # Conflicts: # GUIDialogs/MainWindow/Dyssol.h
(cherry picked from commit 88bc969bbbe41f5725358c4f80d2efbfea1b3b37)
Breaking change! Do not load units of old versions. (cherry picked from commit 0d08292302ea2c0b5459c1359d73274480a54270)
(cherry picked from commit f303278fd253896902149c2db3a44415b52ad948)
(cherry picked from commit 5d770d7d903787804d2f2544596b934519ab048d)
(cherry picked from commit 73beb06343b986d43414b38ea19355e2e57b3c38)
(cherry picked from commit fd14202d05c978f33c059c8c16facd7952a18e48)
(cherry picked from commit d8ee95bf362503725ab5cfe1e43410841af35447)
(cherry picked from commit c977345058810b5cf93e442eb2908e39608f5a05)
(cherry picked from commit 79e0cce5530996b0c67ca02d4a6c946509c9f39d)
- Functions to get phases info from flowsheet. - Typo in function name. - ReservedVector free function. (cherry picked from commit 2a80feeb329795f5ea77942fd6e5a18ae81ad7b8)
(cherry picked from commit e615ed6d382440eeb47d7fc22a7e1afd84cbbfd6)
(cherry picked from commit 01cfcc39a7c12c286f948d845612cabfa7507844)
…reation (cherry picked from commit 7c53653083929d6fa0820bc16f7383da2dd0a4da)
(cherry picked from commit fef0c4e0e5498d9d6b2c6489fa0199b5278e6660)
(cherry picked from commit e891bcaf3c4ee62923cd0fdee5f1c0768b8795be)
(cherry picked from commit f6a872c0a7dcdef0a5ad8fcc0ae2d74d3b70f269)
(cherry picked from commit 86bb61e945c26059c959a760d9926929abec1c8a)
(cherry picked from commit c2859099ab799b7a0752d7fe5b3f43596e1cd902)
(cherry picked from commit 2b3504766673d61c76256872ab2a611d18c2029d) # Conflicts: # Dyssol.sln # GUIDialogs/CompoundsEditor/CompoundsEditor.vcxproj # GUIDialogs/CompoundsManager/CompoundsManager.vcxproj # GUIDialogs/FlowsheetEditor/FlowsheetEditor.vcxproj # GUIDialogs/FlowsheetTab/FlowsheetTab.vcxproj # GUIDialogs/SensitivityAnalysisDialog/SensitivityAnalysisDialog.vcxproj # GUIDialogs/UnitEditor/UnitEditor.vcxproj # GUIWidgets/ParameterTab/ParameterTab.vcxproj # GUIWidgets/RunTab/RunTab.vcxproj
- Split into UnitParameters, UnitParametersManager, UnitParametersEnum. - Move template code from UnitParameters.cpp to UnitParameters.h - Move EUnitParameter enum into its own header file. - Add CUnitParametersManager::GetParameters overload. (cherry picked from commit 0d4aad03df6201202640090bb92033bdafc6b490)
(cherry picked from commit 79cead4fa35f0b930b5bfc7a4124c76877504d59)
(cherry picked from commit 6d979952aba1d93e3c8d9fb7d7f45302472e4316)
(cherry picked from commit f6973ce7b3d1e9381bbb40f803162af4842be40f)
(cherry picked from commit 21df825162b24c9e17e2d7d13de638f26e4c9fca)
(cherry picked from commit 21df825162b24c9e17e2d7d13de638f26e4c9fca)
(cherry picked from commit 71dc62501d58ede8f4eb99d535127c3677d64150)
(cherry picked from commit 951651712fb7773c7fa7472916365afd1ed54b8a)
(cherry picked from commit ebd8a2c32f9f448bd1ffe7e2d944357ee478566a)
(cherry picked from commit ebd8a2c32f9f448bd1ffe7e2d944357ee478566a)
- CStream::GetAccumulatedMass - CBaseUnit::GetTimePoints(double,double,vector<CHoldup*>,vector<CStream*>) (cherry picked from commit 2bc6385b0d148b420cdb49477a5c2a7c5e0d967e)
(cherry picked from commit fc5baa38e0868b2fc443c97482c9a665e151942b)
- Remove points from curves. - Aliases for setter/getter of CCheckBoxUnitParameter. (cherry picked from commit fd8a6f9a8e465d1f5c6ce71683196431bd4ec3d7)
(cherry picked from commit db6ced3caeed0d71f724cc89807e4f608c1e6cb0)
(cherry picked from commit b756a8f17d4bbfcc7a385edb27217f15226063c9)
(cherry picked from commit 91dcb2f686de5d3113975c212e52bcadb607893a)
This reverts commit ce48698.
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.
No description provided.