merge with Dev

rtgui/paramsedited.h

@@ -289,10 +289,15 @@ public:
     bool enabled;
     bool degree;
     bool autodegree;
+    bool degreeout;
+    bool autodegreeout;
     bool autoadapscen;
+    bool autoybscen;
     bool surround;
+    bool surrsrc;
     bool adapscen;
     bool adaplum;
+    bool ybscen;
     bool badpixsl;
     bool wbmodel;
     bool algo;
@@ -314,6 +319,8 @@ public:
     bool tempout;
     bool greenout;
     bool ybout;
+    bool tempsc;
+    bool greensc;
 
 };