summaryrefslogtreecommitdiffstats
path: root/Project/TextForm.h
diff options
context:
space:
mode:
authorThales1330 <thaleslima.ufu@gmail.com>2016-12-09 16:35:34 -0200
committerGitHub <noreply@github.com>2016-12-09 16:35:34 -0200
commitcff8d90d61be4d34f5e84e8dd0933f678e6214be (patch)
tree077fdde43d69c248f518fc22978796d8f16e03f3 /Project/TextForm.h
parente282ec268db0d17a1d53f813c5fff9473d25e797 (diff)
parentac671068f32849807728b4c2844a4cda995a73c8 (diff)
downloadPSP.git-cff8d90d61be4d34f5e84e8dd0933f678e6214be.tar.gz
PSP.git-cff8d90d61be4d34f5e84e8dd0933f678e6214be.tar.xz
PSP.git-cff8d90d61be4d34f5e84e8dd0933f678e6214be.zip
Merge pull request #2 from Thales1330/wip/currentState
Wip currentstate
Diffstat (limited to 'Project/TextForm.h')
-rw-r--r--Project/TextForm.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/Project/TextForm.h b/Project/TextForm.h
index 1a22baa..a24d90e 100644
--- a/Project/TextForm.h
+++ b/Project/TextForm.h
@@ -7,17 +7,24 @@
class TextForm : public TextFormBase
{
- public:
+public:
TextForm(wxWindow* parent, Text* text, std::vector<Element*> elementList, double systemPowerBase = 100e6);
virtual ~TextForm();
+
+ virtual bool LoadChoices();
+
virtual void ElementTypeChoice();
virtual void ElementNumberChoice();
virtual void DataTypeChoice();
virtual void UnitChoice();
- protected:
+ virtual void Preview();
+ virtual bool ValidateData();
+
+protected:
+ virtual void OnUnitChoiceSelected(wxCommandEvent& event);
virtual void OnCancelButtonClick(wxCommandEvent& event) { EndModal(wxID_CANCEL); }
- virtual void OnOKButtonClick(wxCommandEvent& event) { EndModal(wxID_OK); }
+ virtual void OnOKButtonClick(wxCommandEvent& event);
virtual void OnElementChoiceSelected(wxCommandEvent& event);
virtual void OnFromBusChoiceSelected(wxCommandEvent& event);
virtual void OnNameChoiceSelected(wxCommandEvent& event);
@@ -26,8 +33,9 @@ class TextForm : public TextFormBase
virtual void OnTypeChoiceSelected(wxCommandEvent& event);
Text* m_text;
+ Text* m_textToEdit;
wxWindow* m_parent;
ElectricCalculation m_allElements;
double m_systemPowerBase;
};
-#endif // TEXTFORM_H
+#endif // TEXTFORM_H