Sketcher: Clean up old crosshair code
==================================== - Remove old unconnected code - Move member functions to correct cpp file
This commit is contained in:
@@ -675,8 +675,6 @@ protected:
|
||||
{ return isCreateGeoActive(getActiveGuiDocument()); }
|
||||
};
|
||||
|
||||
extern char cursor_crosshair_color[];
|
||||
|
||||
class DrawSketchHandlerGenConstraint: public DrawSketchHandler
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -192,26 +192,6 @@ void removeRedundantHorizontalVertical(Sketcher::SketchObject* psketch,
|
||||
|
||||
/* Sketch commands =======================================================*/
|
||||
|
||||
static const char cursor_crosshair_color_fmt[] = "+ c #%06lX";
|
||||
char cursor_crosshair_color[12];
|
||||
|
||||
void DrawSketchHandler::setCrosshairColor()
|
||||
{
|
||||
unsigned long color = getCrosshairColor();
|
||||
sprintf(cursor_crosshair_color, cursor_crosshair_color_fmt, color);
|
||||
}
|
||||
|
||||
unsigned long DrawSketchHandler::getCrosshairColor()
|
||||
{
|
||||
unsigned long color = 0xFFFFFFFF; // white
|
||||
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
|
||||
("User parameter:BaseApp/Preferences/View");
|
||||
color = hGrp->GetUnsigned("CursorCrosshairColor", color);
|
||||
// from rgba to rgb
|
||||
color = (color >> 8) & 0xFFFFFF;
|
||||
return color;
|
||||
}
|
||||
|
||||
class DrawSketchHandlerLine: public DrawSketchHandler
|
||||
{
|
||||
public:
|
||||
@@ -254,6 +234,7 @@ public:
|
||||
{
|
||||
if (Mode==STATUS_SEEK_First){
|
||||
EditCurve[0] = onSketchPos;
|
||||
|
||||
Mode = STATUS_SEEK_Second;
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -169,6 +169,17 @@ int DrawSketchHandler::getHighestCurveIndex(void)
|
||||
return sketchgui->getSketchObject()->getHighestCurveIndex();
|
||||
}
|
||||
|
||||
unsigned long DrawSketchHandler::getCrosshairColor()
|
||||
{
|
||||
unsigned long color = 0xFFFFFFFF; // white
|
||||
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
|
||||
("User parameter:BaseApp/Preferences/View");
|
||||
color = hGrp->GetUnsigned("CursorCrosshairColor", color);
|
||||
// from rgba to rgb
|
||||
color = (color >> 8) & 0xFFFFFF;
|
||||
return color;
|
||||
}
|
||||
|
||||
void DrawSketchHandler::setCrosshairCursor(const char* svgName) {
|
||||
QString cursorName = QString::fromLatin1(svgName);
|
||||
const unsigned long defaultCrosshairColor = 0xFFFFFF;
|
||||
|
||||
@@ -149,7 +149,6 @@ protected:
|
||||
void unsetCursor(void);
|
||||
void applyCursor(void);
|
||||
void applyCursor(QCursor &newCursor);
|
||||
void setCrosshairColor();
|
||||
unsigned long getCrosshairColor();
|
||||
qreal devicePixelRatio();
|
||||
void setCrosshairCursor(const char* svgName);
|
||||
|
||||
Reference in New Issue
Block a user