unageanu-jiji 0.1.0 → 1.0.0

data/html/js/utils.js

@@ -239,7 +239,10 @@ util.Button = function( id, imgName, action, alt, accesskey, enable, prefix, suf
   if (accesskey) { this.a.accessKey = accesskey; }
   this.n.appendChild( this.a );
   this.img = document.createElement("img");
-  if (alt)  { this.img.alt = accesskey ? alt + "( " +accesskey+ " )" : alt; }
+  if (alt)  { 
+     this.img.alt = accesskey ? alt + "( " +accesskey+ " )" : alt; 
+     this.img.title =  this.img.alt;
+  }
   this.img.src = prefix + this.imgName + suffix;
   this.img.style.width = this.n.style.width;
   var self = this;
@@ -389,6 +392,25 @@ util.BasicTable = {
     self.table.subscribe("rowMouseoverEvent", self.table.onEventHighlightRow);
     self.table.subscribe("rowMouseoutEvent", self.table.onEventUnhighlightRow);
     self.table.subscribe("rowClickEvent", self.table.onEventSelectRow);
+    
+    // リサイザーを強制的に利用可にする。
+    var res = document.getElementsByClassName("yui-dt-resizer", self.elementId);
+    for ( var i=0,n=res.length;i<n;i++ ) {
+      res[i].style.height = "19px";
+    }
+    
+    // ローディングを作成
+    this.table_elm = document.getElementById(self.elementId);
+    this.loading_elm = document.createElement('div');
+    this.loading_elm.innerHTML = fx.template.Templates.common.loading;
+    this.loading_elm.style.padding = "10px";
+    this.loading_elm.style.display = "none";
+    this.table_elm.parentNode.appendChild(this.loading_elm);
+    this.loading(true);
+  },
+  loading : function( on ) {
+    this.loading_elm.style.display = on ? "block" : "none";
+    this.table_elm.style.display = on ? "none" :  "block";
   },
   setData: function( data ) {
     if ( this.length() > 0 ) {
@@ -466,7 +488,7 @@ util.TopicPath.prototype = {
   set: function( path ) {
     var el = document.getElementById( this.elementId );
     if ( path ) {
-      el.innerHTML =  "<li>" + path.split(":").join("</li><li>") + "</li>";
+      el.innerHTML =  "<li>" + path.escapeHTML().split(":").join("</li><li>") + "</li>";
     } else {
       el.innerHTML = "";
     }
@@ -507,7 +529,7 @@ util.DateInput.prototype = {
     var el = document.getElementById( this.elementId );
     el.innerHTML = this.template.evaluate( {
       elementId: this.elementId,
-      title: this.title
+      title: this.title.escapeHTML()
     } );
     this.calendar = new YAHOO.widget.Calendar(this.elementId+"_cal", {
         iframe:false,          // Turn iframe off, since container has iframe support.
@@ -625,9 +647,9 @@ util.ColorPicker.prototype = {
     var bottom = "";
     var current = top;
     var list = ["11","33","55","77","99","BB","DD","FF"];
-    for ( var g=0;g<list.length;g++  ) {
-      for ( var r=0;r<list.length;r++  ) {
-        for ( var b=0;b<list.length;b++  ) {
+    for ( var g=0,gn=list.length;g<gn;g++  ) {
+      for ( var r=0,rn=list.length;r<rn;r++  ) {
+        for ( var b=0,bn=list.length;b<bn;b++  ) {
           var c = list[r] + list[g] +list[b];
           str = '<td><div class="block" style="background-color:#' + c + ';border:1px solid #' + c + ';"></div></td>'
           if ( r <= 3 ) {
@@ -673,9 +695,13 @@ util.ColorPicker.prototype = {
     }
     for ( var i=0,n=blocks.length;i<n;i++ ) {
       if ( blocks[i] == el  ) { continue; }
-      YAHOO.util.Event.addListener(blocks[i], "mouseover", enter);
-      YAHOO.util.Event.addListener(blocks[i], "mouseout", out);
-      YAHOO.util.Event.addListener(blocks[i], "click", click);
+// IE7だとリスナ登録がやたら遅いので、直接イベントハンドラを割り当てる。
+//      YAHOO.util.Event.addListener(blocks[i], "mouseover", enter);
+//      YAHOO.util.Event.addListener(blocks[i], "mouseout", out);
+//      YAHOO.util.Event.addListener(blocks[i], "click", click);
+      blocks[i].onmouseover=enter;
+      blocks[i].onmouseout=out;
+      blocks[i].onclick=click;
     }
 
     YAHOO.util.Event.addListener(document.body, "click", function( ev ) {
@@ -712,5 +738,17 @@ util.ColorPicker.prototype = {
   }
 }
 
+///**テンプレートに、引数の文字列をエスケープする機能を追加*/
+//Template.prototype.evaluate_org = Template.prototype.evaluate;
+//Template.prototype.evaluate = function( object ) {
+//  for( var i in object ) {
+//    if ( Object.isFunction(object[i].escapeHTML) ) {
+//      object[i] = object[i].escapeHTML();
+//    }
+//  }
+//  return this.evaluate_org( object );
+//}
+
+
 /**制御文字*/
 util.CONTROLL_CODE = /[\x00-\x1F\x7F]/

data/lib/jiji/agent/agent_manager.rb

@@ -33,7 +33,7 @@ module JIJI
       if @agents.key? id
         raise UserError.new( JIJI::ERROR_ALREADY_EXIST, "agent is already exist. id=#{id}")
       end
-      output = @registory.output( @id, id )
+      output = @registry.output( @id, id )
       op = AgentOperator.new( @operator, name )
       safe( conf.get( [:agent,:safe_level], 4) ){
         agent.operator = op
@@ -127,7 +127,7 @@ module JIJI
     attr :trade_result_dao, true
     attr :operator, true
     attr :conf, true
-    attr :registory, true
+    attr :registry, true
   end
 
 end

data/lib/jiji/agent/agent_registry.rb

@@ -236,7 +236,10 @@ module JIJI
       checked << m
       m.constants.each {|name|
         cl = m.const_get name
-        block.call( "#{get_name(cl.name)}@#{file}" ) if cl.kind_of?(Class) && cl < JIJI::Agent
+        begin 
+          block.call( "#{get_name(cl.name)}@#{file}" ) if cl.kind_of?(Class) && cl < JIJI::Agent
+        rescue Exception
+        end
         find_agent( file, cl, checked, &block ) if cl.kind_of?(Module)
       }
     end

data/lib/jiji/command.rb

@@ -86,6 +86,12 @@ securities:
 DATA
         }
         FileUtils.chmod(0600, "#{dir}/conf/configuration.yaml")
+
+        # サンプルエージェント
+        ["agents","shared_lib"].each {|d|
+          mkdir("#{dir}/#{d}")
+          FileUtils.copy( Dir.glob("#{__FILE__}/../../../base/#{d}/*"), "#{dir}/#{d}" )
+        }
       rescue Exception
         puts "[ERROR] setting failed.(#{$!.to_s})"
         return

data/lib/jiji/process.rb

@@ -15,7 +15,10 @@ module JIJI
 
     # コンストラクタ
     # 再起動後の復元の場合、プロパティを指定しないこと。この場合設定ファイルからロードされる。
-    def initialize( id, process_dir, agent_manager, props=nil, ignore_error=false )
+    def initialize( id, process_dir, agent_manager, props=nil, registry=nil, ignore_error=false )
+      
+      is_recreate = props == nil
+      @registry = registry
       @id = id
       @agent_manager = agent_manager
       @process_dir = process_dir
@@ -26,7 +29,7 @@ module JIJI
       FileUtils.mkdir_p dir
 
       prop_file = "#{dir}/props.yaml"
-      if props
+      if !is_recreate
         @props = props
         @props["agents"] = [] unless @props.key? "agents"
         save_props
@@ -40,8 +43,20 @@ module JIJI
         }
         @props["agents"] = [] unless @props.key? "agents"
       end
-      load_agent(ignore_error)
       
+      # 新規作成の場合はエージェントをロード
+      # 再起動後の再作成時は、アウトプロットのみ作成。
+      @outputs = {}
+      if !is_recreate
+        load_agent(ignore_error)
+      else
+        if @props && @props["agents"]
+          @props["agents"].each {|v|
+            @outputs[v["id"]] = @registry.output( @id, v["id"] )
+          }
+        end
+      end
+          
       # 取引の有効状態を更新
       @agent_manager.operator.trade_enable =
         @props["trade_enable"] ? true : false
@@ -55,8 +70,7 @@ module JIJI
         collector.start
       }
       # 状態を覚えておく
-      props["state"] = collector.state
-      save_props
+      self["state"] = collector.state
     end
 
     def stop
@@ -64,14 +78,18 @@ module JIJI
         if @started  # 起動していない場合は何もしない
           observer_manager.stop
           collector.stop
-          collector.logger.close
 
           # 状態を覚えておく
-          props["state"] = collector.state
-          save_props
+          self["state"] = collector.state
           @started = false
+        else
+          # 待機中の場合、キャンセル状態にする。
+          if props["state"] == :WAITING
+           self["state"] = :CANCELED
+          end
         end
       }
+      collector.logger.close
     end
 
     def state
@@ -132,7 +150,9 @@ module JIJI
     attr :observer_manager, true
     attr :process_dir, true
     attr :agent_manager, true
-
+    attr :outputs, true
+    attr :registry, true
+    
   private
 
     # 任意のエージェントの設定を更新する。
@@ -170,10 +190,12 @@ module JIJI
           begin
 	          agent = agent_manager.agent_registry.create( v["class"], v["properties"] )
 	          agent_manager.add( v["id"], agent, v["name"] )
+            @outputs[v["id"]] = agent.output
           rescue Exception
             raise $! unless ignore_error 
             # リアルトレードの場合、停止中にエージェントが破棄された場合を考慮し
-            # エージェントの初期化で失敗しても無視する。
+            # エージェントの初期化で失敗しても無視し、出力先だけ作成
+            @outputs[v["id"]] = @registry.output( @id, v["id"] )
           end
 	      }
       end

data/lib/jiji/process_manager.rb

@@ -40,6 +40,10 @@ module JIJI
       @registry.operator( "rmt", false, nil).stop
       @rmt.stop
       @mutex.synchronize {
+        @waiting.each {|i| 
+          i.collector.listeners.delete(self)
+          i.stop 
+        }
         @waiting.clear
         if @running != nil
           @running.collector.listeners.delete(self)
@@ -164,6 +168,9 @@ module JIJI
           else
             @running = nil
           end
+        else
+          # 待機中であればキューから除外。
+          @waiting = @waiting.reject{|i| i.id == id }
         end
       }
       @back_tests.delete( id )

data/lib/jiji/registry.rb

@@ -74,7 +74,9 @@ module JIJI
         r.register( :server_logger ) {
           dir = "#{r.base_dir}/#{r.conf.get([:dir,:log], "logs")}"
           FileUtils.mkdir_p dir
-          Logger.new( dir + "/log.txt", 10, 512*1024 )
+          l = Logger.new( dir + "/log.txt", 10, 512*1024 )
+          l.level = Logger::DEBUG
+          l
         }
         r.register( :process_logger, :model=>:multiton_initialize ) {|c,p,id|
           dir = "#{r.process_dir}/#{id}"
@@ -129,7 +131,7 @@ module JIJI
           c = JIJI::AgentManager.new( id, r.agent_registry, r.process_logger(id), failsafe )
           c.operator = r.operator(id, false, nil) # 作成段階では常に取引は行なわない。
           c.client   = r.client
-          c.registory = r
+          c.registry = r
           c.conf = r.conf
           c.trade_result_dao = r.trade_result_dao(id)
           c
@@ -177,7 +179,7 @@ module JIJI
 
         # RMTプロセス
         r.register( :rmt_process ) {
-          c = JIJI::Process.new("rmt", r.process_dir, r.agent_manager("rmt",true), nil, true)
+          c = JIJI::Process.new("rmt", r.process_dir, r.agent_manager("rmt",true), nil, r, true)
           c.observer_manager = r.rmt_observer_manager
           c.collector = r.rmt_collector
           c
@@ -186,7 +188,7 @@ module JIJI
         r.register( :backtest_process, :model=>:multiton_initialize ) {|c,p,id, props|
           # 既存のバックテストを読み込む場合、プロパティはnil
           # このときエージェントの初期化で失敗しても無視する。(テスト実行後にエージェントが書き換えられた場合に起こりえる。)
-          c = JIJI::Process.new(id, r.process_dir, r.agent_manager(id,false), props, props == nil)
+          c = JIJI::Process.new(id, r.process_dir, r.agent_manager(id,false), props, r, props == nil)
           c.observer_manager = r.backtest_observer_manager(id)
           c.collector = r.backtest_collector(id,
             Time.at( c["start_date"]), Time.at( c["end_date"]))

data/lib/jiji/server.rb

@@ -14,7 +14,12 @@ module JIJI
       
       conf = registry[:conf]
       param[:Port] = conf.get([:server,:port], 7000).to_i 
-      param[:ServerType] = WEBrick::Daemon
+      begin
+        fork{}
+        param[:ServerType] = WEBrick::Daemon
+      rescue Exception
+      end
+      
       param[:Logger] = registry[:server_logger]  
       param[:DocumentRoot] = File.expand_path( "#{__FILE__}/../../../html" )
       

data/lib/jiji/service/output_service.rb

@@ -8,8 +8,9 @@ module JIJI
         list = {}
         names.each {|n|
 	        buff = []
-          outputs = p.agent_manager.get(n[0]).output
-	        outputs.get(n[1]).each( scale,
+          outputs = p.outputs[n[0]]
+	        next unless outputs
+          outputs.get(n[1]).each( scale,
             Time.at(start_time), Time.at(end_time) ) {|data|
 	          buff << data
 	        }
@@ -22,8 +23,8 @@ module JIJI
       # プロセスの出力一覧を取得する
       def list_outputs( process_id )
         p = process_manager.get( process_id )
-        return p.agent_manager.inject({}) {|buff,item|
-          buff[item[0]] = item[1].output.inject({}) {|r,v|
+        return p.outputs.inject({}) {|buff,item|
+          buff[item[0]] = item[1].inject({}) {|r,v|
             r[v[0]] = v[1].options
             r
           }
@@ -34,8 +35,11 @@ module JIJI
       # アウトプットのプロパティを設定
       def set_properties( process_id, name, properties )
         p = process_manager.get( process_id )
-        outputs = p.agent_manager.get(name[0]).output
-        outputs.get(name[1]).set_properties( properties )
+        outputs = p.outputs[name[0]]
+        raise UserError.new( JIJI::ERROR_NOT_FOUND, "output not found. name=#{name[0]}") unless outputs
+        out = outputs.get(name[1])
+        raise UserError.new( JIJI::ERROR_NOT_FOUND, "output not found. name=#{name[0]}:#{name[1]}") unless out
+        out.set_properties( properties )
         return :success
       end
 

data/swf/chart/fx/chart/Chart.as

@@ -94,7 +94,7 @@ package fx.chart {
 
 
       } catch ( ex:Error ) {
-        log(ex.message + ":" + ex.getStackTrace());
+        //log(ex.message + ":" + ex.getStackTrace());
       }
     }
     /**
@@ -104,6 +104,9 @@ package fx.chart {
         ExternalInterface.addCallback("initializeChart", this.initializeChart );
         ExternalInterface.addCallback("setDate", function( date:Number ):void {
             ctrl.changeDate( Util.createDate(date) );
+            pointer.setPosition( 
+                    rc.stage.candle.left + (rc.stage.candle.width/2) + 11,
+                    rc.stage.candle.bottom - (rc.stage.candle.height/4));
         } );
         ExternalInterface.addCallback("setGraphVisible", this.setGraphVisible );
         ExternalInterface.addCallback("setGraphColors", this.setGraphColors );

data/swf/chart/fx/chart/ui/Constants.as

@@ -39,15 +39,15 @@ package fx.chart.ui {
     /**
      * 取引:+
      */
-    public static const COLOR_UP:uint = 0xEE5B8E;//0xD65B7E;
+    public static const COLOR_UP:uint = 0xFE4B7E;//0xD65B7E;
     /**
      * 取引:-
      */
-    public static const COLOR_DOWN:uint = 0x5B8Eee;//0x78A0D9;
+    public static const COLOR_DOWN:uint = 0x4B7EFF;//0x78A0D9;
     /**
      * 取引:同じ
      */
-    public static const COLOR_DRAW:uint = 0xA79CE0;//0x8C83c2;
+    public static const COLOR_DRAW:uint = 0x978CD0;//0x8C83c2;
 
     public static const COLOR_UP_3:uint = 0xE35080;
     public static const COLOR_UP_2:uint = 0xC46F8A;

data/swf/chart/fx/chart/ui/InformationWindow.as

@@ -98,49 +98,53 @@ package fx.chart.ui {
         window.window.addChild( item );
       } );
     }
-    public function onMouseMove( ev:MouseEvent ):void {
-      var stageWidth:int = rc.stage.width;
-      var stageHeight:int = rc.stage.height;
-      if ( model.rateDatas &&
-          ev.stageX >= rc.stage.candle.left+1 &&
-          ev.stageX < rc.stage.candle.right &&
-          ev.stageY > rc.stage.candle.top &&
-          ev.stageY <= rc.stage.profit.bottom ) {
-
-        window.window.visible = true;
-
-        infoLayer.x = ev.stageX > rc.stage.candle.right - WIDTH -10 ? ev.stageX-15-WIDTH : ev.stageX+15;
-        infoLayer.y = ev.stageY > rc.stage.profit.bottom - HEIGHT -10 ? ev.stageY-15-HEIGHT : ev.stageY+15;
-
-        var daten:Number = model.positionManager.toDate(ev.stageX-rc.stage.candle.left-2);
-        daten = Math.ceil( daten / model.scaleTime ) * model.scaleTime;
-
-        // x,y
-        var date:Date = new Date();
-        date.setTime( daten*1000 );
-        textFields["x"].text = Util.formatDate( date );
-        if ( ev.stageY < rc.stage.candle.bottom ) {
-          var rate:Number = model.positionManager.toRate(
-              rc.stage.candle.bottom - ev.stageY, rc.stage.candle.height);
-          var l:int = 5 - (rate == 0 ? 1 : Math.log(rate)*Math.LOG10E);
-          textFields["y"].text = rate.toFixed(l);
-        } else if ( ev.stageY > rc.stage.profit.top ) {
-          var profit:Number = model.positionManager.toProfit(
-              rc.stage.profit.bottom - ev.stageY, rc.stage.profit.height);
-          textFields["y"].text = Math.ceil(profit/100)*100;
+    public function setPosition( x:int, y:int ):void {
+        var stageWidth:int = rc.stage.width;
+        var stageHeight:int = rc.stage.height;
+        if ( model.rateDatas &&
+            x >= rc.stage.candle.left+1 &&
+            x < rc.stage.candle.right &&
+            y > rc.stage.candle.top &&
+            y <= rc.stage.profit.bottom ) {
+    
+          window.window.visible = true;
+    
+          infoLayer.x = x > rc.stage.candle.right - WIDTH -10 ? x-15-WIDTH : x+15;
+          infoLayer.y = y > rc.stage.profit.bottom - HEIGHT -10 ? y-15-HEIGHT : y+15;
+    
+          var daten:Number = model.positionManager.toDate(x-rc.stage.candle.left-2);
+          daten = Math.ceil( daten / model.scaleTime ) * model.scaleTime;
+    
+          // x,y
+          var date:Date = new Date();
+          date.setTime( daten*1000 );
+          textFields["x"].text = Util.formatDate( date );
+          if ( y < rc.stage.candle.bottom ) {
+            var rate:Number = model.positionManager.toRate(
+                rc.stage.candle.bottom - y, rc.stage.candle.height);
+            var l:int = 5 - (rate == 0 ? 1 : Math.log(rate)*Math.LOG10E);
+            textFields["y"].text = rate.toFixed(l);
+          } else if ( y > rc.stage.profit.top ) {
+            var profit:Number = model.positionManager.toProfit(
+                rc.stage.profit.bottom - y, rc.stage.profit.height);
+            textFields["y"].text = Math.ceil(profit/100)*100;
+          } else {
+            textFields["y"].text = "-";
+          }
+    
+          // レート
+          updateRate( daten );
+    
+          // 収益
+          updateProfit(daten);
+    
         } else {
-          textFields["y"].text = "-";
+          window.window.visible = false;
         }
-
-        // レート
-        updateRate( daten );
-
-        // 収益
-        updateProfit(daten);
-
-      } else {
-        window.window.visible = false;
-      }
+    }
+    
+    public function onMouseMove( ev:MouseEvent ):void {
+        setPosition(ev.stageX, ev.stageY)
     }
     private function updateRate( date:Number ):void {
       if ( model.rateDatas ) {

data/swf/chart/fx/chart/ui/Pointer.as

@@ -48,11 +48,13 @@ package fx.chart.ui {
       // イベントをキャプチャ
       pointerLayer.stage.addEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
     }
-
+    public function setPosition( x:int, y:int ):void {
+        pointerLayerY.x = x;
+        pointerLayerX.y = y;
+        informationWindow.setPosition(x,y);
+    }
     private function onMouseMove( ev:MouseEvent ):void {
-      pointerLayerY.x = ev.stageX;
-      pointerLayerX.y = ev.stageY;
-      informationWindow.onMouseMove(ev);
+        setPosition( ev.stageX, ev.stageY );
     }
   }
 

data/swf/chart/fx/chart/ui/Scroll.as

@@ -139,8 +139,9 @@ package fx.chart.ui {
       if ( scrollMax <= scrollMin  ) {
         // 移動後の範囲が、表示可能範囲外
         // スクロール不可
-        step = 0;
-        positionLeft = scroll.positionLeft;
+//        step = 0;
+//        positionLeft = scroll.positionLeft;
+        return;
       } else if (  scrollMax <= step ) {
         step = scrollMax;
         positionLeft = 0;

data/swf/chart/fx/chart/ui/Stage.as

@@ -12,7 +12,7 @@ package fx.chart.ui {
     /** コントローラー */
     public static const CONTROLLER:Number = 30;
     /** グラフ表示領域 */
-    public static const GRAPH:Number = 70;
+    public static const GRAPH:Number = 80;
     /** トレード結果表示領域 */
     public static const TRADE:Number = 40;
     /** X軸 */
@@ -72,9 +72,9 @@ package fx.chart.ui {
           height - (PADDING+PROFIT+X_AXIS+GRAPH+PADDING+CONTROLLER) );
       graph = new Rectangle(
           PADDING_LEFT,
-          height - (PADDING+PROFIT+X_AXIS+GRAPH) -50 ,
+          height - (PADDING+PROFIT+X_AXIS+GRAPH) ,
           width - PADDING - PADDING_LEFT,
-          GRAPH + 50 );
+          GRAPH  );
       xAxis = new Rectangle(
           PADDING_LEFT,
           height - (PADDING+PROFIT+X_AXIS),

data/swf/chart/fx/chart/ui/TradeDetailWindow.as

@@ -13,7 +13,7 @@ package fx.chart.ui {
   public class TradeDetailWindow extends AbstractChartUI  {
 
     private static const WIDTH:int = 230;
-    private static const HEIGHT:int = 100;
+    private static const HEIGHT:int = 117;
 
     private var infoLayer:Sprite;
     private var window:Window;
@@ -40,21 +40,21 @@ package fx.chart.ui {
 
       var g:Graphics = window.window.graphics;
 
-      g.lineStyle( 0, 0xE3E3E0, 1,
+      g.lineStyle( 0, 0xD3D3D0, 1,
           true, LineScaleMode.NONE, CapsStyle.NONE, JointStyle.BEVEL );
       g.moveTo( 10, 35 );
       g.lineTo( WIDTH-10, 35 );
-      g.moveTo( 10, 60 );
-      g.lineTo( WIDTH-10, 60 );
+      g.moveTo( 10, 77 );
+      g.lineTo( WIDTH-10, 75 );
 
       // 最初は非表示
       infoLayer.visible = false;
 
       textFields["result"] = createTextField( 10,5,220,24,Constants.TEXT_FORMAT_TINFO_PROFIT_UP );
       textFields["info"] = createTextField( 40,40,180,15,Constants.TEXT_FORMAT_TINFO_INFO );
-
+      textFields["trader"] = createTextField( 10,57,180,15,Constants.TEXT_FORMAT_INFO_BASIC_L  );
       (["start","end"]).forEach( function( item:*,i:int,arr:Array ):void{
-        textFields[item] = createTextField( 40,63+i*15,190,15,Constants.TEXT_FORMAT_INFO_BASIC_L );
+        textFields[item] = createTextField( 40,80+i*15,190,15,Constants.TEXT_FORMAT_INFO_BASIC_L );
       } );
 
       sell = new Constants.ICON_SELL();
@@ -71,7 +71,7 @@ package fx.chart.ui {
       var end:Bitmap = new Constants.ICON_END_LABEL();
       ([start,end]).forEach( function( item:*,i:int,arr:Array ):void{
         item.x = 11;
-        item.y = 66+i*15;
+        item.y = 82+i*15;
         window.window.addChild( item );
       } );
 
@@ -112,7 +112,8 @@ package fx.chart.ui {
         sell.visible = false;
         buy.visible = true;
       }
-      textFields["info"].text = " / " + d["pair"] + " / " + int( d["price"] / d["rate"])
+      textFields["trader"].text = d["trader"] ? d["trader"] : "-";
+      textFields["info"].text = " / " + d["pair"] + " / " + int( d["price"] / d["rate"]);
       textFields["start"].text = d["rate"] + " " + formatDate( d["date"] );
       if ( d["fix_rate"] && d["fix_date"] ) {
         textFields["end"].text = d["fix_rate"] + " " + formatDate( d["fix_date"] );

data/swf/chart/fx/chart/ui/TradeResult.as

@@ -198,14 +198,7 @@ package fx.chart.ui {
       var middle:int = profit.top + profit.height/2;
 
       // 0
-      var zero:TextField = new TextField();
-      zero.selectable = false;
-      zero.text = "0";
-      zero.width = profit.left-1;
-      zero.setTextFormat( Constants.TEXT_FORMAT_SCALE_Y );
-      zero.y = middle-7;
-      zero.x = 0;
-      axis.addChild(zero);
+      createText( "0", axis,  Constants.TEXT_FORMAT_SCALE_Y,  0, middle-8, profit.left-2 );
 
       // 背景
 //      axis.graphics.lineStyle( 0, Constants.COLOR_AXIS_HI );
@@ -238,14 +231,7 @@ package fx.chart.ui {
         lowAxis.graphics.moveTo( rc.stage.candle.left+1, y );
         lowAxis.graphics.lineTo( rc.stage.candle.right, y );
 
-        var scaleText:TextField = new TextField();
-        scaleText.selectable = false;
-        scaleText.text = tmp.toString();
-        scaleText.width = rc.stage.candle.left;
-        scaleText.setTextFormat( Constants.TEXT_FORMAT_SCALE_Y );
-        scaleText.y = y-7;
-        scaleText.x = 0;
-        axis.addChild(scaleText);
+        createText( tmp.toString(), axis,  Constants.TEXT_FORMAT_SCALE_Y,  0, y-8, rc.stage.candle.left-2 );
       }
 
 
@@ -328,7 +314,7 @@ class Slot {
   public function add( trade:Object ):void {
     data.push( trade );
     last = trade.fix_date;
-    log("last:" + String(last) )
+    //log("last:" + String(last) )
   }
 }