remove blocks view (superseded by source)
This commit is contained in:
parent
be76a57fde
commit
e8b0a38478
@ -18,7 +18,7 @@ $susy: (
|
|||||||
}
|
}
|
||||||
|
|
||||||
.source_view {
|
.source_view {
|
||||||
@include span(4);
|
@include span(7);
|
||||||
margin-left: span(1);
|
margin-left: span(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@ require "base/list_view"
|
|||||||
require "views/switch_view"
|
require "views/switch_view"
|
||||||
require "views/status_view"
|
require "views/status_view"
|
||||||
require "views/source_view"
|
require "views/source_view"
|
||||||
require "views/blocks_view"
|
|
||||||
require "views/instruction_view"
|
require "views/instruction_view"
|
||||||
require "views/registers_view"
|
require "views/registers_view"
|
||||||
|
|
||||||
@ -32,7 +31,6 @@ class MainView < ListView
|
|||||||
@interpreter = Interpreter::Interpreter.new
|
@interpreter = Interpreter::Interpreter.new
|
||||||
super( [SwitchView.new(@interpreter) ,
|
super( [SwitchView.new(@interpreter) ,
|
||||||
SourceView.new(@interpreter) ,
|
SourceView.new(@interpreter) ,
|
||||||
BlocksView.new(@interpreter) ,
|
|
||||||
InstructionView.new(@interpreter) ,
|
InstructionView.new(@interpreter) ,
|
||||||
StatusView.new(@interpreter) ,
|
StatusView.new(@interpreter) ,
|
||||||
RegistersView.new(@interpreter) ] )
|
RegistersView.new(@interpreter) ] )
|
||||||
|
@ -1,52 +0,0 @@
|
|||||||
|
|
||||||
class BlocksView < ListView
|
|
||||||
|
|
||||||
def initialize interpreter
|
|
||||||
@interpreter = interpreter
|
|
||||||
@interpreter.register_event(:instruction_changed, self)
|
|
||||||
@interpreter.register_event(:state_changed, self)
|
|
||||||
show = []
|
|
||||||
show << LabelView.new(@interpreter.instruction) if @interpreter.instruction.is_a?(Register::Label)
|
|
||||||
super(show)
|
|
||||||
end
|
|
||||||
|
|
||||||
def draw
|
|
||||||
super()
|
|
||||||
wrap_element div("div.labels_view") << div("h4" , "Method + Block " ) << div("h4.method" , @method_name)
|
|
||||||
return @element
|
|
||||||
end
|
|
||||||
|
|
||||||
def instruction_changed
|
|
||||||
return unless @interpreter.instruction.is_a?(Register::Label)
|
|
||||||
if @children.last
|
|
||||||
return if @interpreter.instruction.object_id == @children.last.label.object_id
|
|
||||||
@elements.last.at_css(".bright").remove_class("bright")
|
|
||||||
end
|
|
||||||
append_view( LabelView.new(@interpreter.instruction) )
|
|
||||||
remove_first if( @elements.length > 6)
|
|
||||||
end
|
|
||||||
|
|
||||||
def state_changed old , new_s
|
|
||||||
return unless new_s == :running
|
|
||||||
clear_view
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
class LabelView < ElementView
|
|
||||||
|
|
||||||
def initialize label
|
|
||||||
@label = label
|
|
||||||
end
|
|
||||||
attr_reader :label
|
|
||||||
|
|
||||||
def draw
|
|
||||||
@element = div("div") << div("span.bright" , label_name )
|
|
||||||
end
|
|
||||||
|
|
||||||
def label_name
|
|
||||||
return @label if @label.is_a? String
|
|
||||||
@label.name
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
@ -8,13 +8,16 @@ class SourceView < ElementView
|
|||||||
def draw
|
def draw
|
||||||
@text = div
|
@text = div
|
||||||
@ticker = div
|
@ticker = div
|
||||||
@element = div(".source_view") << div("h4" ,"Future") << @ticker << @text
|
@element = div(".source_view") << div("h4.source" , "Class.Method") << @ticker << @text
|
||||||
@element
|
@element
|
||||||
end
|
end
|
||||||
|
|
||||||
def instruction_changed
|
def instruction_changed
|
||||||
i = @interpreter.instruction
|
i = @interpreter.instruction
|
||||||
return "" unless i
|
return "" unless i
|
||||||
|
if( i.is_a?(Register::Label) and i.name.include?("."))
|
||||||
|
@element.at_css(".source").text = i.name
|
||||||
|
end
|
||||||
case i.source
|
case i.source
|
||||||
when AST::Node
|
when AST::Node
|
||||||
update_code
|
update_code
|
||||||
|
Loading…
x
Reference in New Issue
Block a user