Changeset 628f3dc614aeb64636b8b50cb2c7413053d2e490

Timestamp:

26/10/10 14:00:09 (3 years ago)

Author:

Matias De la Puente <mfpuente.ar@…>

Children:

33592374e666da943a2de0a6e84fab987585392b

Parents:

a70bdd96cc9cb661637388cca3306aa4e2305e3c

git-author:

Matias De la Puente <mfpuente.ar@…> (25/10/10 12:51:10)

git-committer:

Matias De la Puente <mfpuente.ar@…> (26/10/10 14:00:09)

Message:

Add 'program profile' option

Files:

• gtkfrontend/main.vala (modified) (1 diff)
• gtkfrontend/projectsview.vala (modified) (5 diffs)
• libi4uccore/programmerslogic.vala (modified) (6 diffs)
• libi4uccore/projectslogic.vala (modified) (8 diffs)
• libi4uccore/projectsview.vala (modified) (2 diffs)

gtkfrontend/main.vala

@@ -168 +168 @@
         _main_window_logic = new MainWindowLogic (_main_window_view);
         _documents_logic = new DocumentsLogic (_documents_view);
-        _projects_logic = new ProjectsLogic (_projects_view, _documents_logic);
         _programmers_logic = new ProgrammersLogic (_programmers_view, _documents_logic);
+        _projects_logic = new ProjectsLogic (_projects_view, _documents_logic, _programmers_logic);
         
         _main_window_view.exit_clicked.connect (() => {

gtkfrontend/projectsview.vala

@@ -81 +81 @@
                 set { _action_group.get_action ("BuildProfileProjectAction").sensitive = value; }
                 get { return _action_group.get_action ("BuildProfileProjectAction").sensitive; }
+        }
+        
+        public bool program_profile_sensitive
+        {
+                set { _action_group.get_action ("ProgramProfileProjectAction").sensitive = value; }
+                get { return _action_group.get_action ("ProgramProfileProjectAction").sensitive; }
         }
         
@@ -230 +236 @@
         }
         
+        private void on_program_profile ()
+        {
+                this.program_profile_clicked ();
+        }
+        
         private void on_stop ()
         {
@@ -257 +268 @@
                 { "RemoveProfileFromProjectProjectAction", STOCK_REMOVE, N_("Remove profile from project"), null, N_("Remove a profile from current project"), on_remove_profile },
                 { "BuildProfileProjectAction", STOCK_EXECUTE, N_("Build profile"), "<Control><Shift>b", N_("Build current profile"), on_build_profile },
+                { "ProgramProfileProjectAction", STOCK_MEDIA_RECORD, N_("Program profile"), "<Control><Shift>p", N_("Program current profile"), on_program_profile },
                 { "StopProjectAction", STOCK_STOP, N_("Stop"), "", N_("Stop building current profile"), on_stop },
                 { "CleanProfileProjectAction", STOCK_CLEAR, N_("Clean profile"), null, N_("Clean current profile"), on_clean_profile },
@@ -281 +293 @@
                                 <menuitem action="StopProjectAction"/>
                                 <menuitem action="CleanProfileProjectAction"/>
+                                <menuitem action="ProgramProfileProjectAction"/>
                                 <separator/>
                                 <menuitem action="CloseProjectAction"/>
@@ -291 +304 @@
                                 <toolitem action="BuildProfileProjectAction"/>
                                 <toolitem action="StopProjectAction"/>
+                                <toolitem action="ProgramProfileProjectAction"/>
                         <separator/>
                 </placeholder>

libi4uccore/programmerslogic.vala

@@ -29 +29 @@
         private string _read_hexfile;
         
+        public bool can_write_flash { private set; get; }
+        
         public ProgrammersLogic (ProgrammersView view, DocumentsLogic documents_logic)
         {
@@ -79 +81 @@
         }
         
+        public void write_flash (string uri)
+        {
+                if (_view.show_yes_no_message (_("Are you sure you want to write the flash memory?")) == Gtk.ResponseType.NO)
+                        return;
+                
+                var filtered_command = filter_command (_current_programmer.write_flash_command);
+                
+                var hexfile = File.new_for_uri (uri).get_path ();
+                filtered_command = filtered_command.replace ("%hexfile", "\"" + hexfile + "\"");
+                
+                if (_command.run (filtered_command))
+                {
+                        set_parameters_sensitive (false);
+                        disable_actions ();
+                        _view.stop_sensitive = true;
+                }
+                
+                _view.show_log_page ();
+        }
+        
         private void on_page_changed (Page? page)
         {
@@ -304 +326 @@
         private void run_command (string command)
         {
-                var filtered_command = command;
-                
-                if (_current_programmer.has_serial_port)
-                        filtered_command = filtered_command.replace ("%serial_port", _view.page.current_serial_port);
-                if (_current_programmer.has_baud_rate)
-                        filtered_command = filtered_command.replace ("%baud_rate", _view.page.current_baud_rate);
-                if (_current_programmer.has_devices_file)
-                {
-                        var devices_file = File.new_for_uri (_view.page.current_devices_file).get_path ();
-                        filtered_command = filtered_command.replace ("%devices_file", "\"" + devices_file + "\"");
-                }
-                if (_current_programmer.has_devices_folder)
-                {
-                        var devices_folder = File.new_for_uri (_view.page.current_devices_folder).get_path ();
-                        filtered_command = filtered_command.replace ("%devices_folder",  "\"" + devices_folder + "\"");
-                }
-                if (_current_programmer.has_clock)
-                        filtered_command = filtered_command.replace ("%clock", _view.page.current_clock);
-                
-                filtered_command = filtered_command.replace ("%device", _view.page.current_device);
-                
-                if (_current_programmer.can_write_fuses)
-                        filtered_command = filtered_command.replace ("%fuses", _view.page.current_fuses);
+                var filtered_command = filter_command (command);
                 
                 if (_read_hexfile == null)
@@ -394 +394 @@
                     return;
                 
+                this.can_write_flash = _current_programmer.can_write_flash;
                 _view.write_flash_sensitive = valid_page && _current_programmer.can_write_flash;
                 _view.read_flash_sensitive = _current_programmer.can_read_flash;
@@ -406 +407 @@
         private void disable_actions ()
         {
+                this.can_write_flash = false;
                 _view.write_flash_sensitive = false;
                 _view.read_flash_sensitive = false;
@@ -415 +417 @@
                 _view.stop_sensitive = false;
         }
+        
+        private string filter_command (string command)
+        {
+                var filtered_command = command;
+                
+                if (_current_programmer.has_serial_port)
+                        filtered_command = filtered_command.replace ("%serial_port", _view.page.current_serial_port);
+                if (_current_programmer.has_baud_rate)
+                        filtered_command = filtered_command.replace ("%baud_rate", _view.page.current_baud_rate);
+                if (_current_programmer.has_devices_file)
+                {
+                        var devices_file = File.new_for_uri (_view.page.current_devices_file).get_path ();
+                        filtered_command = filtered_command.replace ("%devices_file", "\"" + devices_file + "\"");
+                }
+                if (_current_programmer.has_devices_folder)
+                {
+                        var devices_folder = File.new_for_uri (_view.page.current_devices_folder).get_path ();
+                        filtered_command = filtered_command.replace ("%devices_folder",  "\"" + devices_folder + "\"");
+                }
+                if (_current_programmer.has_clock)
+                        filtered_command = filtered_command.replace ("%clock", _view.page.current_clock);
+                
+                filtered_command = filtered_command.replace ("%device", _view.page.current_device);
+                
+                if (_current_programmer.can_write_fuses)
+                        filtered_command = filtered_command.replace ("%fuses", _view.page.current_fuses);
+                
+                return filtered_command;
+        }
 }

libi4uccore/projectslogic.vala

@@ -25 +25 @@
         private ProjectsView _view;
         private DocumentsLogic _documents_logic;
+        private ProgrammersLogic _programmers_logic;
         private ProjectsPageLogic _page_logic;
         private ProfileBuilder _profile_builder = new ProfileBuilder ();
 
-        public ProjectsLogic (ProjectsView view, DocumentsLogic documents_logic)
+        public ProjectsLogic (ProjectsView view, DocumentsLogic documents_logic, ProgrammersLogic programmers_logic)
         {
                 _view = view;
                 _documents_logic = documents_logic;
+                _programmers_logic = programmers_logic;
                 
                 _documents_logic.add_document_opener (".i4uc", this);
@@ -47 +49 @@
                 _view.remove_profile_sensitive = false;
                 _view.build_profile_sensitive = false;
+                _view.program_profile_sensitive = false;
                 _view.stop_sensitive = false;
                 _view.clean_profile_sensitive = false;
@@ -65 +68 @@
                 _view.remove_profile_clicked.connect (on_remove_profile_clicked);
                 _view.build_profile_clicked.connect (on_build_profile_clicked);
+                _view.program_profile_clicked.connect (on_program_profile_clicked);
                 _view.stop_clicked.connect (on_stop_clicked);
                 _view.clean_profile_clicked.connect (on_clean_profile_clicked);
@@ -75 +79 @@
                 _profile_builder.new_message.connect (on_profile_builder_new_message);
                 _profile_builder.command_finished.connect (on_profile_builder_command_finished);
+                _programmers_logic.notify["can-write-flash"].connect (on_programmers_logic_can_write_flash_changed);
         }
 
@@ -232 +237 @@
                         _view.show_error_message (_("Error trying to build profile %s: %s").printf (current_profile.name, e.message));
                 }
+        }
+        
+        private void on_program_profile_clicked ()
+        {
+                var current_project = _page_logic.current_project;
+                var current_profile = current_project.profiles[_view.page_view.current_profile];
+                var hexfile = current_project.name + "-" + current_profile.name + ".hex";
+                var hexfile_uri = current_project.get_file_uri (hexfile.replace (" ", "_"));
+                var hexfile_file = File.new_for_uri (hexfile_uri);
+                
+                if (!hexfile_file.query_exists (null))
+                {
+                        _view.show_error_message (_("The file %s doesn't exists").printf (hexfile_file.get_path ()));
+                        return;
+                }
+                _programmers_logic.write_flash (hexfile_uri);
         }
         
@@ -285 +306 @@
                 _view.build_profile_sensitive = profile_selected && !_profile_builder.is_building;
                 _view.clean_profile_sensitive = profile_selected && !_profile_builder.is_building;
+                _view.program_profile_sensitive = profile_selected && !_profile_builder.is_building && _programmers_logic.can_write_flash;
         }
 
@@ -324 +346 @@
                 _view.build_profile_sensitive = !is_building;
                 _view.stop_sensitive = is_building;
+                _view.program_profile_sensitive = !is_building;
         }
         
@@ -335 +358 @@
                 _view.build_log_page.add_command (command_context);
         }
+        
+        private void on_programmers_logic_can_write_flash_changed ()
+        {
+                var profile_selected = _view.page_view.current_profile != null &&
+                                       _view.page_view.current_profile != "__NONE__";
+                _view.program_profile_sensitive = profile_selected && !_profile_builder.is_building && _programmers_logic.can_write_flash;
+        }
 }

libi4uccore/projectsview.vala

@@ -32 +32 @@
         public abstract bool remove_profile_sensitive { set; get; }
         public abstract bool build_profile_sensitive { set; get; }
+        public abstract bool program_profile_sensitive { set; get; }
         public abstract bool stop_sensitive { set; get; }
         public abstract bool clean_profile_sensitive { set; get; }
@@ -45 +46 @@
         public signal void remove_profile_clicked ();
         public signal void build_profile_clicked ();
+        public signal void program_profile_clicked ();
         public signal void stop_clicked ();
         public signal void clean_profile_clicked ();