Mercurial > epgrec.yaz
comparison index.php @ 50:c18851a70d33
fix: height use real number
author | Sushi-k <epgrec@park.mda.or.jp> |
---|---|
date | Tue, 28 Jul 2009 19:18:00 +0900 |
parents | 2bc96d657ba1 |
children | 31f73a50ae33 |
comparison
equal
deleted
inserted
replaced
49:f8f6e0d3acaf | 50:c18851a70d33 |
---|---|
65 foreach( $reca as $prg ) { | 65 foreach( $reca as $prg ) { |
66 // 前プログラムとの空きを調べる | 66 // 前プログラムとの空きを調べる |
67 $start = toTimestamp( $prg['starttime'] ); | 67 $start = toTimestamp( $prg['starttime'] ); |
68 if( $start - $prev_end ) { | 68 if( $start - $prev_end ) { |
69 $height = ($start-$prev_end) * $settings->height_per_hour / 3600; | 69 $height = ($start-$prev_end) * $settings->height_per_hour / 3600; |
70 if( $height > 0.5 ) { | 70 $height = $height; |
71 $height = (int)$height; | 71 $programs[$st]['list'][$num]['category_none'] = "none"; |
72 $programs[$st]['list'][$num]['category_none'] = "none"; | 72 $programs[$st]['list'][$num]['height'] = $height; |
73 $programs[$st]['list'][$num]['height'] = $height; | 73 $programs[$st]['list'][$num]['title'] = ""; |
74 $programs[$st]['list'][$num]['title'] = ""; | 74 $programs[$st]['list'][$num]['starttime'] = ""; |
75 $programs[$st]['list'][$num]['starttime'] = ""; | 75 $programs[$st]['list'][$num]['description'] = ""; |
76 $programs[$st]['list'][$num]['description'] = ""; | 76 $num++; |
77 $num++; | |
78 } | |
79 } | 77 } |
80 $prev_end = toTimestamp( $prg['endtime'] ); | 78 $prev_end = toTimestamp( $prg['endtime'] ); |
81 | 79 |
82 $height = (int)((toTimestamp($prg['endtime']) - toTimestamp($prg['starttime'])) * $settings->height_per_hour / 3600); | 80 $height = ((toTimestamp($prg['endtime']) - toTimestamp($prg['starttime'])) * $settings->height_per_hour / 3600); |
83 // $top_time より早く始まっている番組 | 81 // $top_time より早く始まっている番組 |
84 if( toTimestamp($prg['starttime']) <$top_time ) { | 82 if( toTimestamp($prg['starttime']) <$top_time ) { |
85 $height = (int)((toTimestamp($prg['endtime']) - $top_time ) * $settings->height_per_hour / 3600); | 83 $height = ((toTimestamp($prg['endtime']) - $top_time ) * $settings->height_per_hour / 3600); |
86 } | 84 } |
87 // $last_time より遅く終わる番組 | 85 // $last_time より遅く終わる番組 |
88 if( toTimestamp($prg['endtime']) > $last_time ) { | 86 if( toTimestamp($prg['endtime']) > $last_time ) { |
89 $height = (int)(($last_time - toTimestamp($prg['starttime'])) * $settings->height_per_hour / 3600); | 87 $height = (($last_time - toTimestamp($prg['starttime'])) * $settings->height_per_hour / 3600); |
90 } | 88 } |
91 | 89 |
92 // プログラムを埋める | 90 // プログラムを埋める |
93 $cat = new DBRecord( CATEGORY_TBL, "id", $prg['category_id'] ); | 91 $cat = new DBRecord( CATEGORY_TBL, "id", $prg['category_id'] ); |
94 $programs[$st]['list'][$num]['category_name'] = $cat->name_en; | 92 $programs[$st]['list'][$num]['category_name'] = $cat->name_en; |
108 exit( $e->getMessage() ); | 106 exit( $e->getMessage() ); |
109 } | 107 } |
110 // 空きを埋める | 108 // 空きを埋める |
111 if( $last_time - $prev_end ) { | 109 if( $last_time - $prev_end ) { |
112 $height = ($last_time - $prev_end) * $settings->height_per_hour / 3600; | 110 $height = ($last_time - $prev_end) * $settings->height_per_hour / 3600; |
113 if( $height > 0.5 ) { | 111 $height = $height; |
114 $height = (int)$height; | 112 $programs[$st]['list'][$num]['category_name'] = "none"; |
115 $programs[$st]['list'][$num]['category_name'] = "none"; | 113 $programs[$st]['list'][$num]['height'] = $height; |
116 $programs[$st]['list'][$num]['height'] = $height; | 114 $programs[$st]['list'][$num]['title'] = ""; |
117 $programs[$st]['list'][$num]['title'] = ""; | 115 $programs[$st]['list'][$num]['starttime'] = ""; |
118 $programs[$st]['list'][$num]['starttime'] = ""; | 116 $programs[$st]['list'][$num]['description'] = ""; |
119 $programs[$st]['list'][$num]['description'] = ""; | 117 $num++; |
120 $num++; | |
121 } | |
122 } | 118 } |
123 $st++; | 119 $st++; |
124 } | 120 } |
125 $prec = null; | 121 $prec = null; |
126 | 122 |