equal
deleted
inserted
replaced
555 def OnSaveProjectAsMenu(self, event): |
555 def OnSaveProjectAsMenu(self, event): |
556 self.SaveProjectAs() |
556 self.SaveProjectAs() |
557 event.Skip() |
557 event.Skip() |
558 |
558 |
559 def OnGenerateProgramMenu(self, event): |
559 def OnGenerateProgramMenu(self, event): |
560 dialog = wxFileDialog(self, "Choose a file", os.getcwd(), "", "ST files (*.st)|*.st|All files|*.*", wxSAVE|wxCHANGE_DIR) |
560 dialog = wxFileDialog(self, "Choose a file", os.getcwd(), self.Controler.GetProgramFilePath(), "ST files (*.st)|*.st|All files|*.*", wxSAVE|wxCHANGE_DIR) |
561 if dialog.ShowModal() == wxID_OK: |
561 if dialog.ShowModal() == wxID_OK: |
562 filepath = dialog.GetPath() |
562 filepath = dialog.GetPath() |
563 if os.path.isdir(os.path.dirname(filepath)): |
563 if os.path.isdir(os.path.dirname(filepath)): |
564 result = self.Controler.GenerateProgram(filepath) |
564 result = self.Controler.GenerateProgram(filepath) |
565 if not result: |
565 if not result: |
640 if selected != -1: |
640 if selected != -1: |
641 self.TabsOpened.GetPage(selected).SetMode(MODE_VARIABLE) |
641 self.TabsOpened.GetPage(selected).SetMode(MODE_VARIABLE) |
642 event.Skip() |
642 event.Skip() |
643 |
643 |
644 def OnBlockTool(self, event): |
644 def OnBlockTool(self, event): |
645 self.ResetToolToggle(wxID_PLCOPENEDITORTOOLBARBLOCK) |
|
646 selected = self.TabsOpened.GetSelection() |
645 selected = self.TabsOpened.GetSelection() |
647 if selected != -1: |
646 if selected != -1: |
648 self.TabsOpened.GetPage(selected).SetMode(MODE_BLOCK) |
647 self.TabsOpened.GetPage(selected).SetMode(MODE_BLOCK) |
649 event.Skip() |
648 event.Skip() |
650 |
649 |
670 event.Skip() |
669 event.Skip() |
671 |
670 |
672 def OnRungTool(self, event): |
671 def OnRungTool(self, event): |
673 selected = self.TabsOpened.GetSelection() |
672 selected = self.TabsOpened.GetSelection() |
674 if selected != -1: |
673 if selected != -1: |
675 self.TabsOpened.GetPage(selected).AddRung() |
674 self.TabsOpened.GetPage(selected).AddLadderRung() |
676 event.Skip() |
675 event.Skip() |
677 |
676 |
678 def OnCoilTool(self, event): |
677 def OnCoilTool(self, event): |
679 self.ResetToolToggle(wxID_PLCOPENEDITORTOOLBARCOIL) |
678 self.ResetToolToggle(wxID_PLCOPENEDITORTOOLBARCOIL) |
680 selected = self.TabsOpened.GetSelection() |
679 selected = self.TabsOpened.GetSelection() |
688 selected = self.TabsOpened.GetSelection() |
687 selected = self.TabsOpened.GetSelection() |
689 if selected != -1: |
688 if selected != -1: |
690 if self.DrawingMode == FREEDRAWING_MODE: |
689 if self.DrawingMode == FREEDRAWING_MODE: |
691 self.TabsOpened.GetPage(selected).SetMode(MODE_CONTACT) |
690 self.TabsOpened.GetPage(selected).SetMode(MODE_CONTACT) |
692 else: |
691 else: |
693 self.TabsOpened.GetPage(selected).AddContact() |
692 self.TabsOpened.GetPage(selected).AddLadderContact() |
694 event.Skip() |
693 event.Skip() |
695 |
694 |
696 def OnBranchTool(self, event): |
695 def OnBranchTool(self, event): |
697 selected = self.TabsOpened.GetSelection() |
696 selected = self.TabsOpened.GetSelection() |
698 if selected != -1: |
697 if selected != -1: |
699 self.TabsOpened.GetPage(selected).AddBranch() |
698 self.TabsOpened.GetPage(selected).AddLadderBranch() |
700 event.Skip() |
699 event.Skip() |
701 |
700 |
702 def OnInitialStepTool(self, event): |
701 def OnInitialStepTool(self, event): |
703 self.ResetToolToggle(wxID_PLCOPENEDITORTOOLBARINITIALSTEP) |
702 self.ResetToolToggle(wxID_PLCOPENEDITORTOOLBARINITIALSTEP) |
704 selected = self.TabsOpened.GetSelection() |
703 selected = self.TabsOpened.GetSelection() |