mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Converting the device_info list into a Qt data structure
This data structure was quite fragile and made 'undo' when editing rather hard to implement. So instead I decided to turn this into a QMultiMap which seemed like the ideal data structure for it. This map holds all the dive computer related data indexed by the model. As QMultiMap it allows multiple entries per key (model string) and disambiguates between them with the deviceId. This commit turned out much larger than I wanted. But I didn't manage to find a clean way to break it up and make the pieces make sense. So this brings back the Ok / Cancel button for the dive computer edit dialog. And it makes those two buttons actually do the right thing (which is what started this whole process). For this to work we simply copy the map to a working copy and do all edits on that one - and then copy that over the 'real' map when we accept the changes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
		
							parent
							
								
									14ccbbf6e8
								
							
						
					
					
						commit
						29b242c703
					
				
					 19 changed files with 302 additions and 253 deletions
				
			
		|  | @ -14,9 +14,12 @@ Q_OBJECT | |||
| public: | ||||
|     static DiveComputerManagementDialog *instance(); | ||||
| 	void update(); | ||||
| 	void init(); | ||||
| 
 | ||||
| public  slots: | ||||
| 	void tryRemove(const QModelIndex& index); | ||||
| 	void accept(); | ||||
| 	void reject(); | ||||
| 
 | ||||
| private: | ||||
|     explicit DiveComputerManagementDialog(QWidget* parent = 0, Qt::WindowFlags f = 0); | ||||
|  | @ -24,4 +27,4 @@ private: | |||
| 	DiveComputerModel *model; | ||||
| }; | ||||
| 
 | ||||
| #endif | ||||
| #endif | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue