liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small cleanup, see issue #642

Browse Source
This commit is contained in:
Oliver Duis
2011-04-27 17:47:15 +02:00
parent e922eb162f
commit 37b802fe1d
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtgui/diagonalcurveeditorsubgroup.cc
View File

@@ -125,10 +125,8 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt)
// parametric curve // parametric curve
paramCurveBox = new Gtk::VBox (); paramCurveBox = new Gtk::VBox ();
paramCurveBox->set_spacing(4); paramCurveBox->set_spacing(4);
// Wolfgang START
paramInnerBox = new Gtk::HBox (); paramInnerBox = new Gtk::HBox ();
paramInnerBox->set_spacing(4); paramInnerBox->set_spacing(4);
// Wolfgang END
paramCurve = Gtk::manage (new MyDiagonalCurve ()); paramCurve = Gtk::manage (new MyDiagonalCurve ());
Gtk::Table* paramctab = Gtk::manage (new Gtk::Table (2,1)); Gtk::Table* paramctab = Gtk::manage (new Gtk::Table (2,1));
@@ -141,10 +139,8 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt)
paramctab->attach (*paramCurve, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 0, 0); paramctab->attach (*paramCurve, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
paramctab->attach (*shcSelector, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, RADIUS, 0); paramctab->attach (*shcSelector, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, RADIUS, 0);
// Wolfgang Change: paramCurveBox->pack_start (*paramctab, Gtk::PACK_EXPAND_WIDGET, 0);
paramInnerBox->pack_start (*paramctab, Gtk::PACK_EXPAND_WIDGET, 0); paramInnerBox->pack_start (*paramctab, Gtk::PACK_EXPAND_WIDGET, 0);
// Wolfgang START
Gtk::VBox* Parambbox = Gtk::manage (new Gtk::VBox ()); Gtk::VBox* Parambbox = Gtk::manage (new Gtk::VBox ());
Parambbox->set_spacing(4); Parambbox->set_spacing(4);
saveParam = Gtk::manage (new Gtk::Button ()); saveParam = Gtk::manage (new Gtk::Button ());
@@ -174,7 +170,6 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt)
paramInnerBox->pack_start (*Parambbox, Gtk::PACK_EXPAND_WIDGET, 0); paramInnerBox->pack_start (*Parambbox, Gtk::PACK_EXPAND_WIDGET, 0);
paramCurveBox->pack_start (*paramInnerBox, Gtk::PACK_SHRINK, 0); paramCurveBox->pack_start (*paramInnerBox, Gtk::PACK_SHRINK, 0);
// Wolfgang END
highlights = Gtk::manage (new Adjuster (M("CURVEEDITOR_HIGHLIGHTS"), -100, 100, 1, 0)); highlights = Gtk::manage (new Adjuster (M("CURVEEDITOR_HIGHLIGHTS"), -100, 100, 1, 0));
lights = Gtk::manage (new Adjuster (M("CURVEEDITOR_LIGHTS"), -100, 100, 1, 0)); lights = Gtk::manage (new Adjuster (M("CURVEEDITOR_LIGHTS"), -100, 100, 1, 0));
@@ -233,9 +228,7 @@ DiagonalCurveEditorSubGroup::~DiagonalCurveEditorSubGroup() {
delete customCurveBox; delete customCurveBox;
delete paramCurveBox; delete paramCurveBox;
delete NURBSCurveBox; delete NURBSCurveBox;
// Wolfgang START
delete paramInnerBox; delete paramInnerBox;
// Wolfgang END
} }
/* /*
@@ -320,11 +313,9 @@ void DiagonalCurveEditorSubGroup::savePressed () {
case DCT_NURBS: // NURBS case DCT_NURBS: // NURBS
p = NURBSCurve->getPoints (); p = NURBSCurve->getPoints ();
break; break;
// Wolfgang Start
case DCT_Parametric: case DCT_Parametric:
p = paramCurve->getPoints (); p = paramCurve->getPoints ();
break; break;
// Wolfgang End
default: default:
break; break;
} }
@@ -336,7 +327,6 @@ void DiagonalCurveEditorSubGroup::savePressed () {
f << "Spline\n"; f << "Spline\n";
else if (p[ix]==(double)(DCT_NURBS)) else if (p[ix]==(double)(DCT_NURBS))
f << "NURBS\n"; f << "NURBS\n";
// Wolfgang Start
else if (p[ix]==(double)(DCT_Parametric)) else if (p[ix]==(double)(DCT_Parametric))
f << "Parametric\n"; f << "Parametric\n";
if (p[ix]==(double)(DCT_Parametric)) { if (p[ix]==(double)(DCT_Parametric)) {
@@ -344,7 +334,6 @@ void DiagonalCurveEditorSubGroup::savePressed () {
for (unsigned int i=0; i<p.size()-1; i++, ix++) for (unsigned int i=0; i<p.size()-1; i++, ix++)
f << p[ix] << std::endl; f << p[ix] << std::endl;
} }
// Wolfgang End
else { else {
ix++; ix++;
for (unsigned int i=0; i<p.size()/2; i++, ix+=2) for (unsigned int i=0; i<p.size()/2; i++, ix+=2)

2
rtgui/diagonalcurveeditorsubgroup.h
View File

@@ -31,9 +31,7 @@ class DiagonalCurveEditorSubGroup : public CurveEditorSubGroup, public SHCListen
protected: protected:
Gtk::HBox* customCurveBox; Gtk::HBox* customCurveBox;
Gtk::VBox* paramCurveBox; Gtk::VBox* paramCurveBox;
// Wolfgang Start
Gtk::HBox* paramInnerBox; Gtk::HBox* paramInnerBox;
// Wolfgang End
Gtk::HBox* NURBSCurveBox; Gtk::HBox* NURBSCurveBox;
MyDiagonalCurve* customCurve; MyDiagonalCurve* customCurve;