merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-07-07 13:46:18 +02:00
92 changed files with 2399 additions and 1322 deletions

View File

@@ -78,6 +78,7 @@ ToolPanelCoordinator::ToolPanelCoordinator(bool batch) : ipc(nullptr), hasChange
dirpyrequalizer = Gtk::manage(new DirPyrEqualizer());
hsvequalizer = Gtk::manage(new HSVEqualizer());
filmSimulation = Gtk::manage(new FilmSimulation());
softlight = Gtk::manage(new SoftLight());
sensorbayer = Gtk::manage(new SensorBayer());
sensorxtrans = Gtk::manage(new SensorXTrans());
bayerprocess = Gtk::manage(new BayerProcess());
@@ -112,6 +113,7 @@ ToolPanelCoordinator::ToolPanelCoordinator(bool batch) : ipc(nullptr), hasChange
addPanel(detailsPanel, sharpenMicro);
addPanel(colorPanel, hsvequalizer);
addPanel(colorPanel, filmSimulation);
addPanel (colorPanel, softlight);
addPanel(colorPanel, rgbcurves);
addPanel(colorPanel, colortoning);
addPanel(exposurePanel, epd);