Conversation
YukiMatsuzawa
added a commit
that referenced
this pull request
Oct 10, 2023
^ This is the 1st commit message: Add BrushMapDataSelector. Replace some BrushMapDatas with BrushMapDataSelector. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Lcms/LcmsAnalysisModel.cs Add BrushMapDataSelectorFactory class. ^ The commit message #2 will be skipped: ^ Update BrushMapData # The commit message #3 will be skipped: # Remove BrushMapData.CreateSpectrumBrushes # This is the commit message #4: Replace some BrushMapDatas with BrushMapDataSelector. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Lcms/LcmsAnalysisModel.cs
kozo2
pushed a commit
that referenced
this pull request
Oct 11, 2023
* # This is a combination of 4 commits. ^ This is the 1st commit message: Add BrushMapDataSelector. Replace some BrushMapDatas with BrushMapDataSelector. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Lcms/LcmsAnalysisModel.cs Add BrushMapDataSelectorFactory class. ^ The commit message #2 will be skipped: ^ Update BrushMapData # The commit message #3 will be skipped: # Remove BrushMapData.CreateSpectrumBrushes # This is the commit message #4: Replace some BrushMapDatas with BrushMapDataSelector. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Lcms/LcmsAnalysisModel.cs * WIP: Refactoring SingleSpectrumModel. Add extension method IMsSpectrumLoader.LoadMsSpectrumAsObservable. Change SingleSpectrumModel and MsSpectrumModel constructors. WIP: MsSpectrumModel changed. Change RawDecSpectrumsModel constructor. Move each concreate class of the IMsSpectrumLoader interface to separate file. Change RawPurifiedView # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Gcms/GcmsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/View/Gcms/GcmsMainView.xaml WIP: change spectrum chart classes. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Gcms/GcmsAnalysisModel.cs WIP: change constructors for spectrum chart classes. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Gcms/GcmsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/ViewModel/Gcms/GcmsAnalysisViewModel.cs # src/MSDIAL5/MsdialGuiApp/ViewModel/Gcms/GcmsMethodViewModel.cs Add ChartHueItem class. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Gcms/GcmsAnalysisModel.cs Add constructor to ChartHueItem class for simplifying the source code. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Gcms/GcmsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Gcms/GcmsMethodModel.cs Change call site of the SingleSpectrumModel contructor. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Gcms/GcmsAnalysisModel.cs Add ObservableMsSpectrum class. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Chart/SingleSpectrumModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Dims/DimsAlignmentModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Dims/DimsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Gcms/GcmsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Imms/ImmsAlignmentModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Imms/ImmsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Lcimms/LcimmsAlignmentModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Lcimms/LcimmsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Lcms/LcmsAlignmentModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Lcms/LcmsAnalysisModel.cs Add AxisPropertySelectors class to manage axis in ms spectrum view. # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Chart/SingleSpectrumModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Dims/DimsAlignmentModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Gcms/GcmsAnalysisModel.cs Remove unused view controls. Fix # Conflicts: # src/MSDIAL5/MsdialGuiApp/Model/Chart/Ms2ChromatogramsModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Chart/MsSpectrumModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Dims/DimsAlignmentModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Dims/DimsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Dims/DimsMethodModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Gcms/GcmsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/Model/ImagingImms/ImagingImmsImageModel.cs # src/MSDIAL5/MsdialGuiApp/Model/ImagingImms/ImagingImmsMethodModel.cs # src/MSDIAL5/MsdialGuiApp/Model/ImagingImms/WholeImageResultModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Imms/ImmsAlignmentModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Imms/ImmsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Imms/ImmsMethodModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Lcimms/LcimmsAlignmentModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Lcimms/LcimmsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Lcimms/LcimmsMethodModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Lcms/LcmsAlignmentModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Lcms/LcmsAnalysisModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Lcms/LcmsMethodModel.cs # src/MSDIAL5/MsdialGuiApp/Model/Loader/IMsSpectrumLoader.cs # src/MSDIAL5/MsdialGuiApp/ViewModel/Lcms/LcmsAnalysisViewModel.cs
YukiMatsuzawa
added a commit
that referenced
this pull request
Oct 20, 2023
^ This is the 1st commit message: Add CompositeColorPicker Add ContentWidth and ContentHeigth property to CompositeColorPicker ^ The commit message #2 will be skipped: ^ Update CompositeColorPicker
kozo2
pushed a commit
that referenced
this pull request
Oct 21, 2023
* Move IColorPickerItem * Add ColorToBrushConverter * Add BaseColorPicker * Rename ColorPicker with ListColorPicker Update ListColorPicker design * Add HsvColorPicker * ^ This is a combination of 2 commits. ^ This is the 1st commit message: Add CompositeColorPicker Add ContentWidth and ContentHeigth property to CompositeColorPicker ^ The commit message #2 will be skipped: ^ Update CompositeColorPicker * Update test code of the ColorPickers * Add RgbColorPicker * Change ColorPicker FileClassSetView
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.