graphic and blockview support for style colors

git-svn-id: svn://db.shs.com.ru/libs@545 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
2019-06-06 10:43:31 +00:00
parent 3044caff92
commit 8b9d4cffa7
3 changed files with 9 additions and 9 deletions

View File

@@ -102,15 +102,15 @@ Graphic::Graphic(QWidget * parent): QFrame(parent), line_x_min(this), line_x_max
curaction = gaMove;
selbrush.setStyle(Qt::SolidPattern);
selbrush.setColor(QColor(60, 175, 255, 100));
text_color = Qt::black;
grid_pen = QPen(Qt::gray, 0., Qt::DotLine);
text_color = palette().color(QPalette::WindowText);
grid_pen = QPen(palette().color(QPalette::Button), 0., Qt::DotLine);
//graph_pen = QPen(Qt::red);
//graph_pen.setCosmetic(true);
graphics.append(GraphicType());
curGraphic = 0;
selpen = QPen(Qt::black);
selpen = palette().color(QPalette::WindowText);
selpen.setStyle(Qt::DashLine);
back_color = Qt::white;
back_color = palette().color(QPalette::Base);
buttons_ = AllButtons;
setOpenGL(false);
setButtonsPosition(Graphic::Left);

View File

@@ -383,10 +383,10 @@ protected:
Graduation grad_x, grad_y;
AxisType axis_type_x;
double gridx, gridy, history, visible_time, inc_x, mdm, grid_numbers_x, grid_numbers_y, LN2, LN5, LN10;
double eminx, eminy, emaxx, emaxy, pause_phase, gesture_angle, need_mouse_pan;
double eminx, eminy, emaxx, emaxy, pause_phase, gesture_angle;
int legy, lastw, lasth, min_repaint_int, min_int, max_int, timer_pause, thick;
bool aalias, aupdate, mupdate, grid, guides, isFit, isEmpty, isOGL, isHover, bufferActive, cancel, pause_, isPrinting, gestures;
bool hasLblX, hasLblY, navigation, only_expand_y, only_expand_x, is_lines_update, leg_update, visible_update, fullscr;
bool hasLblX, hasLblY, navigation, only_expand_y, only_expand_x, is_lines_update, leg_update, visible_update, fullscr, need_mouse_pan;
protected slots:
void canvasPaintEvent();