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

Merge with e190c52ab7861c68762aaa552f3dc0f59fe2e225 from default

Browse Source 
This revision compiles and runs on Win7x64- but further evaluation is necessary.
There may be an issue with cmake step -After cmake I had to copy rtgui/version.h & config.h into out of source build /rtgui folder.
Additional notes:
- ImProcFunctions::hsv2rgb01   -> this likely need to be added to color.h & color.cc
- Use of array2D should be verified in NR code
- compilation warning for rtengine::RawImageSource::isWBProviderReady()
This commit is contained in:
michael
2012-07-03 23:15:07 -04:00
parent 78d4f80875
commit 3a4100e710
374 changed files with 47381 additions and 39387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtgui/crop.cc
View File

@@ -186,6 +186,7 @@ Crop::Crop (): Gtk::VBox(), FoldableToolPanel(this) {
guide->append_text (M("TP_CROP_GTHARMMEANS4"));
guide->append_text (M("TP_CROP_GTGRID"));
guide->append_text (M("TP_CROP_GTEPASSPORT"));
guide->append_text (M("TP_CROP_GTFRAME"));
guide->set_active (0);
w->set_range (0, maxw);
@@ -294,6 +295,8 @@ void Crop::read (const ProcParams* pp, const ParamsEdited* pedited) {
guide->set_active (7);
else if (pp->crop.guide == "ePassport")
guide->set_active (8);
else if (pp->crop.guide == "Frame")
guide->set_active (9);
x->set_value (pp->crop.x);
y->set_value (pp->crop.y);
@@ -376,12 +379,14 @@ void Crop::write (ProcParams* pp, ParamsEdited* pedited) {
pp->crop.guide = "Grid";
else if (guide->get_active_row_number()==8)
pp->crop.guide = "ePassport";
else if (guide->get_active_row_number()==9)
pp->crop.guide = "Frame";
if (pedited) {
pedited->crop.enabled = !enabled->get_inconsistent();
pedited->crop.ratio = ratio->get_active_row_number() != 8;
pedited->crop.ratio = ratio->get_active_row_number() != 9;
pedited->crop.orientation = orientation->get_active_row_number() != 2;
pedited->crop.guide = guide->get_active_row_number() != 8;
pedited->crop.guide = guide->get_active_row_number() != 9;
pedited->crop.fixratio = !fixr->get_inconsistent();
pedited->crop.w = wDirty;
pedited->crop.h = hDirty;
@@ -660,7 +665,7 @@ struct setdimparams {
};
int sizeChangedUI (void* data) {
setdimparams* params = (setdimparams*)data;
setdimparams* params = static_cast<setdimparams*>(data);
params->crop->setDimensions (params->x, params->y);
delete params;
return 0;