Commit b33a591d authored by Maxime Perrotin's avatar Maxime Perrotin

Make concurrency view generation compatible with kazoo

parent 9a3e7b19
...@@ -142,31 +142,41 @@ namespace eval concurrencyview { ...@@ -142,31 +142,41 @@ namespace eval concurrencyview {
if { $res == 0 } { if { $res == 0 } {
if { [file exists "ConcurrencyView/process.aadl" ] } { if { [file exists "ConcurrencyView/process.aadl" ] } {
File::delete "$cvFilename" File::delete "$cvFilename"
File::copy "ConcurrencyView/process.aadl" "$cvFilename" File::copy "ConcurrencyView/process.aadl" "$cvFilename"
set chan [open "$cvFilename" a+ ] set chan [open "$cvFilename" a+ ]
fconfigure $chan -translation lf fconfigure $chan -translation lf
foreach threadFile [glob -nocomplain -type f -directory "ConcurrencyView" *_Thread.aadl ] { foreach threadFile [glob -nocomplain -type f -directory "ConcurrencyView" *_Thread.aadl ] {
set fin [ open $threadFile r ] set fin [ open $threadFile r ]
set content [read -nonewline $fin] set content [read -nonewline $fin]
close $fin close $fin
puts $chan $content puts $chan $content
puts $chan "\n\n" puts $chan "\n\n"
} }
set OCARINA_COMPONENTS "$tasteConfigDir/share/ocarina/AADLv2/ocarina_components.aadl" set OCARINA_COMPONENTS "$tasteConfigDir/share/ocarina/AADLv2/ocarina_components.aadl"
set fin [ open $OCARINA_COMPONENTS r ] set fin [ open $OCARINA_COMPONENTS r ]
set content [read -nonewline $fin] set content [read -nonewline $fin]
close $fin close $fin
puts $chan $content puts $chan $content
close $chan close $chan
::API::HMI::loadUI "$cvFilename" "concurrencyview"
return [list 0 ""]
::API::HMI::loadUI "$cvFilename" "concurrencyview"
return [list 0 ""]
} }
else if { [file exists "work/build/system.aadl" ] } {
File::delete "$cvFilename"
File::copy "work/build/system.aadl" "$cvFilename"
set chan [open "$cvFilename" a+ ]
fconfigure $chan -translation lf
set OCARINA_COMPONENTS "$tasteConfigDir/share/ocarina/AADLv2/ocarina_components.aadl"
set fin [ open $OCARINA_COMPONENTS r ]
set content [read -nonewline $fin]
close $fin
puts $chan $content
close $chan
::API::HMI::loadUI "$cvFilename" "concurrencyview"
return [list 0 ""]
}
} else { } else {
return [list 1 [list "taste-edit-concurrency-view error:\n$errMsg" ] ] return [list 1 [list "taste-edit-concurrency-view error:\n$errMsg" ] ]
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment