summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2016-09-05 00:37:13 -0300
committerThales Lima Oliveira <thaleslima.ufu@gmail.com>2016-09-05 00:37:13 -0300
commit47cebfc84d4ae315f4bf8ffb3d074b2b75781a1b (patch)
tree9fb509762086674197aae821bd1335bea47da033
parentc1aad656847602f7e4c7aead048f7465a76838d4 (diff)
downloadPSP.git-47cebfc84d4ae315f4bf8ffb3d074b2b75781a1b.tar.gz
PSP.git-47cebfc84d4ae315f4bf8ffb3d074b2b75781a1b.tar.xz
PSP.git-47cebfc84d4ae315f4bf8ffb3d074b2b75781a1b.zip
Capacitor under implementation
-rw-r--r--.codelite/.tern-port2
-rw-r--r--.codelite/PSP.session26
-rw-r--r--.codelite/PSP.tagsbin80602112 -> 80606208 bytes
-rw-r--r--.codelite/refactoring.dbbin681984 -> 701440 bytes
-rw-r--r--Project/Capacitor.cpp25
-rw-r--r--Project/Capacitor.h19
-rw-r--r--Project/Project.project2
7 files changed, 67 insertions, 7 deletions
diff --git a/.codelite/.tern-port b/.codelite/.tern-port
index 52da6f3..fa62293 100644
--- a/.codelite/.tern-port
+++ b/.codelite/.tern-port
@@ -1 +1 @@
-53547 \ No newline at end of file
+62933 \ No newline at end of file
diff --git a/.codelite/PSP.session b/.codelite/PSP.session
index f5937b5..82433ca 100644
--- a/.codelite/PSP.session
+++ b/.codelite/PSP.session
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<Session Name="C:\Users\Thales\Documents\GitHub\PSP\PSP.workspace">
- <int Value="0" Name="m_selectedTab"/>
+ <int Value="11" Name="m_selectedTab"/>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\PSP.workspace" Name="m_workspaceName"/>
<TabInfoArray Name="TabInfoArray">
<TabInfo>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Workspace.cpp" Name="FileName"/>
- <int Value="559" Name="FirstVisibleLine"/>
- <int Value="578" Name="CurrentLine"/>
+ <int Value="610" Name="FirstVisibleLine"/>
+ <int Value="646" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
@@ -48,14 +48,14 @@
<TabInfo>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Load.h" Name="FileName"/>
<int Value="0" Name="FirstVisibleLine"/>
- <int Value="19" Name="CurrentLine"/>
+ <int Value="11" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
<TabInfo>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Load.cpp" Name="FileName"/>
- <int Value="66" Name="FirstVisibleLine"/>
- <int Value="91" Name="CurrentLine"/>
+ <int Value="0" Name="FirstVisibleLine"/>
+ <int Value="6" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
@@ -73,6 +73,20 @@
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
+ <TabInfo>
+ <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Capacitor.h" Name="FileName"/>
+ <int Value="0" Name="FirstVisibleLine"/>
+ <int Value="19" Name="CurrentLine"/>
+ <wxArrayString Name="Bookmarks"/>
+ <IntVector Name="CollapsedFolds"/>
+ </TabInfo>
+ <TabInfo>
+ <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Capacitor.cpp" Name="FileName"/>
+ <int Value="0" Name="FirstVisibleLine"/>
+ <int Value="11" Name="CurrentLine"/>
+ <wxArrayString Name="Bookmarks"/>
+ <IntVector Name="CollapsedFolds"/>
+ </TabInfo>
</TabInfoArray>
<SerializedObject Name="m_breakpoints">
<long Value="0" Name="Count"/>
diff --git a/.codelite/PSP.tags b/.codelite/PSP.tags
index 75ac4cc..e220bc5 100644
--- a/.codelite/PSP.tags
+++ b/.codelite/PSP.tags
Binary files differ
diff --git a/.codelite/refactoring.db b/.codelite/refactoring.db
index 3c4c9ef..7fc2440 100644
--- a/.codelite/refactoring.db
+++ b/.codelite/refactoring.db
Binary files differ
diff --git a/Project/Capacitor.cpp b/Project/Capacitor.cpp
new file mode 100644
index 0000000..698d6a4
--- /dev/null
+++ b/Project/Capacitor.cpp
@@ -0,0 +1,25 @@
+#include "Capacitor.h"
+
+Capacitor::Capacitor() : Shunt()
+{
+}
+
+Capacitor::~Capacitor()
+{
+}
+
+bool Capacitor::AddParent(Element* parent, wxPoint2DDouble position)
+{
+}
+
+void Capacitor::Draw(wxPoint2DDouble translation, double scale) const
+{
+}
+
+void Capacitor::Rotate()
+{
+}
+
+bool Capacitor::GetContextMenu(wxMenu& menu)
+{
+}
diff --git a/Project/Capacitor.h b/Project/Capacitor.h
new file mode 100644
index 0000000..fe7c267
--- /dev/null
+++ b/Project/Capacitor.h
@@ -0,0 +1,19 @@
+#ifndef CAPACITOR_H
+#define CAPACITOR_H
+
+#include "Shunt.h"
+
+class Capacitor : Shunt
+{
+public:
+ Capacitor();
+ ~Capacitor();
+
+ virtual bool AddParent(Element* parent, wxPoint2DDouble position);
+ virtual void Draw(wxPoint2DDouble translation, double scale) const;
+ virtual void Rotate();
+ virtual bool GetContextMenu(wxMenu& menu);
+
+};
+
+#endif // CAPACITOR_H
diff --git a/Project/Project.project b/Project/Project.project
index 1152807..76d12ac 100644
--- a/Project/Project.project
+++ b/Project/Project.project
@@ -22,6 +22,7 @@
<File Name="Shunt.cpp"/>
<File Name="Load.cpp"/>
<File Name="Inductor.cpp"/>
+ <File Name="Capacitor.cpp"/>
</VirtualDirectory>
</VirtualDirectory>
<VirtualDirectory Name="view">
@@ -48,6 +49,7 @@
<File Name="Shunt.h"/>
<File Name="Load.h"/>
<File Name="Inductor.h"/>
+ <File Name="Capacitor.h"/>
</VirtualDirectory>
</VirtualDirectory>
<VirtualDirectory Name="view">