mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 22:06:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Solving Linux-Gnome Palette Editor problem

Browse Source
This commit is contained in:
Michel Mastriani
2019-05-21 13:33:00 -03:00
parent f29dda2ec0
commit 9fdf512a1f
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Fractorium/PaletteEditor/PaletteEditor.cpp
View File

@ -117,7 +117,6 @@ map<size_t, float> PaletteEditor::GetColorIndices() const
return m_GradientColorView->GetColorIndices();
}
// michel
/// <summary>
/// Return the previous xform color indices as a map.
/// The keys are the xform indices, and the values are the color indices.
@ -138,7 +137,6 @@ void PaletteEditor::SetColorIndices(const map<size_t, float>& indices)
m_GradientColorView->SetColorIndices(indices);
}
// michel
/// <summary>
/// Backup xform color
/// </summary>

8
Source/Fractorium/PaletteEditor/PaletteEditor.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "FractoriumPch.h"
#include "Fractorium.h" // michel
#include "Fractorium.h"
#include "ColorPickerWidget.h"
#include "GradientColorsView.h"
#include "EmberFile.h"
@ -34,9 +34,9 @@ public:
Palette<float>& GetPalette(int size);
void SetPalette(const Palette<float>& palette);
map<size_t, float> GetColorIndices() const;
map<size_t, float> GetPreviousColorIndices() const; // michel
map<size_t, float> GetPreviousColorIndices() const;
void SetColorIndices(const map<size_t, float>& indices);
void SetPreviousColorIndices(const map<size_t, float>& indices); // michel
void SetPreviousColorIndices(const map<size_t, float>& indices);
string GetPaletteFile() const;
void SetPaletteFile(const string& filename);
@ -80,7 +80,7 @@ private:
bool IsCurrentPaletteAndFileEditable();
bool m_PaletteFileChanged = false;
int m_PaletteIndex = 0;
map<size_t, float> m_PreviousColorIndices; // michel
map<size_t, float> m_PreviousColorIndices;
QString m_Filename;
string m_CurrentPaletteFilePath;
ColorPickerWidget* m_ColorPicker = nullptr;