X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fpanel_picture.rb;h=31c4305edf8e7971ea6c1a8d10f60a56caaeef0b;hb=4b5ea5abe420f26bd59a7f869b38893394306243;hp=f719af105ac0722ea6f689e33ea1bf9b741b1979;hpb=e238f6a0e79f30d8a9fca5f9af3a1fa6317f401a;p=pettanr%2Fpettanr.git

diff --git a/app/models/panel_picture.rb b/app/models/panel_picture.rb
index f719af10..31c4305e 100644
--- a/app/models/panel_picture.rb
+++ b/app/models/panel_picture.rb
@@ -1,22 +1,38 @@
 class PanelPicture < ActiveRecord::Base
   belongs_to :panel
-  belongs_to :resource_picture
+  belongs_to :picture
   
-  validates :width, :presence => true, :numericality => true, :not_zero => true
-  validates :height, :presence => true, :numericality => true, :not_zero => true
+  validates :panel_id, :numericality => {:allow_blank => true}
+  validates :picture_id, :numericality => true, :existence => true
+  validates :link, :length => {:maximum => 200}, :url => {:allow_blank => true}
+  validates :x, :presence => true, :numericality => true
+  validates :y, :presence => true, :numericality => true
+  validates :width, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :resize => true, :sync_vh => true
+  validates :height, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :resize => true, :sync_vh => true
+  validates :z, :presence => true, :numericality => {:greater_than => 0}
+  validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
   def flip
-    res = (self.height < 0 ? '' : 'v') + (self.width == 0 ? '' : 'h')
+    res = (self.height > 0 ? '' : 'v') + (self.width > 0 ? '' : 'h')
     res += '/' unless res.empty?
     res
   end
   
   def filename
-    flip + self.resource_picture.filename
+    self.flip + self.picture.filename
   end
   
   def url
-    '/resource_pictures/' + filename
+    '/pictures/' + self.filename
+  end
+  
+  def opt_img_tag
+    {:src => self.url, :vPicture => self.id, :width => self.width.abs, :height => self.height.abs, :alt => self.caption, :style => "top:#{self.y}px; left:#{self.x}px; z-index:#{self.z}; "}
+  end
+  
+  def tmb_opt_img_tag
+    tw, th = PettanImager.thumbnail_size(self.width.abs, self.height.abs)
+    {:src => self.url, :width => tw, :height => th, :alt => self.caption}
   end
   
   def self.default_page_size
@@ -40,26 +56,28 @@ class PanelPicture < ActiveRecord::Base
     page_size
   end
   
-  def self.offset cnt, prm = nil
-    offset = prm.to_i
-    offset = cnt - 1 if offset >= cnt
-    offset = cnt - offset.abs if offset < 0
-    offset = 0 if offset < 0
-    offset
-  end
-  
-  def self.list opt = {}, page = 1, page_size = self.default_page_size
-    opt.merge!(self.list_opt) unless opt[:include]
-    opt.merge!({:order => 'updated_at desc', :limit => page_size, :offset => (page -1) * page_size})
+  def self.list page = 1, page_size = self.default_page_size
+    opt = {}
+    opt.merge!(PanelPicture.list_opt)
+    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
+    opt.merge!({:conditions => 'panels.publish > 0', :order => 'panel_pictures.updated_at desc'})
     PanelPicture.find(:all, opt)
   end
   
   def self.list_opt
-    {:include => [:panel, {:resource_picture => [:artist, :license]}]}
+    {:include => {:panel => {:author => {}}, :picture => {:artist => {}, :license => {}}}}
   end
   
   def self.list_json_opt
-    {:include => {:panel => {}, :resource_picture => [:artist, :license]}}
+    {:include => {:panel => {:include => {:author => {}}}, :picture => {:include => {:artist => {}, :license => {}}} }}
+  end
+  
+  def self.mylist au, page = 1, page_size = Author.default_panel_picture_page_size
+    opt = {}
+    opt.merge!(PanelPicture.list_opt)
+    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
+    opt.merge!({:conditions => ['panels.author_id = ?', au.id], :order => 'panel_pictures.updated_at desc'})
+    PanelPicture.find(:all, opt)
   end
   
 end