Merge remote-tracking branch 'refs/remotes/origin/wip/currentState'

1 files changed, 315 insertions, 4 deletions

diff --git a/Project/Release/Workspace.cpp.o.d b/Project/Release/Workspace.cpp.o.d
index 465d6d8..580e64d 100644
--- a/Project/Release/Workspace.cpp.o.d
+++ b/Project/Release/Workspace.cpp.o.d
@@ -184,13 +184,106 @@ Release/Workspace.cpp.o: Workspace.cpp Workspace.h \
  C:/wxWidgets-3.1.0/include/wx/ioswrap.h \
  C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \
  C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \
- C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Element.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Bus.h BusForm.h \
+ ElementForm.h C:/wxWidgets-3.1.0/include/wx/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/stattext.h \
+ C:/wxWidgets-3.1.0/include/wx/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/choice.h \
+ C:/wxWidgets-3.1.0/include/wx/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h \
+ C:/wxWidgets-3.1.0/include/wx/button.h \
+ C:/wxWidgets-3.1.0/include/wx/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/button.h \
+ C:/wxWidgets-3.1.0/include/wx/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statbox.h \
+ C:/wxWidgets-3.1.0/include/wx/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statline.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h \
+ C:/wxWidgets-3.1.0/include/wx/recguard.h \
+ C:/wxWidgets-3.1.0/include/wx/time.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/property.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h \
+ C:/wxWidgets-3.1.0/include/wx/hashset.h \
+ C:/wxWidgets-3.1.0/include/wx/tokenzr.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/props.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h \
+ C:/wxWidgets-3.1.0/include/wx/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listbox.h \
+ C:/wxWidgets-3.1.0/include/wx/valtext.h \
+ C:/wxWidgets-3.1.0/include/wx/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/tbarbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/headercol.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h \
+ C:/wxWidgets-3.1.0/include/wx/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/range.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h \
+ C:/wxWidgets-3.1.0/include/wx/listctrl.h \
+ C:/wxWidgets-3.1.0/include/wx/listbase.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h Element.h \
  C:/wxWidgets-3.1.0/include/wx/menu.h \
  C:/wxWidgets-3.1.0/include/wx/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/msw/menuitem.h \
  C:/wxWidgets-3.1.0/include/wx/ownerdrw.h \
  C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h \
- C:/wxWidgets-3.1.0/include/wx/msw/menu.h Bus.h Line.h
+ C:/wxWidgets-3.1.0/include/wx/msw/menu.h Line.h LineForm.h Branch.h \
+ Transformer.h SyncGenerator.h Machines.h IndMotor.h SyncMotor.h Load.h \
+ LoadForm.h Shunt.h Inductor.h Capacitor.h Text.h wxGLString.h \
+ C:/wxWidgets-3.1.0/include/wx/wx.h C:/wxWidgets-3.1.0/include/wx/hash.h \
+ C:/wxWidgets-3.1.0/include/wx/stopwatch.h \
+ C:/wxWidgets-3.1.0/include/wx/timer.h \
+ C:/wxWidgets-3.1.0/include/wx/module.h \
+ C:/wxWidgets-3.1.0/include/wx/wxcrtvararg.h \
+ C:/wxWidgets-3.1.0/include/wx/frame.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/frame.h \
+ C:/wxWidgets-3.1.0/include/wx/dcmemory.h \
+ C:/wxWidgets-3.1.0/include/wx/dcprint.h \
+ C:/wxWidgets-3.1.0/include/wx/dcscreen.h \
+ C:/wxWidgets-3.1.0/include/wx/dataobj.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataform.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h \
+ C:/wxWidgets-3.1.0/include/wx/bmpbuttn.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/bmpbuttn.h \
+ C:/wxWidgets-3.1.0/include/wx/checklst.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/checklst.h \
+ C:/wxWidgets-3.1.0/include/wx/scrolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/scrolbar.h \
+ C:/wxWidgets-3.1.0/include/wx/statbmp.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/statbmp.h \
+ C:/wxWidgets-3.1.0/include/wx/radiobox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/radiobox.h \
+ C:/wxWidgets-3.1.0/include/wx/radiobut.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/radiobut.h \
+ C:/wxWidgets-3.1.0/include/wx/slider.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/slider.h \
+ C:/wxWidgets-3.1.0/include/wx/gauge.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/gauge.h \
+ C:/wxWidgets-3.1.0/include/wx/dirdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/dirdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/combobox.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/combobox.h \
+ C:/wxWidgets-3.1.0/include/wx/layout.h \
+ C:/wxWidgets-3.1.0/include/wx/choicdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/choicdgg.h \
+ C:/wxWidgets-3.1.0/include/wx/textdlg.h \
+ C:/wxWidgets-3.1.0/include/wx/generic/textdlgg.h \
+ C:/wxWidgets-3.1.0/include/wx/filedlg.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/filedlg.h \
+ C:/wxWidgets-3.1.0/include/wx/mdi.h \
+ C:/wxWidgets-3.1.0/include/wx/msw/mdi.h PowerFlow.h \
+ ElectricCalculation.h
 
 Workspace.h:
 
@@ -570,6 +663,106 @@ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h:
 
+Bus.h:
+
+BusForm.h:
+
+ElementForm.h:
+
+C:/wxWidgets-3.1.0/include/wx/stattext.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/stattext.h:
+
+C:/wxWidgets-3.1.0/include/wx/choice.h:
+
+C:/wxWidgets-3.1.0/include/wx/ctrlsub.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ctrlsub.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/choice.h:
+
+C:/wxWidgets-3.1.0/include/wx/checkbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/checkbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ownerdrawnbutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/anybutton.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/button.h:
+
+C:/wxWidgets-3.1.0/include/wx/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statline.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/manager.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgrid.h:
+
+C:/wxWidgets-3.1.0/include/wx/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/scrolwin.h:
+
+C:/wxWidgets-3.1.0/include/wx/recguard.h:
+
+C:/wxWidgets-3.1.0/include/wx/time.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/property.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgriddefs.h:
+
+C:/wxWidgets-3.1.0/include/wx/hashset.h:
+
+C:/wxWidgets-3.1.0/include/wx/tokenzr.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridiface.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/propgridpagestate.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/props.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/editors.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listbox.h:
+
+C:/wxWidgets-3.1.0/include/wx/valtext.h:
+
+C:/wxWidgets-3.1.0/include/wx/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/tbarbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/toolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/headercol.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/headerctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/propgrid/advprops.h:
+
+C:/wxWidgets-3.1.0/include/wx/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/range.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/spinbutt.h:
+
+C:/wxWidgets-3.1.0/include/wx/listctrl.h:
+
+C:/wxWidgets-3.1.0/include/wx/listbase.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/listctrl.h:
+
 Element.h:
 
 C:/wxWidgets-3.1.0/include/wx/menu.h:
@@ -584,6 +777,124 @@ C:/wxWidgets-3.1.0/include/wx/msw/ownerdrw.h:
 
 C:/wxWidgets-3.1.0/include/wx/msw/menu.h:
 
-Bus.h:
-
 Line.h:
+
+LineForm.h:
+
+Branch.h:
+
+Transformer.h:
+
+SyncGenerator.h:
+
+Machines.h:
+
+IndMotor.h:
+
+SyncMotor.h:
+
+Load.h:
+
+LoadForm.h:
+
+Shunt.h:
+
+Inductor.h:
+
+Capacitor.h:
+
+Text.h:
+
+wxGLString.h:
+
+C:/wxWidgets-3.1.0/include/wx/wx.h:
+
+C:/wxWidgets-3.1.0/include/wx/hash.h:
+
+C:/wxWidgets-3.1.0/include/wx/stopwatch.h:
+
+C:/wxWidgets-3.1.0/include/wx/timer.h:
+
+C:/wxWidgets-3.1.0/include/wx/module.h:
+
+C:/wxWidgets-3.1.0/include/wx/wxcrtvararg.h:
+
+C:/wxWidgets-3.1.0/include/wx/frame.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/frame.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcmemory.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcprint.h:
+
+C:/wxWidgets-3.1.0/include/wx/dcscreen.h:
+
+C:/wxWidgets-3.1.0/include/wx/dataobj.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ole/dataform.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/ole/dataobj2.h:
+
+C:/wxWidgets-3.1.0/include/wx/bmpbuttn.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/bmpbuttn.h:
+
+C:/wxWidgets-3.1.0/include/wx/checklst.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/checklst.h:
+
+C:/wxWidgets-3.1.0/include/wx/scrolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/scrolbar.h:
+
+C:/wxWidgets-3.1.0/include/wx/statbmp.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/statbmp.h:
+
+C:/wxWidgets-3.1.0/include/wx/radiobox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/radiobox.h:
+
+C:/wxWidgets-3.1.0/include/wx/radiobut.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/radiobut.h:
+
+C:/wxWidgets-3.1.0/include/wx/slider.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/slider.h:
+
+C:/wxWidgets-3.1.0/include/wx/gauge.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/gauge.h:
+
+C:/wxWidgets-3.1.0/include/wx/dirdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/dirdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/combobox.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/combobox.h:
+
+C:/wxWidgets-3.1.0/include/wx/layout.h:
+
+C:/wxWidgets-3.1.0/include/wx/choicdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/choicdgg.h:
+
+C:/wxWidgets-3.1.0/include/wx/textdlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/generic/textdlgg.h:
+
+C:/wxWidgets-3.1.0/include/wx/filedlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/filedlg.h:
+
+C:/wxWidgets-3.1.0/include/wx/mdi.h:
+
+C:/wxWidgets-3.1.0/include/wx/msw/mdi.h:
+
+PowerFlow.h:
+
+ElectricCalculation.h: