Skip to content

Commit 031e11e

Browse files
authored
chore: relocate colormap (hoffstadt#1768)
* chore: relocate colormap * chore: prep for remove color map button class * chore: prep colormapslider and colormapscale for removal * chore: prep colormapregistry for class removal
1 parent 1651e65 commit 031e11e

16 files changed

+548
-625
lines changed

DearPyGui/cmake/dpg_sources.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,6 @@ set(MARVEL_SOURCES
6464
"src/ui/AppItems/mvAppItemState.cpp"
6565
"src/ui/AppItems/mvAppItem.cpp"
6666
"src/ui/AppItems/mvItemRegistry.cpp"
67-
"src/ui/AppItems/colors/mvColorMap.cpp"
68-
"src/ui/AppItems/colors/mvColorMapButton.cpp"
69-
"src/ui/AppItems/colors/mvColorMapRegistry.cpp"
70-
"src/ui/AppItems/colors/mvColorMapScale.cpp"
71-
"src/ui/AppItems/colors/mvColorMapSlider.cpp"
7267
"src/ui/AppItems/containers/mvCollapsingHeader.cpp"
7368
"src/ui/AppItems/containers/mvGroup.cpp"
7469
"src/ui/AppItems/containers/mvChild.cpp"

DearPyGui/src/modules/dearpygui_commands.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ bind_colormap(PyObject* self, PyObject* args, PyObject* kwargs)
5050
if (asource->type == mvAppItemType::mvColorMap)
5151
{
5252
mvColorMap* colormap = static_cast<mvColorMap*>(asource);
53-
source = colormap->_colorMap;
53+
source = colormap->configData.colorMap;
5454
}
5555
}
5656

@@ -63,19 +63,19 @@ bind_colormap(PyObject* self, PyObject* args, PyObject* kwargs)
6363
else if (aitem->type == mvAppItemType::mvColorMapScale)
6464
{
6565
mvColorMapScale* graph = static_cast<mvColorMapScale*>(aitem);
66-
graph->setColorMap((ImPlotColormap)source);
66+
graph->configData.colorMap = (ImPlotColormap)source;
6767
}
6868

6969
else if (aitem->type == mvAppItemType::mvColorMapButton)
7070
{
7171
mvColorMapButton* graph = static_cast<mvColorMapButton*>(aitem);
72-
graph->setColorMap((ImPlotColormap)source);
72+
graph->configData.colorMap = (ImPlotColormap)source;
7373
}
7474

7575
else if (aitem->type == mvAppItemType::mvColorMapSlider)
7676
{
7777
mvColorMapSlider* graph = static_cast<mvColorMapSlider*>(aitem);
78-
graph->setColorMap((ImPlotColormap)source);
78+
graph->configData.colorMap = (ImPlotColormap)source;
7979
}
8080

8181
else
@@ -115,7 +115,7 @@ sample_colormap(PyObject* self, PyObject* args, PyObject* kwargs)
115115
if (asource->type == mvAppItemType::mvColorMap)
116116
{
117117
mvColorMap* colormap = static_cast<mvColorMap*>(asource);
118-
item = colormap->_colorMap;
118+
item = colormap->configData.colorMap;
119119
}
120120
}
121121

@@ -157,7 +157,7 @@ get_colormap_color(PyObject* self, PyObject* args, PyObject* kwargs)
157157
if (asource->type == mvAppItemType::mvColorMap)
158158
{
159159
mvColorMap* colormap = static_cast<mvColorMap*>(asource);
160-
item = colormap->_colorMap;
160+
item = colormap->configData.colorMap;
161161
}
162162
}
163163

DearPyGui/src/mvDearPyGui.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ struct mvColorEditConfig;
5757
struct mvColorPickerConfig;
5858
struct mvFilterSetConfig;
5959
struct mvTooltipConfig;
60+
struct mvColorMapConfig;
61+
struct mvColorMapButtonConfig;
62+
struct mvColorMapScaleConfig;
63+
struct mvColorMapSliderConfig;
6064

6165
// plots
6266
struct mvAnnotationConfig;

DearPyGui/src/ui/AppItems/colors/mvColorMap.cpp

Lines changed: 0 additions & 51 deletions
This file was deleted.

DearPyGui/src/ui/AppItems/colors/mvColorMap.h

Lines changed: 0 additions & 25 deletions
This file was deleted.

DearPyGui/src/ui/AppItems/colors/mvColorMapButton.cpp

Lines changed: 0 additions & 106 deletions
This file was deleted.

DearPyGui/src/ui/AppItems/colors/mvColorMapButton.h

Lines changed: 0 additions & 21 deletions
This file was deleted.

DearPyGui/src/ui/AppItems/colors/mvColorMapRegistry.cpp

Lines changed: 0 additions & 38 deletions
This file was deleted.

DearPyGui/src/ui/AppItems/colors/mvColorMapRegistry.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)