Merge lp:~snowsailor/stellarium/stellarium into lp:stellarium

[Snow Sailor]

Allow custom markers to be removed with a Shift+RightClick within a 15-pixel radius. A click that is 7 pixels away from Marker 1 and 8 pixels away from Marker 2 will result in Marker 1 being removed (it is closer to the click).

All markers can still be removed with Shift+Alt+RightClick.

The two lines that were changed to say "quarter of the screen" from "half the screen" are incorrect. I had changed them to test some other stuff and forgot to change the comments back to what they were.

[gzotti (georg-zotti)]

Nice new feature, thanks. I approve this change alone, but would welcome if you can also solve the Retina-related pixel coordinate bug you reported (https://bugs.launchpad.net/stellarium/+bug/1688985).

review: Approve

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'src/core/modules/CustomObjectMgr.cpp'
--- src/core/modules/CustomObjectMgr.cpp	2017-03-13 11:34:19 +0000
+++ src/core/modules/CustomObjectMgr.cpp	2017-05-07 00:45:47 +0000
@@ -55,6 +55,7 @@
 
 void CustomObjectMgr::handleMouseClicks(class QMouseEvent* e)
 {
+	// Shift + LeftClick
 	if (e->modifiers().testFlag(Qt::ShiftModifier) && e->button()==Qt::LeftButton && e->type()==QEvent::MouseButtonPress)
 	{
 		// Add custom marker
@@ -62,8 +63,8 @@
 
 		QPoint p = StelMainView::getInstance().getMousePos(); // get screen coordinates of mouse cursor
 		Vec3d mousePosition;
-		float wh = prj->getViewportWidth()/2.; // get half of width of the screen
-		float hh = prj->getViewportHeight()/2.; // get half of height of the screen
+		float wh = prj->getViewportWidth()/2.; // get quarter of width of the screen
+		float hh = prj->getViewportHeight()/2.; // get quarter of height of the screen
 		float mx = p.x()-wh; // point 0 in center of the screen, axis X directed to right
 		float my = p.y()-hh; // point 0 in center of the screen, axis Y directed to bottom
 		// calculate position of mouse cursor via position of center of the screen (and invert axis Y)
@@ -81,13 +82,62 @@
 		e->setAccepted(true);
 		return;
 	}
-	if (e->modifiers().testFlag(Qt::ShiftModifier) && e->button()==Qt::RightButton && e->type()==QEvent::MouseButtonPress)
-	{
-		// Delete custom markers
+
+	// Shift + Alt + Right click -- Removes all custom markers
+	// Changed by snowsailor 5/04/2017
+	if(e->modifiers().testFlag(Qt::ShiftModifier) && e->modifiers().testFlag(Qt::AltModifier) && e->button() == Qt::RightButton && e->type() == QEvent::MouseButtonPress) {
+		//Delete ALL custom markers
 		removeCustomObjects();
 		e->setAccepted(true);
 		return;
 	}
+	// Shift + RightClick
+	// Added by snowsailor 5/04/2017 -- Removes the closest marker within a radius specified within
+	if (e->modifiers().testFlag(Qt::ShiftModifier) && e->button()==Qt::RightButton && e->type()==QEvent::MouseButtonPress) {
+		//Limit the click radius to 15px in any direction
+		int radiusLimit = 15;
+
+		StelCore *core = StelApp::getInstance().getCore();
+		const StelProjectorP prj = StelApp::getInstance().getCore()->getProjection(StelCore::FrameJ2000, StelCore::RefractionAuto);
+
+		QPoint p = StelMainView::getInstance().getMousePos(); // get screen coordinates of mouse cursor
+		Vec3d mousePosition;
+		float wh = prj->getViewportWidth()/2.; // get half of width of the screen
+		float hh = prj->getViewportHeight()/2.; // get half of height of the screen
+		float mx = p.x()-wh; // point 0 in center of the screen, axis X directed to right
+		float my = p.y()-hh; // point 0 in center of the screen, axis Y directed to bottom
+		// calculate position of mouse cursor via position of center of the screen (and invert axis Y)
+		prj->unProject(prj->getViewportPosX()+wh+mx, prj->getViewportPosY()+hh+1-my, mousePosition);
+
+		Vec3d winpos;
+		prj->project(mousePosition, winpos);
+		float xpos = winpos[0];
+		float ypos = winpos[1];
+
+		CustomObjectP closest;
+		//Smallest valid radius will be at most `radiusLimit`, so radiusLimit + 10 is plenty as the default
+		float smallestRad = radiusLimit + 10;
+		foreach(CustomObjectP cObj, customObjects) {
+			//Get the position of the custom object
+			Vec3d a = cObj->getJ2000EquatorialPos(core);
+			prj->project(a, winpos);
+			//Distance formula to determine how close we clicked to each of the custom objects
+			float dist = std::sqrt(((xpos-winpos[0])*(xpos-winpos[0])) + ((ypos-winpos[1])*(ypos-winpos[1])));
+			//If the position of the object is within our click radius
+			if(dist <= radiusLimit && dist < smallestRad) {
+				//Update the closest object and the smallest distance.
+				closest = cObj;
+				smallestRad = dist;
+			}
+		}
+		//If there was a custom object within `radiusLimit` pixels...
+		if(smallestRad <= radiusLimit) {
+			//Remove it and return
+			removeCustomObject(closest);
+			e->setAccepted(true);
+			return;
+		}
+	}
 	e->setAccepted(false);
 }
 
@@ -160,9 +210,26 @@
 {
 	setSelected("");
 	customObjects.clear();
+	//This marker count can be set to 0 because there will be no markers left and a duplicate will be impossible
 	countMarkers = 0;
 }
 
+void CustomObjectMgr::removeCustomObject(CustomObjectP obj) {
+	setSelected("");
+	int i = 0;
+	foreach(const CustomObjectP& cObj, customObjects) {
+		//If we have a match for the thing we want to delete
+		if(cObj && cObj == obj && cObj->initialized) {
+			//Remove the value at the current index and exit loop
+			customObjects.removeAt(i);
+			break;
+		}
+		i++;
+	}
+	//Don't decrememnt marker count. This will prevent multiple markers from being added with the same name.
+	//countMarkers -= 1;
+}
+
 void CustomObjectMgr::draw(StelCore* core)
 {
 	StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);

=== modified file 'src/core/modules/CustomObjectMgr.hpp'
--- src/core/modules/CustomObjectMgr.hpp	2016-12-11 14:23:57 +0000
+++ src/core/modules/CustomObjectMgr.hpp	2017-05-07 00:45:47 +0000
@@ -124,6 +124,8 @@
 	void addCustomObjectAltAzi(QString designation, const QString& alt, const QString& azi, bool isVisible=false);
 	//! Remove all custom objects
 	void removeCustomObjects();
+	//! Remove just one custom object
+	void removeCustomObject(CustomObjectP);
 
 	//! Set the color used to draw custom object markers.
 	//! @param c The color of the custom object markers (R,G,B)