Please enter the commit message for your changes. Lines starting
 Fixed several small bugs with displaymap
 made 3d reports, probably about 50% there
 made the submit reports and view reports connected

	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/DisplayMap/displaymapcontrol.cpp
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/mapmarker.cpp
	modified:   EOBC/src/LogOn/logonwindow.cpp
	modified:   EOBC/src/LogOn/logonwindow.h
	modified:   EOBC/src/Reporting/generatereportwindow.cpp
	modified:   EOBC/src/Reporting/generatereportwindow.h
	modified:   EOBC/src/Reporting/report.cpp
	modified:   EOBC/src/Reporting/report.h
	modified:   EOBC/src/Reporting/reportbars.cpp
	modified:   EOBC/src/Reporting/reportbars.h
	modified:   EOBC/src/Reporting/reportingcontrol.cpp
	modified:   EOBC/src/Reporting/reportingcontrol.h
	modified:   EOBC/src/Reporting/viewallreportswindow.cpp
	modified:   EOBC/src/Reporting/viewallreportswindow.h
	modified:   EOBC/src/Reporting/viewreportwindow.cpp
Merge branch 'master' of /home/4user1/achamney/Dropbox/project/source
 fixed merge conflict, nothing changed
Conflicts:
	EOBC/src/ChangeData/changedatacontrol.cpp

	modified:   EOBC/resources/storage.xml
	modified:   EOBC/src/ChangeData/Control/addpatientcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.h
	modified:   EOBC/src/ChangeData/View/addpatientform.cpp
	modified:   EOBC/src/ChangeData/View/addpatientform.h
	modified:   EOBC/src/ChangeData/View/updatewaitinglistform.cpp
	modified:   EOBC/src/ChangeData/View/updatewaitinglistform.h
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	modified:   EOBC/src/Common/convenience.cpp
	modified:   EOBC/src/Storage/storageHandler.cpp
	modified:   EOBC/src/Storage/storageHandler.h
Removed LTC_Facility, no longer needed. Made Facility handle that.
	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/Model/facility.cpp
	modified:   EOBC/src/Model/facility.h
	deleted:    EOBC/src/Model/ltc_facility.cpp
	modified:   EOBC/src/Model/modelcommon.h
	modified:   EOBC/src/Storage/storageHandler.cpp
	deleted:    EOBC/src/Model/ltc_facility.h
Fixed/added comments everywhere. Fixed bug in MovePatientControl/Form and added Bed column for MovePatientForm's Move to bed option
        modified:   EOBC/src/ChangeData/Control/addfacilitycontrol.cpp
	modified:   EOBC/src/ChangeData/Control/addfacilitycontrol.h
	modified:   EOBC/src/ChangeData/Control/addpatientcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/addpatientcontrol.h
	modified:   EOBC/src/ChangeData/Control/createusercontrol.cpp
	modified:   EOBC/src/ChangeData/Control/createusercontrol.h
	modified:   EOBC/src/ChangeData/Control/movepatientcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/movepatientcontrol.h
	modified:   EOBC/src/ChangeData/Control/updatebedscontrol.h
	modified:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.h
	modified:   EOBC/src/ChangeData/View/addfacilityform.h
	modified:   EOBC/src/ChangeData/View/addpatientform.h
	modified:   EOBC/src/ChangeData/View/createuserform.h
	modified:   EOBC/src/ChangeData/View/movepatientform.cpp
	modified:   EOBC/src/ChangeData/View/movepatientform.h
	modified:   EOBC/src/ChangeData/View/updatebedsform.h
	modified:   EOBC/src/ChangeData/View/updatewaitinglistform.h
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	modified:   EOBC/src/Common/convenience.h
	modified:   EOBC/src/Common/logger.h
	modified:   EOBC/src/Model/area.h
	modified:   EOBC/src/Model/facility.h
	modified:   EOBC/src/Model/modelcommon.h
	modified:   EOBC/src/Model/patient.h
Added ChannelIn and ChannelOut, not to main though
	modified:   EOBC/EOBC.pro
	modified:   EOBC/Resources.qrc
	new file:   EOBC/resources/comsConfig.txt
	new file:   EOBC/src/Communication/channelin.cpp
	new file:   EOBC/src/Communication/channelin.h
	new file:   EOBC/src/Communication/channelout.cpp
	new file:   EOBC/src/Communication/channelout.h
Minor fixes to ChannelIn/Out, added to main.cpp
	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/Communication/channelin.cpp
	modified:   EOBC/src/Communication/channelin.h
	modified:   EOBC/src/Communication/channelout.cpp
	deleted:    EOBC/src/Model/ltc_facility.h
	modified:   EOBC/src/main.cpp
Added SendMessageControl
	new file:   sendmessagecontrol.cpp
	new file:   sendmessagecontrol.h
fixed a bug in storageHandler due to the new Facility constructor
	modified:   src/Storage/storageHandler.cpp
	modified:   src/Storage/storageHandler.h
Merge branch 'master' of /home/ubuntu/Dropbox/project/source
Added GetData Interfaces, made ChangeData take an interface. They currently do nothing.
	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	new file:   EOBC/src/GetData/getdatachangedatainterface.cpp
	new file:   EOBC/src/GetData/getdatachangedatainterface.h
	new file:   EOBC/src/GetData/getdatadisplaymapinterface.cpp
	new file:   EOBC/src/GetData/getdatadisplaymapinterface.h
	new file:   EOBC/src/GetData/getdatareportinginterface.cpp
	new file:   EOBC/src/GetData/getdatareportinginterface.h
	modified:   EOBC/src/main.cpp
Added functions to the GetDataChangeDataInterface
	modified:   EOBC/src/GetData/getdatachangedatainterface.cpp
	modified:   EOBC/src/GetData/getdatachangedatainterface.h
	modified:   EOBC/src/GetData/getdatacontrol.h
Forgot that Facility names aren't unique, it's their ID that is. Now asking for maps of IDs instead of QString.
	modified:   EOBC/src/GetData/getdatachangedatainterface.cpp
	modified:   EOBC/src/GetData/getdatachangedatainterface.h
	modified:   EOBC/src/GetData/getdatacontrol.h
Enhanced the report. It has numbers on the bars now
Axies are still not labeled

DisplayMap is now set up for its interface

	modified:   EOBC/src/DisplayMap/displaymapcontrol.cpp
	modified:   EOBC/src/DisplayMap/displaymapcontrol.h
	modified:   EOBC/src/DisplayMap/facilityicon.cpp
	modified:   EOBC/src/Reporting/generatereportwindow.cpp
	modified:   EOBC/src/Reporting/generatereportwindow.h
	modified:   EOBC/src/Reporting/report.cpp
	modified:   EOBC/src/Reporting/report.h
	modified:   EOBC/src/Reporting/reportbars.cpp
	modified:   EOBC/src/Reporting/viewallreportswindow.cpp
	modified:   EOBC/src/Reporting/viewallreportswindow.h
	modified:   EOBC/src/main.cpp
Implemented Interface for GetDataChangeData. Right now opening a form asks GetData to get the data, but it doesn't do anything after that. Made ChangeData forms always on top
	modified:   EOBC/src/ChangeData/View/addfacilityform.cpp
	modified:   EOBC/src/ChangeData/View/addpatientform.cpp
	modified:   EOBC/src/ChangeData/View/createuserform.cpp
	modified:   EOBC/src/ChangeData/View/movepatientform.cpp
	modified:   EOBC/src/ChangeData/View/updatebedsform.cpp
	modified:   EOBC/src/ChangeData/View/updatewaitinglistform.cpp
	modified:   EOBC/src/ChangeData/View/updatewaitinglistform.h
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	modified:   EOBC/src/GetData/getdatachangedatainterface.cpp
	modified:   EOBC/src/GetData/getdatachangedatainterface.h
	modified:   EOBC/src/GetData/getdatacontrol.cpp
	modified:   EOBC/src/GetData/getdatacontrol.h
	modified:   EOBC/src/Model/facility.h
	modified:   EOBC/src/Model/modelcommon.h
Merge branch 'master' of /home/robbie/Dropbox/project/source
Made very small changed to a bunch of stuff
Modified the font for the reports.

	modified:   EOBC/src/DisplayMap/displaymapcontrol.cpp
	modified:   EOBC/src/DisplayMap/facilityicon.cpp
	modified:   EOBC/src/DisplayMap/facilityicon.h
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/map.h
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/maparea.h
	modified:   EOBC/src/Reporting/generatereportwindow.cpp
	modified:   EOBC/src/Reporting/report.cpp
	modified:   EOBC/src/Reporting/report.h
	modified:   EOBC/src/Reporting/reportbars.cpp
	modified:   EOBC/src/Reporting/reportingcontrol.cpp
	modified:   EOBC/src/Reporting/reportingcontrol.h
	modified:   EOBC/src/main.cpp
Merge branch 'master' of /home/austin/Dropbox/project/source
added collision code between icons
made reports able to report based on month or year as well as day
made reports able to be for LTC or hospitals
made the map and the reports display two kinds of open beds if its a hospital

	modified:   EOBC/src/Common/convenience.h
	modified:   EOBC/src/DisplayMap/displaymapcontrol.cpp
	modified:   EOBC/src/DisplayMap/facilityicon.cpp
	modified:   EOBC/src/DisplayMap/facilityicon.h
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/map.h
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/maparea.h
	modified:   EOBC/src/Reporting/generatereportwindow.cpp
	modified:   EOBC/src/Reporting/report.cpp
	modified:   EOBC/src/Reporting/report.h
	modified:   EOBC/src/Reporting/reportbars.cpp
	modified:   EOBC/src/Reporting/reportbars.h
	modified:   EOBC/src/Reporting/reportingcontrol.h
	modified:   EOBC/src/Reporting/viewallreportswindow.cpp
	modified:   EOBC/src/Reporting/viewallreportswindow.h
	modified:   EOBC/src/Reporting/viewreportwindow.cpp
	modified:   EOBC/src/Reporting/viewreportwindow.h
Trimmed down GetData interfaces, got rid of the fluff and now the signals/slots pass around the data instead of storing/using getters
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	modified:   EOBC/src/GetData/getdatachangedatainterface.cpp
	modified:   EOBC/src/GetData/getdatachangedatainterface.h
	modified:   EOBC/src/GetData/getdatacontrol.cpp
	modified:   EOBC/src/GetData/getdatacontrol.h
Still working on Send parsing