diff --git a/Makefile.am b/Makefile.am index 051c4f5..e6edb49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -327,6 +327,7 @@ noinst_HEADERS += \ src/configure_policy_dialog.hh \ src/graphical_preferences_editor.hh \ src/gui_builder.hh \ + src/holt_container_window.hh \ src/holt_widget.hh \ src/jump_to_dialog.hh \ src/main.hh \ @@ -410,7 +411,7 @@ src_testsuite_test_history_SOURCES = \ src/backend/static_sub_request.cc \ src/backend/static_thread.cc \ src/testsuite/test-history.cc - + src_testsuite_test_global_preferences_serialization_CPPFLAGS = \ -I@top_srcdir@/src/backend \ $(GLIBMM_CFLAGS) @@ -514,7 +515,12 @@ src_testsuite_test_holt_widget_SOURCES = \ # Workaround an automake bug that leaves behind some files # while it's finishing the distcheck target CLEANFILES += \ - src/testsuite/.libs/test-history + src/testsuite/.libs/test-cairo_widget \ + src/testsuite/.libs/test-global_preferences_serialization \ + src/testsuite/.libs/test-history \ + src/testsuite/.libs/test-holt_widget \ + src/testsuite/.libs/test-key_file \ + src/testsuite/.libs/test-simulation_widget endif #~ if COND_TESTS diff --git a/plugins/pyloader/po/POTFILES.in b/plugins/pyloader/po/POTFILES.in index d421ad0..33a0c7a 100644 --- a/plugins/pyloader/po/POTFILES.in +++ b/plugins/pyloader/po/POTFILES.in @@ -1,3 +1,4 @@ -src/plugin.cc src/python_cpu_policy.cc src/python_cpu_policy_manager.cc +src/testsuite/test-python_loader.cc +src/plugin.cc diff --git a/plugins/xmlsave/Makefile.am b/plugins/xmlsave/Makefile.am index ba3b9e4..afc8bff 100644 --- a/plugins/xmlsave/Makefile.am +++ b/plugins/xmlsave/Makefile.am @@ -88,7 +88,7 @@ libxmlsave_la_LDFLAGS = \ # Please keep this in sorted order: libxmlsave_la_SOURCES = \ - src/plugin.cc \ + src/plugin.cc \ src/xml_serializer.cc \ src/xml_serializer_factory.cc \ src/xml_visitor.cc diff --git a/plugins/xmlsave/po/POTFILES.in b/plugins/xmlsave/po/POTFILES.in index c0a7408..eafc5c4 100644 --- a/plugins/xmlsave/po/POTFILES.in +++ b/plugins/xmlsave/po/POTFILES.in @@ -1,4 +1,5 @@ -src/plugin.cc src/xml_serializer.cc src/xml_serializer_factory.cc src/xml_visitor.cc +src/testsuite/test-xml_serializer.cc +src/plugin.cc diff --git a/po/POTFILES.in b/po/POTFILES.in index 365069b..52869fd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,74 +1,88 @@ -src/add_request_dialog.cc -src/backend/concrete_environment.cc -src/backend/concrete_history.cc -src/backend/concrete_simulation.cc -src/backend/cpu_policies_gatekeeper.cc -src/backend/cpu_policy.cc -src/backend/cpu_policy_exception.cc -src/backend/cpu_policy_manager.cc -src/backend/default_resource_policy_manager.cc -src/backend/dynamic_process.cc -src/backend/dynamic_request.cc -src/backend/dynamic_resource.cc -src/backend/dynamic_schedulable.cc -src/backend/dynamic_sub_request.cc -src/backend/dynamic_thread.cc -src/backend/environment.cc -src/backend/global_preferences.cc -src/backend/global_preferences_serializer.cc -src/backend/history.cc -src/backend/history_observer.cc -src/backend/holt_graph.cc -src/backend/invalid_plugin_exception.cc -src/backend/key_file.cc -src/backend/malformed_policy_exception.cc -src/backend/module.cc -src/backend/null_policy_exception.cc -src/backend/plugin_manager.cc -src/backend/policy_parameters.cc -src/backend/process.cc -src/backend/ready_queue.cc -src/backend/request.cc -src/backend/resource.cc -src/backend/resource_policies_gatekeeper.cc -src/backend/resource_policy.cc -src/backend/resource_policy_lifo.cc -src/backend/resource_policy_manager.cc -src/backend/schedulable.cc -src/backend/scheduler.cc -src/backend/serializer.cc -src/backend/serializer_error.cc -src/backend/serializers_gatekeeper.cc -src/backend/serialize_visitor.cc -src/backend/simulation.cc -src/backend/simulation_observer.cc -src/backend/static_process.cc -src/backend/static_request.cc -src/backend/static_resource.cc -src/backend/static_schedulable.cc -src/backend/static_sub_request.cc -src/backend/static_thread.cc -src/backend/string_utils.cc -src/backend/sub_request.cc -src/backend/thread.cc -src/backend/user_interrupt_exception.cc -src/cairo_elements.cc -src/cairo_widget.cc -src/configure_policy_dialog.cc -src/graphical_preferences_editor.cc src/gui_builder.cc -src/holt_widget.cc -src/main.cc src/parse_opts.cc -src/resources_widget.cc -src/schedulable_state_widget.cc -src/schedulables_tree_widget.cc +src/holt_widget.cc +src/ready_queue_widget.cc src/simulation_controller.cc +src/cairo_elements.cc +src/main.cc +src/cairo_widget.cc +src/add_request_dialog.cc +src/graphical_preferences_editor.cc +src/schedulable_state_widget.cc +src/backend/sub_request.cc +src/backend/ready_queue.cc +src/backend/default_resource_policy_manager.cc +src/backend/cpu_policy_exception.cc +src/backend/serialize_visitor.cc +src/backend/dynamic_thread.cc +src/backend/global_preferences.cc +src/backend/schedulable.cc +src/backend/concrete_history.cc +src/backend/cpu_policies_gatekeeper.cc +src/backend/concrete_simulation.cc +src/backend/dynamic_request.cc +src/backend/static_resource.cc +src/backend/static_thread.cc +src/backend/sgpemv2/templates/sequences.tcc +src/backend/sgpemv2/templates/singleton.tcc +src/backend/sgpemv2/templates/parameter.tcc +src/backend/sgpemv2/templates/smartp.tcc +src/backend/sgpemv2/templates/prova.cc +src/backend/sgpemv2/templates/deletor.tcc +src/backend/policy_parameters.cc +src/backend/resource.cc +src/backend/dynamic_process.cc +src/backend/resource_policies_gatekeeper.cc +src/backend/dynamic_resource.cc +src/backend/thread.cc +src/backend/holt_graph.cc +src/backend/string_utils.cc +src/backend/user_interrupt_exception.cc +src/backend/serializer_error.cc +src/backend/history_observer.cc +src/backend/history.cc +src/backend/static_request.cc +src/backend/concrete_environment.cc +src/backend/plugin_manager.cc +src/backend/dynamic_sub_request.cc +src/backend/serializer.cc +src/backend/static_process.cc +src/backend/scheduler.cc +src/backend/request.cc +src/backend/simulation.cc +src/backend/global_preferences_serializer.cc +src/backend/invalid_plugin_exception.cc +src/backend/cpu_policy.cc +src/backend/module.cc +src/backend/process.cc +src/backend/resource_policy.cc +src/backend/key_file.cc +src/backend/dynamic_schedulable.cc +src/backend/serializers_gatekeeper.cc +src/backend/static_sub_request.cc +src/backend/cpu_policy_manager.cc +src/backend/simulation_observer.cc +src/backend/environment.cc +src/backend/resource_policy_lifo.cc +src/backend/malformed_policy_exception.cc +src/backend/null_policy_exception.cc +src/backend/resource_policy_manager.cc +src/backend/static_schedulable.cc +src/schedulables_tree_widget.cc src/simulation_widget.cc -src/templates/deletor.tcc -src/templates/parameter.tcc -src/templates/prova.cc -src/templates/sequences.tcc -src/templates/singleton.tcc -src/templates/smartp.tcc +src/holt_container_window.cc src/text_simulation.cc +src/testsuite/test-holt_widget.cc +src/testsuite/test-history.cc +src/testsuite/test-simulation_widget.cc +src/testsuite/stubs/policy_manager.cc +src/testsuite/stubs/prrpolicy.cc +src/testsuite/stubs/history.cc +src/testsuite/test-key_file.cc +src/testsuite/test-cairo_widget.cc +src/testsuite/test-stepforward.cc +src/testsuite/test-global_preferences_serialization.cc +src/testsuite/test-parse_command.cc +src/jump_to_dialog.cc +src/resources_widget.cc +src/configure_policy_dialog.cc diff --git a/po/sgpemv2.pot b/po/sgpemv2.pot index 105d5c6..b14ddf7 100644 --- a/po/sgpemv2.pot +++ b/po/sgpemv2.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: matteo@member.fsf.org\n" -"POT-Creation-Date: 2006-09-05 11:35+0000\n" +"POT-Creation-Date: 2006-09-07 18:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,152 +16,142 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/add_request_dialog.cc:94 -msgid "key" -msgstr "" - -#: src/add_request_dialog.cc:95 -msgid "resource" -msgstr "" - -#: src/add_request_dialog.cc:96 -msgid "length" -msgstr "" - -#: src/backend/concrete_simulation.cc:232 -msgid "unable to change policy and to restore the previous: " -msgstr "" - -#: src/backend/concrete_simulation.cc:238 -msgid "unable to change policy: " -msgstr "" - -#: src/backend/string_utils.cc:52 src/backend/string_utils.cc:88 -msgid "too few or too many tokens" -msgstr "" - -#: src/backend/string_utils.cc:75 -msgid "incorrect number format" -msgstr "" - -#: src/backend/string_utils.cc:111 -msgid "incorrect boolean" -msgstr "" - -#: src/configure_policy_dialog.cc:61 -msgid "Policy description" -msgstr "" - -#: src/configure_policy_dialog.cc:74 -msgid "Integer values" -msgstr "" - -#: src/configure_policy_dialog.cc:92 -msgid "Floating point values" -msgstr "" - -#: src/configure_policy_dialog.cc:109 -msgid "Alphanumerical values" -msgstr "" - -#: src/configure_policy_dialog.cc:124 -msgid "No options to configure for this policy" -msgstr "" - -#: src/graphical_preferences_editor.cc:312 -#: src/graphical_preferences_editor.cc:345 -msgid "Select a directory to add" -msgstr "" - -#: src/gui_builder.cc:132 src/gui_builder.cc:175 src/gui_builder.cc:245 +#: src/gui_builder.cc:172 src/gui_builder.cc:215 src/gui_builder.cc:285 msgid "ERROR: No registered serializer available" msgstr "" -#: src/gui_builder.cc:137 src/gui_builder.cc:180 src/gui_builder.cc:250 -#: src/text_simulation.cc:375 src/text_simulation.cc:381 -#: src/text_simulation.cc:399 src/text_simulation.cc:463 -#: src/text_simulation.cc:469 src/text_simulation.cc:487 -#: src/text_simulation.cc:800 src/text_simulation.cc:1488 -#: src/text_simulation.cc:1525 +#: src/gui_builder.cc:177 src/gui_builder.cc:220 src/gui_builder.cc:290 +#: src/text_simulation.cc:376 src/text_simulation.cc:382 +#: src/text_simulation.cc:400 src/text_simulation.cc:464 +#: src/text_simulation.cc:470 src/text_simulation.cc:488 +#: src/text_simulation.cc:803 src/text_simulation.cc:1491 +#: src/text_simulation.cc:1528 msgid "ERROR: " msgstr "" -#: src/gui_builder.cc:271 src/gui_builder.cc:294 +#: src/gui_builder.cc:312 src/gui_builder.cc:340 msgid "" "No CPU policy is currently selected.\n" "Please choose one before trying to configure it." msgstr "" -#: src/gui_builder.cc:278 src/gui_builder.cc:301 +#: src/gui_builder.cc:318 src/gui_builder.cc:347 msgid "Configuring CPU Policy " msgstr "" -#: src/gui_builder.cc:355 +#: src/gui_builder.cc:406 msgid "Selected CPU policy " msgstr "" -#: src/gui_builder.cc:363 +#: src/gui_builder.cc:414 msgid "Impossible to select this CPU Policy.\n" msgstr "" -#: src/gui_builder.cc:369 +#: src/gui_builder.cc:420 msgid "No CPU policy selected. Please select one." msgstr "" -#: src/gui_builder.cc:417 +#: src/gui_builder.cc:468 msgid "Current resource policy deselected." msgstr "" -#: src/gui_builder.cc:419 +#: src/gui_builder.cc:470 msgid "Selected resource policy " msgstr "" -#: src/gui_builder.cc:559 +#: src/gui_builder.cc:640 msgid "Filename to open: " msgstr "" -#: src/parse_opts.cc:68 +#: src/parse_opts.cc:69 msgid "starts the program in command line mode" msgstr "" -#: src/parse_opts.cc:69 +#: src/parse_opts.cc:70 msgid "adds this directory to the default modules search path" msgstr "" -#: src/parse_opts.cc:70 +#: src/parse_opts.cc:71 msgid "adds this directory to default plugin search path" msgstr "" -#: src/parse_opts.cc:71 +#: src/parse_opts.cc:72 msgid "a list of savefiles; only the first will be opened" msgstr "" -#: src/parse_opts.cc:91 +#: src/parse_opts.cc:92 msgid "" "SGPEMv2, a graphical simulator for process scheduling in a multitasking " "computer" msgstr "" -#: src/parse_opts.cc:112 +#: src/parse_opts.cc:113 msgid "Error while loading preferences" msgstr "" -#: src/parse_opts.cc:142 +#: src/parse_opts.cc:143 msgid "" " [II] To see a list of commands available,\n" " [II] please type \"help\" and hit the ENTER key." msgstr "" -#: src/parse_opts.cc:166 +#: src/parse_opts.cc:167 msgid "Bad invocation: " msgstr "" -#: src/parse_opts.cc:167 +#: src/parse_opts.cc:168 msgid "Use the `-?' or `--help' option to see the help" msgstr "" -#: src/resources_widget.cc:64 -msgid "resources" +#: src/ready_queue_widget.cc:37 +msgid "Ready queue: { " +msgstr "" + +#: src/ready_queue_widget.cc:38 +msgid " } at instant " +msgstr "" + +#: src/simulation_controller.cc:194 src/jump_to_dialog.cc:108 +msgid "The selected user CPU policy stopped before returning:\n" +msgstr "" + +#: src/simulation_controller.cc:201 src/jump_to_dialog.cc:115 +msgid "" +"The selected user CPU policy was malformed and failed to sort the queue:\n" +msgstr "" + +#: src/simulation_controller.cc:213 src/jump_to_dialog.cc:127 +msgid " [EE] Fatal error. Impossible to deactivate the policy in " +msgstr "" + +#: src/simulation_controller.cc:214 src/jump_to_dialog.cc:128 +msgid " [EE] " +msgstr "" + +#: src/simulation_controller.cc:221 src/jump_to_dialog.cc:135 +msgid "No active policy selected:\n" +msgstr "" + +#: src/simulation_controller.cc:228 src/jump_to_dialog.cc:142 +msgid "Unexpected error:\n" +msgstr "" + +#: src/add_request_dialog.cc:96 +msgid "key" +msgstr "" + +#: src/add_request_dialog.cc:97 +msgid "resource" +msgstr "" + +#: src/add_request_dialog.cc:98 +msgid "length" +msgstr "" + +#: src/graphical_preferences_editor.cc:315 +#: src/graphical_preferences_editor.cc:365 +msgid "Select a directory to add" msgstr "" #: src/schedulable_state_widget.cc:66 @@ -184,6 +174,26 @@ msgstr "" msgid "Terminated" msgstr "" +#: src/backend/concrete_simulation.cc:256 +msgid "unable to change policy and to restore the previous: " +msgstr "" + +#: src/backend/concrete_simulation.cc:262 +msgid "unable to change policy: " +msgstr "" + +#: src/backend/string_utils.cc:54 src/backend/string_utils.cc:90 +msgid "too few or too many tokens" +msgstr "" + +#: src/backend/string_utils.cc:77 +msgid "incorrect number format" +msgstr "" + +#: src/backend/string_utils.cc:113 +msgid "incorrect boolean" +msgstr "" + #: src/schedulables_tree_widget.cc:65 msgid "schedulables" msgstr "" @@ -224,166 +234,150 @@ msgstr "" msgid "Remove Request" msgstr "" -#: src/schedulables_tree_widget.cc:639 +#: src/schedulables_tree_widget.cc:640 msgid ", arrives at: " msgstr "" -#: src/schedulables_tree_widget.cc:640 +#: src/schedulables_tree_widget.cc:641 msgid ", base priority: " msgstr "" -#: src/schedulables_tree_widget.cc:641 +#: src/schedulables_tree_widget.cc:642 msgid ", elapsed time: " msgstr "" -#: src/schedulables_tree_widget.cc:642 +#: src/schedulables_tree_widget.cc:643 msgid ", current priority: " msgstr "" -#: src/schedulables_tree_widget.cc:658 +#: src/schedulables_tree_widget.cc:659 msgid "at " msgstr "" -#: src/simulation_controller.cc:191 -msgid "The selected user CPU policy stopped before returning:\n" -msgstr "" - -#: src/simulation_controller.cc:198 +#: src/simulation_widget.cc:156 msgid "" -"The selected user CPU policy was malformed and failed to sort the queue:\n" +"Nothing to see here... add some processes! Right-click on the Schedulables " +"view in this window." msgstr "" -#: src/simulation_controller.cc:210 -msgid " [EE] Fatal error. Impossible to deactivate the policy in " +#: src/holt_container_window.cc:10 +msgid "Holt Graph" msgstr "" -#: src/simulation_controller.cc:211 -msgid " [EE] " -msgstr "" - -#: src/simulation_controller.cc:218 -msgid "No active policy selected:\n" -msgstr "" - -#: src/simulation_controller.cc:225 -msgid "Unexpected error:\n" -msgstr "" - -#: src/text_simulation.cc:114 +#: src/text_simulation.cc:115 msgid "ERROR: this command requires at least " msgstr "" -#: src/text_simulation.cc:114 +#: src/text_simulation.cc:115 msgid " arguments\n" msgstr "" -#: src/text_simulation.cc:120 +#: src/text_simulation.cc:121 msgid "WARNING: some arguments will be ignored\n" msgstr "" -#: src/text_simulation.cc:130 +#: src/text_simulation.cc:131 msgid "" "WARNING: Simulation was not recently saved. If you continue some changes to " "the simulation might be lost.\n" msgstr "" -#: src/text_simulation.cc:135 +#: src/text_simulation.cc:136 msgid "Continue? [y/n] " msgstr "" -#: src/text_simulation.cc:143 +#: src/text_simulation.cc:144 msgid "n" msgstr "" -#: src/text_simulation.cc:145 +#: src/text_simulation.cc:146 msgid "y" msgstr "" -#: src/text_simulation.cc:244 +#: src/text_simulation.cc:245 msgid "ERROR: Provided value is out of range\n" msgstr "" -#: src/text_simulation.cc:250 +#: src/text_simulation.cc:251 msgid "ERROR: Please provide a valid numeric value\n" msgstr "" -#: src/text_simulation.cc:259 +#: src/text_simulation.cc:260 msgid "ERROR: This is a mandatory attribute; you MUST provide a valid value!\n" msgstr "" -#: src/text_simulation.cc:291 src/text_simulation.cc:338 +#: src/text_simulation.cc:292 src/text_simulation.cc:339 msgid "ERROR: This is a mandatory atribute; you MUST provide a valid value!\n" msgstr "" -#: src/text_simulation.cc:332 +#: src/text_simulation.cc:333 msgid "ERROR: Please provide a valid boolean value ('true' or 'false')\n" msgstr "" -#: src/text_simulation.cc:377 src/text_simulation.cc:401 -#: src/text_simulation.cc:465 src/text_simulation.cc:489 +#: src/text_simulation.cc:378 src/text_simulation.cc:402 +#: src/text_simulation.cc:466 src/text_simulation.cc:490 msgid "" "\n" "Simulation is now stopped\n" msgstr "" -#: src/text_simulation.cc:383 src/text_simulation.cc:471 +#: src/text_simulation.cc:384 src/text_simulation.cc:472 msgid "" "\n" "Simulation is now stopped, and the current policy will be deactivated\n" msgstr "" -#: src/text_simulation.cc:392 src/text_simulation.cc:480 +#: src/text_simulation.cc:393 src/text_simulation.cc:481 msgid "FATAL ERROR: unable to deactivate the policy: " msgstr "" -#: src/text_simulation.cc:405 src/text_simulation.cc:493 +#: src/text_simulation.cc:406 src/text_simulation.cc:494 msgid "UNKNOWN ERROR: " msgstr "" -#: src/text_simulation.cc:439 +#: src/text_simulation.cc:440 msgid "ERROR: provided instant is out of range.\n" msgstr "" -#: src/text_simulation.cc:446 +#: src/text_simulation.cc:447 msgid "ERROR: provided instant is not a valid integer\n" msgstr "" -#: src/text_simulation.cc:451 +#: src/text_simulation.cc:452 msgid "ERROR: the instant is not within range.\n" msgstr "" -#: src/text_simulation.cc:520 +#: src/text_simulation.cc:521 msgid "ERROR: No policy actually selected for the simulation\n" msgstr "" -#: src/text_simulation.cc:526 +#: src/text_simulation.cc:527 msgid "Please provide a value for each attribute:\n" msgstr "" -#: src/text_simulation.cc:527 +#: src/text_simulation.cc:528 msgid "" "Mandatory arguments are marked with an asterisk (*)\n" "\n" msgstr "" -#: src/text_simulation.cc:529 +#: src/text_simulation.cc:530 msgid "Integer arguments:\n" msgstr "" -#: src/text_simulation.cc:549 +#: src/text_simulation.cc:550 msgid "" "\n" "Floating-point arguments:\n" msgstr "" -#: src/text_simulation.cc:571 +#: src/text_simulation.cc:572 msgid "" "\n" "String arguments:\n" msgstr "" -#: src/text_simulation.cc:603 +#: src/text_simulation.cc:604 msgid "" "Avaiable commands:\n" "RUN\n" @@ -404,7 +398,7 @@ msgid "" "ex. `HELP RUN` shows help about the command RUN\n" msgstr "" -#: src/text_simulation.cc:609 +#: src/text_simulation.cc:610 msgid "" "-- RUN COMMAND --\n" "Starts the simulation. It can be continuous or step-by-step depending on the " @@ -416,26 +410,26 @@ msgid "" "running. The scheduler activity begins at instant 1.\n" msgstr "" -#: src/text_simulation.cc:618 +#: src/text_simulation.cc:619 msgid "" "-- STOP COMMAND --\n" "Stops the simulation. The next call to RUN will bring the simulation to the " "first instant and start it.\n" msgstr "" -#: src/text_simulation.cc:621 +#: src/text_simulation.cc:622 msgid "" "-- PAUSE COMMAND --\n" "Pauses the simulation. The next call to RUN will continue it.\n" msgstr "" -#: src/text_simulation.cc:624 +#: src/text_simulation.cc:625 msgid "" "-- JUMPTO COMMAND --\n" "Pauses the simulation and jumps to the specified instant.\n" msgstr "" -#: src/text_simulation.cc:626 +#: src/text_simulation.cc:627 msgid "" "-- CONFIGURE-CPU-POLICY COMMAND --\n" "Configure parameters exposed by the cpu policy.\n" @@ -444,27 +438,27 @@ msgid "" "without modifying their source code.\n" msgstr "" -#: src/text_simulation.cc:630 +#: src/text_simulation.cc:631 msgid "" "-- HELP COMMAND --\n" "The help you're reading.\n" msgstr "" -#: src/text_simulation.cc:632 +#: src/text_simulation.cc:633 msgid "" "-- GET COMMAND --\n" "Syntax: GET \n" "\twhere may be simulation-tick or continuous.\n" msgstr "" -#: src/text_simulation.cc:635 +#: src/text_simulation.cc:636 msgid "" "-- SET COMMAND --\n" "Syntax: SET [=] \n" "\twhere may be simulation-tick, continuous or cpu-policy.\n" msgstr "" -#: src/text_simulation.cc:638 +#: src/text_simulation.cc:639 msgid "" "-- SHOW COMMAND --\n" "Displays the name of the entities (if available) and other informations " @@ -480,7 +474,7 @@ msgid "" "ids follow the same logic of the previous commands\n" msgstr "" -#: src/text_simulation.cc:649 +#: src/text_simulation.cc:650 msgid "" "-- ADD COMMAND --\n" "Adds an entity by using a questionary-like approach.\n" @@ -495,7 +489,7 @@ msgid "" "follow the same logic of the previous commands\n" msgstr "" -#: src/text_simulation.cc:659 +#: src/text_simulation.cc:660 msgid "" "-- REMOVE COMMAND --\n" "Removes an entity.\n" @@ -512,7 +506,7 @@ msgid "" "where the numeric ids follow the same logic of the previous commands\n" msgstr "" -#: src/text_simulation.cc:669 +#: src/text_simulation.cc:670 msgid "" "-- SAVE COMMAND --\n" "Saves the simulation.\n" @@ -520,7 +514,7 @@ msgid "" "Syntax: SAVE \n" msgstr "" -#: src/text_simulation.cc:672 +#: src/text_simulation.cc:673 msgid "" "-- LOAD COMMAND --\n" "Loads the simulation.\n" @@ -528,228 +522,252 @@ msgid "" "Syntax: LOAD \n" msgstr "" -#: src/text_simulation.cc:675 +#: src/text_simulation.cc:676 msgid "" "-- QUIT COMMAND --\n" "Gently closes the program.\n" msgstr "" -#: src/text_simulation.cc:677 +#: src/text_simulation.cc:678 msgid "ERROR: Sorry, no help available for this command.\n" msgstr "" -#: src/text_simulation.cc:688 +#: src/text_simulation.cc:689 msgid "" "\n" "Bye.\n" "\n" msgstr "" -#: src/text_simulation.cc:715 +#: src/text_simulation.cc:716 msgid "" "ERROR: invalid attribute name. Accepted are: simulation-tick, continuous\n" msgstr "" -#: src/text_simulation.cc:750 +#: src/text_simulation.cc:751 msgid "ERROR: you must provide a valid unsigned integer value\n" msgstr "" -#: src/text_simulation.cc:796 +#: src/text_simulation.cc:799 msgid "ERROR: invalid unsigned integer or not a valid policy index\n" msgstr "" -#: src/text_simulation.cc:817 +#: src/text_simulation.cc:820 msgid "ERROR: you must provide a valid boolean value ('true' or 'false')\n" msgstr "" -#: src/text_simulation.cc:821 +#: src/text_simulation.cc:824 msgid "" "ERROR: invalid attribute name. Accepted are: simulation-tick, cpu-policy, " "continuous\n" msgstr "" -#: src/text_simulation.cc:852 src/text_simulation.cc:1053 -#: src/text_simulation.cc:1265 +#: src/text_simulation.cc:855 src/text_simulation.cc:1056 +#: src/text_simulation.cc:1268 msgid "ERROR: invalid argument\n" msgstr "" -#: src/text_simulation.cc:899 +#: src/text_simulation.cc:902 msgid "ERROR: provided process identifier is not a valid integer\n" msgstr "" -#: src/text_simulation.cc:904 +#: src/text_simulation.cc:907 msgid "ERROR: this process identifier does not belong to an existing process\n" msgstr "" -#: src/text_simulation.cc:935 src/text_simulation.cc:973 -#: src/text_simulation.cc:1111 src/text_simulation.cc:1160 -#: src/text_simulation.cc:1206 src/text_simulation.cc:1289 -#: src/text_simulation.cc:1326 src/text_simulation.cc:1362 -#: src/text_simulation.cc:1402 src/text_simulation.cc:1445 +#: src/text_simulation.cc:938 src/text_simulation.cc:976 +#: src/text_simulation.cc:1114 src/text_simulation.cc:1163 +#: src/text_simulation.cc:1209 src/text_simulation.cc:1292 +#: src/text_simulation.cc:1329 src/text_simulation.cc:1365 +#: src/text_simulation.cc:1405 src/text_simulation.cc:1448 msgid "ERROR: provided identifier(s) not a valid integer\n" msgstr "" -#: src/text_simulation.cc:940 src/text_simulation.cc:978 -#: src/text_simulation.cc:1116 src/text_simulation.cc:1165 -#: src/text_simulation.cc:1211 src/text_simulation.cc:1294 -#: src/text_simulation.cc:1331 src/text_simulation.cc:1367 -#: src/text_simulation.cc:1407 src/text_simulation.cc:1450 +#: src/text_simulation.cc:943 src/text_simulation.cc:981 +#: src/text_simulation.cc:1119 src/text_simulation.cc:1168 +#: src/text_simulation.cc:1214 src/text_simulation.cc:1297 +#: src/text_simulation.cc:1334 src/text_simulation.cc:1370 +#: src/text_simulation.cc:1410 src/text_simulation.cc:1453 msgid "ERROR: the identifier(s) do not belong to an existing entity\n" msgstr "" -#: src/text_simulation.cc:1018 +#: src/text_simulation.cc:1021 msgid "FIXME: Not implemented\n" msgstr "" -#: src/text_simulation.cc:1033 +#: src/text_simulation.cc:1036 msgid "WARNING: Simulation is not stopped, it will be automatically stopped\n" msgstr "" -#: src/text_simulation.cc:1063 src/text_simulation.cc:1081 -#: src/text_simulation.cc:1120 +#: src/text_simulation.cc:1066 src/text_simulation.cc:1084 +#: src/text_simulation.cc:1123 msgid "name" msgstr "" -#: src/text_simulation.cc:1064 src/text_simulation.cc:1122 +#: src/text_simulation.cc:1067 src/text_simulation.cc:1125 msgid "arrival time" msgstr "" -#: src/text_simulation.cc:1065 src/text_simulation.cc:1750 +#: src/text_simulation.cc:1068 src/text_simulation.cc:1753 msgid "priority" msgstr "" -#: src/text_simulation.cc:1082 +#: src/text_simulation.cc:1085 msgid "places" msgstr "" -#: src/text_simulation.cc:1121 +#: src/text_simulation.cc:1124 msgid "cpu time" msgstr "" -#: src/text_simulation.cc:1123 +#: src/text_simulation.cc:1126 msgid "base priority" msgstr "" -#: src/text_simulation.cc:1169 +#: src/text_simulation.cc:1172 msgid "instant" msgstr "" -#: src/text_simulation.cc:1215 +#: src/text_simulation.cc:1218 msgid "resource key" msgstr "" -#: src/text_simulation.cc:1216 +#: src/text_simulation.cc:1219 msgid "duration" msgstr "" -#: src/text_simulation.cc:1225 +#: src/text_simulation.cc:1228 msgid "ERROR: invalid resource identifier\n" msgstr "" -#: src/text_simulation.cc:1247 +#: src/text_simulation.cc:1250 msgid "WARNING: Simulation is not stopped, it will be automatically stopped" msgstr "" -#: src/text_simulation.cc:1322 +#: src/text_simulation.cc:1325 msgid "invalid resource id" msgstr "" -#: src/text_simulation.cc:1484 src/text_simulation.cc:1521 +#: src/text_simulation.cc:1487 src/text_simulation.cc:1524 msgid "ERROR: No registered serializer available\n" msgstr "" -#: src/text_simulation.cc:1592 +#: src/text_simulation.cc:1595 msgid "ERROR: command not supported\n" msgstr "" -#: src/text_simulation.cc:1610 +#: src/text_simulation.cc:1613 msgid ">> RUNNING <<" msgstr "" -#: src/text_simulation.cc:1613 +#: src/text_simulation.cc:1616 msgid "READY" msgstr "" -#: src/text_simulation.cc:1616 +#: src/text_simulation.cc:1619 msgid "BLOCKED" msgstr "" -#: src/text_simulation.cc:1619 src/text_simulation.cc:1643 +#: src/text_simulation.cc:1622 src/text_simulation.cc:1646 msgid "FUTURE" msgstr "" -#: src/text_simulation.cc:1622 +#: src/text_simulation.cc:1625 msgid "TERMINATED" msgstr "" -#: src/text_simulation.cc:1637 +#: src/text_simulation.cc:1640 msgid "UNALLOCABLE" msgstr "" -#: src/text_simulation.cc:1640 +#: src/text_simulation.cc:1643 msgid "ALLOCATED" msgstr "" -#: src/text_simulation.cc:1646 +#: src/text_simulation.cc:1649 msgid "EXHAUSTED" msgstr "" -#: src/text_simulation.cc:1649 +#: src/text_simulation.cc:1652 msgid "ALLOCABLE" msgstr "" -#: src/text_simulation.cc:1673 +#: src/text_simulation.cc:1676 msgid "READY QUEUE: { " msgstr "" -#: src/text_simulation.cc:1681 +#: src/text_simulation.cc:1684 msgid " ~ " msgstr "" -#: src/text_simulation.cc:1684 +#: src/text_simulation.cc:1687 msgid "}" msgstr "" -#: src/text_simulation.cc:1698 +#: src/text_simulation.cc:1701 msgid "RESOURCES:" msgstr "" -#: src/text_simulation.cc:1704 +#: src/text_simulation.cc:1707 msgid ", with " msgstr "" -#: src/text_simulation.cc:1705 +#: src/text_simulation.cc:1708 msgid " places" msgstr "" -#: src/text_simulation.cc:1710 +#: src/text_simulation.cc:1713 msgid "queue: { " msgstr "" -#: src/text_simulation.cc:1726 +#: src/text_simulation.cc:1729 msgid " }" msgstr "" -#: src/text_simulation.cc:1744 +#: src/text_simulation.cc:1747 msgid "PROCESSES:" msgstr "" -#: src/text_simulation.cc:1746 +#: src/text_simulation.cc:1749 msgid "state" msgstr "" -#: src/text_simulation.cc:1747 +#: src/text_simulation.cc:1750 msgid "arrival" msgstr "" -#: src/text_simulation.cc:1748 +#: src/text_simulation.cc:1751 msgid "requiring" msgstr "" -#: src/text_simulation.cc:1749 +#: src/text_simulation.cc:1752 msgid "elapsed" msgstr "" -#: src/text_simulation.cc:1751 +#: src/text_simulation.cc:1754 msgid "resource_id" msgstr "" + +#: src/resources_widget.cc:66 +msgid "resources" +msgstr "" + +#: src/configure_policy_dialog.cc:61 +msgid "Policy description" +msgstr "" + +#: src/configure_policy_dialog.cc:74 +msgid "Integer values" +msgstr "" + +#: src/configure_policy_dialog.cc:92 +msgid "Floating point values" +msgstr "" + +#: src/configure_policy_dialog.cc:109 +msgid "Alphanumerical values" +msgstr "" + +#: src/configure_policy_dialog.cc:124 +msgid "No options to configure for this policy" +msgstr "" diff --git a/src/holt_widget.cc b/src/holt_widget.cc index bac6d89..25bb48f 100644 --- a/src/holt_widget.cc +++ b/src/holt_widget.cc @@ -201,16 +201,18 @@ void HoltSchedulable::draw(cairo_t *cr) cel.draw_3dsphere(center, _radius, *color); // clip text outside region - //cairo_clip_preserve (cr); // TODO: re-enable clipping asap + cairo_arc(cr, _pos.real(), _pos.imag(), _radius, 0, 2*M_PI); + cairo_clip(cr); + // draw text cairo_text_extents_t extents; cairo_text_extents(cr, _schedulable->get_name().c_str(), &extents); cairo_move_to(cr, _pos.real() - extents.width/2, _pos.imag() + extents.height/2); cairo_show_text(cr, _schedulable->get_name().c_str()); - //cairo_reset_clip (cr); // reset clip region // TODO: re-enable clipping asap // stroke all cairo_stroke (cr); + cairo_restore(cr); // restore context state }