merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-10-19 19:26:14 +02:00
198 changed files with 2052 additions and 1128 deletions

View File

@@ -28,6 +28,7 @@
#include "toolpanel.h"
#include <gtkmm.h>
#include <string>
#include "thresholdadjuster.h"
class ControlSpotPanel:
public ToolParamBlock,
@@ -197,6 +198,13 @@ private:
void qualityMethodChanged();
void updateParamVisibility();
void adjusterChanged(Adjuster* a, double newval);
void adjusterAutoToggled(Adjuster* a, bool newval);
void adjusterChanged(ThresholdAdjuster* a, double newBottom, double newTop);
void adjusterChanged(ThresholdAdjuster* a, double newBottomLeft, double newTopLeft, double newBottomRight, double newTopRight);
void adjusterChanged(ThresholdAdjuster* a, int newBottom, int newTop);
void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight);
void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR);
void disableParamlistener(bool cond);
void setParamEditable(bool cond);