X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fplugins%2Funsharp%2Funsharpwindow.h;h=b99f86e082e587dd7742a130b66cdd1326881ef2;hb=1a2c313b568030b465b165089f0b90730d17884d;hp=3b4ef7ca03b582237cafb91d87b41eaacea9a202;hpb=593d61b4eab82d145ac16726370325d701c297a7;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/plugins/unsharp/unsharpwindow.h b/cinelerra-5.1/plugins/unsharp/unsharpwindow.h
index 3b4ef7ca..b99f86e0 100644
--- a/cinelerra-5.1/plugins/unsharp/unsharpwindow.h
+++ b/cinelerra-5.1/plugins/unsharp/unsharpwindow.h
@@ -26,68 +26,133 @@
 #include "unsharp.inc"
 #include "unsharpwindow.inc"
 
+
 #define RESET_DEFAULT_SETTINGS 10
 #define RESET_ALL       0
 #define RESET_RADIUS	1
 #define RESET_AMOUNT    2
 #define RESET_THRESHOLD 3
 
+#define RADIUS_MIN      0.10
+#define RADIUS_MAX      120.00
+#define AMOUNT_MIN      0.00
+#define AMOUNT_MAX      5.00
+#define THRESHOLD_MIN   0
+#define THRESHOLD_MAX 255
+
 
-class UnsharpRadius : public BC_FPot
+
+class UnsharpRadiusText : public BC_TumbleTextBox
 {
 public:
-	UnsharpRadius(UnsharpMain *plugin, int x, int y);
+	UnsharpRadiusText(UnsharpWindow *window,
+		UnsharpMain *plugin,
+		int x, int y);
+	~UnsharpRadiusText();
 	int handle_event();
+	UnsharpWindow *window;
 	UnsharpMain *plugin;
 };
 
-class UnsharpAmount : public BC_FPot
+class UnsharpRadiusSlider : public BC_FSlider
 {
 public:
-	UnsharpAmount(UnsharpMain *plugin, int x, int y);
+	UnsharpRadiusSlider(UnsharpWindow *window,
+		UnsharpMain *plugin,
+		int x, int y, int w);
+	~UnsharpRadiusSlider();
 	int handle_event();
+	UnsharpWindow *window;
 	UnsharpMain *plugin;
 };
 
-class UnsharpThreshold : public BC_IPot
+
+class UnsharpAmountText : public BC_TumbleTextBox
 {
 public:
-	UnsharpThreshold(UnsharpMain *plugin, int x, int y);
+	UnsharpAmountText(UnsharpWindow *window,
+		UnsharpMain *plugin,
+		int x, int y);
+	~UnsharpAmountText();
 	int handle_event();
+	UnsharpWindow *window;
 	UnsharpMain *plugin;
 };
 
-class UnsharpReset : public BC_GenericButton
+
+class UnsharpAmountSlider : public BC_FSlider
 {
 public:
-	UnsharpReset(UnsharpMain *plugin, UnsharpWindow *window, int x, int y);
-	~UnsharpReset();
+	UnsharpAmountSlider(UnsharpWindow *window,
+		UnsharpMain *plugin,
+		int x, int y, int w);
+	~UnsharpAmountSlider();
 	int handle_event();
+	UnsharpWindow *window;
 	UnsharpMain *plugin;
+};
+
+
+class UnsharpThresholdText : public BC_TumbleTextBox
+{
+public:
+	UnsharpThresholdText(UnsharpWindow *window,
+		UnsharpMain *plugin,
+		int x, int y);
+	~UnsharpThresholdText();
+	int handle_event();
 	UnsharpWindow *window;
+	UnsharpMain *plugin;
 };
 
-class UnsharpDefaultSettings : public BC_GenericButton
+class UnsharpThresholdSlider : public BC_ISlider
 {
 public:
-	UnsharpDefaultSettings(UnsharpMain *plugin, UnsharpWindow *window, int x, int y, int w);
-	~UnsharpDefaultSettings();
+	UnsharpThresholdSlider(UnsharpWindow *window,
+		UnsharpMain *plugin,
+		int x, int y, int w);
+	~UnsharpThresholdSlider();
 	int handle_event();
+	UnsharpWindow *window;
 	UnsharpMain *plugin;
+};
+
+
+class UnsharpClr : public BC_Button
+{
+public:
+	UnsharpClr(UnsharpWindow *window, UnsharpMain *plugin,
+		int x, int y, int clear);
+	~UnsharpClr();
+	int handle_event();
 	UnsharpWindow *window;
+	UnsharpMain *plugin;
+	int clear;
 };
 
-class UnsharpSliderClr : public BC_Button
+
+class UnsharpReset : public BC_GenericButton
 {
 public:
-	UnsharpSliderClr(UnsharpMain *plugin, UnsharpWindow *window, int x, int y, int w, int clear);
-	~UnsharpSliderClr();
+	UnsharpReset(UnsharpWindow *window, UnsharpMain *plugin, int x, int y);
+	~UnsharpReset();
 	int handle_event();
+	UnsharpWindow *window;
 	UnsharpMain *plugin;
+};
+
+class UnsharpDefaultSettings : public BC_GenericButton
+{
+public:
+	UnsharpDefaultSettings(UnsharpWindow *window, UnsharpMain *plugin, int x, int y, int w);
+	~UnsharpDefaultSettings();
+	int handle_event();
 	UnsharpWindow *window;
-	int clear;
+	UnsharpMain *plugin;
 };
 
+
+
 class UnsharpWindow : public PluginClientWindow
 {
 public:
@@ -97,22 +162,23 @@ public:
 	void create_objects();
 	void update_gui(int clear);
 
-	UnsharpRadius *radius;
-	UnsharpAmount *amount;
-	UnsharpThreshold *threshold;
 	UnsharpMain *plugin;
-	UnsharpReset *reset;
-	UnsharpDefaultSettings *default_settings;
-	UnsharpSliderClr *radiusClr;
-	UnsharpSliderClr *amountClr;
-	UnsharpSliderClr *thresholdClr;
-};
-
-
 
+	UnsharpRadiusText *radius_text;
+	UnsharpRadiusSlider *radius_slider;
+	UnsharpClr *radius_clr;
 
+	UnsharpAmountText *amount_text;
+	UnsharpAmountSlider *amount_slider;
+	UnsharpClr *amount_clr;
 
+	UnsharpThresholdText *threshold_text;
+	UnsharpThresholdSlider *threshold_slider;
+	UnsharpClr *threshold_clr;
 
+	UnsharpReset *reset;
+	UnsharpDefaultSettings *default_settings;
+};
 
 
 #endif