diff --git a/simulators/c++2/src_simulator/arch/CPU.cpp b/simulators/c++2/src_simulator/arch/CPU.cpp index b9b01711a3476827671b5c24bfdf60702ee57aa9..7eb14f6474a3de5ef686b9c814ad4caaf953ad75 100644 --- a/simulators/c++2/src_simulator/arch/CPU.cpp +++ b/simulators/c++2/src_simulator/arch/CPU.cpp @@ -105,7 +105,7 @@ void CPU::drawPieChart(std::ofstream& myfile) const { } void CPU::showPieChart(std::ofstream& myfile) const{ - myfile << SCHED_HTML_JS_DIV_ID << _ID << "_" << this->_cycleTime << SCHED_HTML_JS_DIV_END << "<br>"; + myfile << SCHED_HTML_JS_DIV_ID << _ID << "_" << this->_cycleTime << SCHED_HTML_JS_DIV_ID_END << std::endl; } diff --git a/simulators/c++2/src_simulator/arch/FPGA.cpp b/simulators/c++2/src_simulator/arch/FPGA.cpp index 31dc768e30ee84b8fa9f1a1c7ed94632485ac09a..879d440bb82a2e283f58621c792902401dda4c84 100644 --- a/simulators/c++2/src_simulator/arch/FPGA.cpp +++ b/simulators/c++2/src_simulator/arch/FPGA.cpp @@ -469,7 +469,10 @@ void FPGA::drawPieChart(std::ofstream& myfile) const { void FPGA::showPieChart(std::ofstream& myfile) const{ - myfile << SCHED_HTML_JS_DIV_ID << _ID << "_" << _htmlCurrTask->toShortString() << SCHED_HTML_JS_DIV_END << "<br>"; + if(_taskNumber==1) + myfile << SCHED_HTML_JS_DIV_ID << _ID << "_" << _htmlCurrTask->toShortString() << SCHED_HTML_JS_DIV_ID_END <<std::endl; + else + myfile << SCHED_HTML_JS_DIV_ID << _ID << "_" << _htmlCurrTask->toShortString() << SCHED_HTML_JS_DIV_ID_END_FPGA <<std::endl; } std::string FPGA::determineHTMLCellClass(unsigned int &nextColor ) { diff --git a/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp b/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp index 4168bdb1db60893615b1193523bb2dea4e897091..12197609d668983c1f33377de08ce3cb2e7d08a1 100644 --- a/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp +++ b/simulators/c++2/src_simulator/arch/SchedulableDevice.cpp @@ -243,7 +243,7 @@ void SchedulableDevice::drawPieChart(std::ofstream& myfile) const { void SchedulableDevice::showPieChart(std::ofstream& myfile) const{ - myfile << SCHED_HTML_JS_DIV_ID << _ID << SCHED_HTML_JS_DIV_END << "<br>"; + myfile << SCHED_HTML_JS_DIV_ID << _ID << SCHED_HTML_JS_DIV_ID_END << "<br>"; } diff --git a/simulators/c++2/src_simulator/definitions.h b/simulators/c++2/src_simulator/definitions.h index d25b592841298dfcc5475067c80b6d6a1f9367aa..42e9d19b999303aa4e9d619eb31f90f0728dc68a 100644 --- a/simulators/c++2/src_simulator/definitions.h +++ b/simulators/c++2/src_simulator/definitions.h @@ -260,8 +260,12 @@ using std::max; #define SCHED_HTML_JS_TYPE "<script type=\"text/javascript\">\n" #define SCHED_HTML_END_JS "</script>\n" #define SCHED_HTML_JS_LINK "<script type=\"text/javascript\" src=\"https://canvasjs.com/assets/script/canvasjs.min.js\">" +#define SCHED_HTML_JS_DIV_BEGIN "<div>" +#define SCHED_HTML_JS_DIV_END "</div>" #define SCHED_HTML_JS_DIV_ID "<div id=\"chartContainer" -#define SCHED_HTML_JS_DIV_END "\" style=\"height: 300px; width: 0%;\"></div>\n" +#define SCHED_HTML_JS_DIV_ID_END "\" style=\"height: 300px; width: 300px;\"></div>\n" +#define SCHED_HTML_JS_DIV_ID_END_FPGA "\" style=\"height: 300px; width: 300px;float:left;margin-right:40px;\"></div>\n" +#define SCHED_HTML_JS_CLEAR "<div class = \"clear\"></div>" #define NB_HTML_COLORS 15 #define SCHED_HTML_JS_CONTENT1 "window.onload = function () {\n" #define SCHED_HTML_JS_CONTENT2 "{\n \ @@ -526,9 +530,11 @@ h2 span {\n \ .t14last {\n \ background-color: LightGoldenRodYellow;\n \ border-style: solid solid solid none;\n \ +}\n \ +.clear {\n \ + clear:both\n \ }" - #define SCHED_HTML_SCRIPT_CONTENT diff --git a/simulators/c++2/src_simulator/sim/Simulator.cpp b/simulators/c++2/src_simulator/sim/Simulator.cpp index b8dc37c0a84b98b45dca4bac23333ffa8dcc3823..c18e8643feb8dfa4bd99c5afac513f63a6c9e3c1 100644 --- a/simulators/c++2/src_simulator/sim/Simulator.cpp +++ b/simulators/c++2/src_simulator/sim/Simulator.cpp @@ -461,11 +461,13 @@ std::cout<<"schedule2HTML--------------------------------------***************** (*j)->schedule2HTML(myfile); (*j)->setStartFlagHTML(false); } + myfile << SCHED_HTML_JS_DIV_BEGIN << std::endl; for(TaskList::const_iterator i = (*j)->getTaskList().begin(); i != (*j)->getTaskList().end(); ++i){ (*j)->setHtmlCurrTask(*i); (*j)->showPieChart(myfile); } - + myfile << SCHED_HTML_JS_DIV_END <<std::endl; + myfile << SCHED_HTML_JS_CLEAR <<std::endl; } for(BusList::const_iterator j=_simComp->getBusList().begin(); j != _simComp->getBusList().end(); ++j){