Code cleanup of editcallbacks.h/.cc for more safety

rtgui/editcallbacks.cc

@@ -19,7 +19,13 @@
 
 #include "editcallbacks.h"
 
-EditSubscriber::EditSubscriber (EditType editType) : ID(EUID_None), editingType(editType), bufferType(BT_SINGLEPLANE_FLOAT), provider(nullptr), action(ES_ACTION_NONE) {}
+EditSubscriber::EditSubscriber (EditType editType) :
+    ID(EUID_None),
+    editingType(editType),
+    bufferType(BT_SINGLEPLANE_FLOAT),
+    provider(nullptr),
+    action(EditSubscriber::Action::NONE)
+{}
 
 void EditSubscriber::setEditProvider(EditDataProvider *provider)
 {
@@ -32,7 +38,7 @@ void EditSubscriber::setEditID(EditUniqueID ID, BufferType buffType)
     bufferType = buffType;
 }
 
-bool EditSubscriber::isCurrentSubscriber()
+const bool EditSubscriber::isCurrentSubscriber() const
 {
     //if (provider && provider->getCurrSubscriber())
     //  return provider->getCurrSubscriber()->getEditID() == ID;
@@ -63,39 +69,47 @@ void EditSubscriber::switchOffEditMode()
     unsubscribe();
 }
 
-EditUniqueID EditSubscriber::getEditID()
+const  EditUniqueID EditSubscriber::getEditID() const
 {
     return ID;
 }
 
-EditType EditSubscriber::getEditingType()
+const EditType EditSubscriber::getEditingType() const
 {
     return editingType;
 }
 
-BufferType EditSubscriber::getPipetteBufferType()
+const  BufferType EditSubscriber::getPipetteBufferType() const
 {
     return bufferType;
 }
 
-bool EditSubscriber::isDragging()
+const bool EditSubscriber::isDragging() const
 {
-    return action == ES_ACTION_DRAGGING;
+    return action == EditSubscriber::Action::DRAGGING;
 }
 
-bool EditSubscriber::isPicking()
+const bool EditSubscriber::isPicking() const
 {
-    return action == ES_ACTION_PICKING;
+    return action == EditSubscriber::Action::PICKING;
 }
 
 //--------------------------------------------------------------------------------------------------
 
 
-EditDataProvider::EditDataProvider() : currSubscriber(nullptr), object(0), posScreen(-1, -1), posImage(-1, -1),
-    deltaScreen(0, 0), deltaImage(0, 0), deltaPrevScreen(0, 0), deltaPrevImage(0, 0)
-{
-    pipetteVal[0] = pipetteVal[1] = pipetteVal[2] = 0.f;
-}
+EditDataProvider::EditDataProvider() :
+    currSubscriber(nullptr),
+    object(0),
+    pipetteVal1(0.f),
+    pipetteVal2(0.f),
+    pipetteVal3(0.f),
+    posScreen(-1, -1),
+    posImage(-1, -1),
+    deltaScreen(0, 0),
+    deltaImage(0, 0),
+    deltaPrevScreen(0, 0),
+    deltaPrevImage(0, 0)
+{}
 
 void EditDataProvider::subscribe(EditSubscriber *subscriber)
 {
@@ -118,7 +132,47 @@ void EditDataProvider::switchOffEditMode()
     }
 }
 
-CursorShape EditDataProvider::getCursor(int objectID)
+int EditDataProvider::getObject()
+{
+    return object;
+}
+
+void EditDataProvider::setObject(int newObject)
+{
+    object = newObject;
+}
+
+float EditDataProvider::getPipetteVal1()
+{
+    return pipetteVal1;
+}
+
+float EditDataProvider::getPipetteVal2()
+{
+    return pipetteVal2;
+}
+
+float EditDataProvider::getPipetteVal3()
+{
+    return pipetteVal3;
+}
+
+void EditDataProvider::setPipetteVal1(float newVal)
+{
+    pipetteVal1 = newVal;
+}
+
+void EditDataProvider::setPipetteVal2(float newVal)
+{
+    pipetteVal2 = newVal;
+}
+
+void EditDataProvider::setPipetteVal3(float newVal)
+{
+    pipetteVal3 = newVal;
+}
+
+const CursorShape EditDataProvider::getCursor(int objectID) const
 {
     if (currSubscriber) {
         currSubscriber->getCursor(objectID);
@@ -127,8 +181,79 @@ CursorShape EditDataProvider::getCursor(int objectID)
     return CSHandOpen;
 }
 
-EditSubscriber* EditDataProvider::getCurrSubscriber()
+EditSubscriber* EditDataProvider::getCurrSubscriber() const
 {
     return currSubscriber;
 }
 
+EditDataProvider* EditSubscriber::getEditProvider () {
+    return provider;
+}
+
+const CursorShape EditSubscriber::getCursor (int objectID) const {
+    return CSHandOpen;
+}
+
+const bool EditSubscriber::mouseOver (const int modifierKey) {
+    return false;
+}
+
+bool EditSubscriber::button1Pressed (const int modifierKey) {
+    return false;
+}
+
+bool EditSubscriber::button1Released () {
+    return false;
+}
+
+bool EditSubscriber::button2Pressed (const int modifierKey) {
+    return false;
+}
+
+bool EditSubscriber::button2Released () {
+    return false;
+}
+
+bool EditSubscriber::button3Pressed (const int modifierKey) {
+    return false;
+}
+
+bool EditSubscriber::button3Released () {
+    return false;
+}
+
+bool EditSubscriber::drag1 (const int modifierKey) {
+    return false;
+}
+
+bool EditSubscriber::drag2 (const int modifierKey) {
+    return false;
+}
+
+bool EditSubscriber::drag3 (const int modifierKey) {
+    return false;
+}
+
+bool EditSubscriber::pick1 (const bool picked) {
+    return false;
+}
+
+bool EditSubscriber::pick2 (const bool picked) {
+    return false;
+}
+
+bool EditSubscriber::pick3 (const bool picked) {
+    return false;
+}
+
+const std::vector<Geometry*>& EditSubscriber::getVisibleGeometry () {
+    return visibleGeometry;
+}
+
+const std::vector<Geometry*>& EditSubscriber::getMouseOverGeometry () {
+    return mouseOverGeometry;
+}
+
+const int EditDataProvider::getPipetteRectSize () const {
+    return 8; // TODO: make a GUI
+}