Skip to main content

Browse the archive

Revision 5e3703dc3b0292695d1dfeca6dd74bedaef0f5b5 authored by Pascal Obry on 30 December 2016, 09:41:58 UTC, committed by Pascal Obry on 16 January 2017, 21:54:23 UTC 
undo: rework the implementation.
 
The implementation of the undo/redo was simple but was letting the
complexity in the hand of the API users. In fact there was a need
to keep a prev state and and a current state, and to record only
previous states and not the current one. This was mostly working
(except for a redo bug discoverred while working on this new
implementation) but was tedious.

The new undo implementation is more complex but makes it far easier
to use. That is, modules can just record the current state and they
don't need to keep a previous state at all.

The undo history and map support has been reimplemented with this
new semantics and have been cleaned-up as a consequence.

This work has been highly motivated by the fact that we want to support
undo/redo for masks and that it was far too complex to do right with
the previous implementation.
1 parent d8e7d14
Raw File
sync_wb_presets_with_ufraw-deepdiff 
#!/usr/bin/env ruby

require './rawspeed_common.rb'
require './wb_presets_common.rb'

require 'net/http'
require 'deep_merge'

UFRAWPRESETS=URI('http://ufraw.cvs.sourceforge.net/viewvc/ufraw/ufraw/wb_presets.c?content-type=text%2Fplain')
#UFRAWPRESETS=File.expand_path("/tmp/wb_presets.c")

puts "Fetching ufraw presets from their CVS, may take a moment..."
ufraw_presets = {}
Net::HTTP.get(UFRAWPRESETS).each_line do |line|
#File.open(UFRAWPRESETS).each do |line|
  WbPresetsCommon.parse_preset(ufraw_presets, line, true)
end

dt_presets = WbPresetsCommon.dt_presets()

forward_hash, backward_hash = RawSpeedCommon.generate_hashes()

ufraw_merged = {}
backward_hash.each do |clean_name, exif_names|
  exif_names.keys.each do |exif_name|
    if ufraw_presets[exif_name]
      if !ufraw_merged.key?(clean_name)
        ufraw_merged[clean_name] = ufraw_presets[exif_name]
      else
        ufraw_merged[clean_name].deep_merge!(ufraw_presets[exif_name])
      end
    end
  end
end

#output_presets(ufraw_merged)
#exit

grab_from_ufraw = {}
forward_hash.each do |exif_name, clean_name|
  if(ufraw_merged.key?(clean_name) && !dt_presets.key?(clean_name))
    grab_from_ufraw[clean_name] = ufraw_merged[clean_name]
  end
  if(ufraw_merged.key?(clean_name) && dt_presets.key?(clean_name))
    ufraw_merged[clean_name].each do |preset, hash|
      # different names for some Fluorescent, Tungsten, and Shade presets...
      # if(ufraw_merged[clean_name].key?(preset) && !dt_presets[clean_name].key?(preset))
      #   grab_from_ufraw[clean_name] = Hash.new if not grab_from_ufraw.key?(clean_name)
      #   grab_from_ufraw[clean_name][preset] = hash
      # end

      if((ufraw_merged[clean_name].length > dt_presets[clean_name].length) &&
         (ufraw_merged[clean_name].key?(preset) && !dt_presets[clean_name].key?(preset)))
        grab_from_ufraw[clean_name] = Hash.new if not grab_from_ufraw.key?(clean_name)
        grab_from_ufraw[clean_name][preset] = hash
      end

      if(ufraw_merged[clean_name].key?(preset) && dt_presets[clean_name].key?(preset))
        hash.each do |tune, values|
          if(ufraw_merged[clean_name][preset].key?(tune) && !dt_presets[clean_name][preset].key?(tune))
            grab_from_ufraw[clean_name] = Hash.new if not grab_from_ufraw.key?(clean_name)
            grab_from_ufraw[clean_name][preset] = Hash.new if not grab_from_ufraw[clean_name].key?(preset)
            grab_from_ufraw[clean_name][preset][tune] = values
          end

          if(ufraw_merged[clean_name][preset].key?(tune) && dt_presets[clean_name][preset].key?(tune) &&
             (
              (ufraw_merged[clean_name][preset][tune].join(',').length > dt_presets[clean_name][preset][tune].join(',').length) ||
              (
               ((ufraw_merged[clean_name][preset][tune][0] - dt_presets[clean_name][preset][tune][0]).abs > 1.0e-6) &&
               ufraw_merged[clean_name][preset][tune][0].to_s.length >= dt_presets[clean_name][preset][tune][0].to_s.length
              ) ||
              (
               ((ufraw_merged[clean_name][preset][tune][2] - dt_presets[clean_name][preset][tune][2]).abs > 1.0e-6) &&
               ufraw_merged[clean_name][preset][tune][0].to_s.length >= dt_presets[clean_name][preset][tune][0].to_s.length
              )
             )
            )

            grab_from_ufraw[clean_name] = Hash.new if not grab_from_ufraw.key?(clean_name)
            grab_from_ufraw[clean_name][preset] = Hash.new if not grab_from_ufraw[clean_name].key?(preset)
            grab_from_ufraw[clean_name][preset][tune] = values
          end
        end
      end
    end
  end
end

WbPresetsCommon.output_presets(grab_from_ufraw)
exit

# vim: tabstop=2 expandtab shiftwidth=2 softtabstop=2
# kate: tab-width: 2; replace-tabs on; indent-width 2; tab-indents: off;
# kate: indent-mode ruby; remove-trailing-spaces modified;
back to top