Changeset 20011 for branches/version-2_5-dev/data

Timestamp:

2011/01/20 13:15:44 (13 years ago)

Author:

Seasoft

Message:

#834(パスに関わるパラメータ名が不適切)

Location:

branches/version-2_5-dev/data/class

Files:

• graph/SC_GraphBase.php (modified) (4 diffs)
• pages/admin/design/LC_Page_Admin_Design_Up_Down.php (modified) (1 diff)

branches/version-2_5-dev/data/class/graph/SC_GraphBase.php

@@ -23 +23 @@
 
 /** TTFフォントファイル */
-define("FONT_PATH", DATA_REALDIR . "fonts/wlmaru20044.ttf");
+define("FONT_REALFILE", DATA_REALDIR . "fonts/wlmaru20044.ttf");
 
 /** フォントサイズ */
@@ -262 +262 @@
             ※正確な値が取得できなかったので廃止
             // テキスト幅の取得
-            $arrPos = imagettfbbox($font_size, 0, FONT_PATH, $text);
+            $arrPos = imagettfbbox($font_size, 0, FONT_REALFILE, $text);
             $ret = $arrPos[2] - $arrPos[0];
         */
@@ -294 +294 @@
         //$text = mb_convert_encoding($text, CHAR_CODE);
         if($color != NULL) {
-            ImageTTFText($this->image, $font_size, $angle, $left, $top + $font_size, $color, FONT_PATH, $text);
+            ImageTTFText($this->image, $font_size, $angle, $left, $top + $font_size, $color, FONT_REALFILE, $text);
         } else {
-            ImageTTFText($this->image, $font_size, $angle, $left, $top + $font_size, $this->text_color, FONT_PATH, $text);
+            ImageTTFText($this->image, $font_size, $angle, $left, $top + $font_size, $this->text_color, FONT_REALFILE, $text);
         }
     }
@@ -316 +316 @@
         }
         // テキスト描画
-        ImageTTFText($this->image, FONT_SIZE, 0, LINE_PAD, $this->text_top, $this->text_color, FONT_PATH, $text);
+        ImageTTFText($this->image, FONT_SIZE, 0, LINE_PAD, $this->text_top, $this->text_color, FONT_REALFILE, $text);
         $this->text_top += FONT_SIZE + LINE_PAD;
     }

branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php

@@ -234 +234 @@
     }
     /**
-     * DBおよびTPL_PKG_PATHにテンプレートパッケージを追加する.
+     * DBおよびファイルシステムにテンプレートパッケージを追加する.
      *
      * @param object $objForm SC_FormParamのインスタンス