Graphic UI objects names change, Ribbon init() now remember current tab
This commit is contained in:
@@ -40,19 +40,19 @@ Graphic::Graphic(QWidget * parent): QFrame(parent), canvas(0), line_x_min(this),
|
||||
ui = new Ui::Graphic();
|
||||
ui->setupUi(this);
|
||||
QActionGroup * agroup = new QActionGroup(this);
|
||||
agroup->addAction(ui->actionGuidesFree );
|
||||
agroup->addAction(ui->actionGuidesTraceX);
|
||||
agroup->addAction(ui->actionGuidesTraceY);
|
||||
ui->actionGuidesFree ->setProperty("_value", (int)Free );
|
||||
ui->actionGuidesTraceX->setProperty("_value", (int)TraceX);
|
||||
ui->actionGuidesTraceY->setProperty("_value", (int)TraceY);
|
||||
ui->actionGuidesFree->setChecked(true);
|
||||
agroup->addAction(ui->graphic_actionGuidesFree );
|
||||
agroup->addAction(ui->graphic_actionGuidesTraceX);
|
||||
agroup->addAction(ui->graphic_actionGuidesTraceY);
|
||||
ui->graphic_actionGuidesFree ->setProperty("_value", (int)Free );
|
||||
ui->graphic_actionGuidesTraceX->setProperty("_value", (int)TraceX);
|
||||
ui->graphic_actionGuidesTraceY->setProperty("_value", (int)TraceY);
|
||||
ui->graphic_actionGuidesFree->setChecked(true);
|
||||
connect(agroup, SIGNAL(triggered(QAction*)), this, SLOT(actionGuidesTriggered(QAction*)));
|
||||
ui->checkGuides->addAction(ui->actionGuidesFree );
|
||||
ui->checkGuides->addAction(ui->actionGuidesTraceX);
|
||||
ui->checkGuides->addAction(ui->actionGuidesTraceY);
|
||||
ui->buttonAutofit->addAction(ui->actionExpandX);
|
||||
ui->buttonAutofit->addAction(ui->actionExpandY);
|
||||
ui->graphic_checkGuides ->addAction(ui->graphic_actionGuidesFree );
|
||||
ui->graphic_checkGuides ->addAction(ui->graphic_actionGuidesTraceX);
|
||||
ui->graphic_checkGuides ->addAction(ui->graphic_actionGuidesTraceY);
|
||||
ui->graphic_buttonAutofit->addAction(ui->graphic_actionExpandX);
|
||||
ui->graphic_buttonAutofit->addAction(ui->graphic_actionExpandY);
|
||||
line_x_min.setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
|
||||
line_x_max.setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
|
||||
((QBoxLayout * )ui->widgetLY->layout())->insertWidget(0, &line_y_min);
|
||||
@@ -540,7 +540,7 @@ void Graphic::clear() {
|
||||
graphics[i].max_x = 0.;
|
||||
graphics[i].cvrect = QRectF();
|
||||
}
|
||||
if (isFit) on_buttonAutofit_clicked();
|
||||
if (isFit) on_graphic_buttonAutofit_clicked();
|
||||
}
|
||||
|
||||
|
||||
@@ -553,9 +553,9 @@ void Graphic::setAntialiasing(bool enabled) {
|
||||
|
||||
void Graphic::setPaused(bool yes) {
|
||||
pause_ = yes;
|
||||
ui->checkPause->blockSignals(true);
|
||||
ui->checkPause->setChecked(yes);
|
||||
ui->checkPause->blockSignals(false);
|
||||
ui->graphic_checkPause->blockSignals(true);
|
||||
ui->graphic_checkPause->setChecked(yes);
|
||||
ui->graphic_checkPause->blockSignals(false);
|
||||
for (int i = 0; i < graphics.size(); ++i)
|
||||
graphics[i].cvrect = QRectF();
|
||||
if (!pause_) {
|
||||
@@ -592,17 +592,17 @@ void Graphic::setHistorySize(double val) {
|
||||
|
||||
void Graphic::setMaxVisibleTime(double val) {
|
||||
visible_time = val;
|
||||
if (isFit) on_buttonAutofit_clicked();
|
||||
if (isFit) on_graphic_buttonAutofit_clicked();
|
||||
}
|
||||
|
||||
|
||||
void Graphic::setOnlyExpandY(bool yes) {
|
||||
ui->actionExpandY->setChecked(yes);
|
||||
ui->graphic_actionExpandY->setChecked(yes);
|
||||
}
|
||||
|
||||
|
||||
void Graphic::setOnlyExpandX(bool yes) {
|
||||
ui->actionExpandX->setChecked(yes);
|
||||
ui->graphic_actionExpandX->setChecked(yes);
|
||||
}
|
||||
|
||||
|
||||
@@ -649,25 +649,25 @@ void Graphic::setGraphicsDataRaw(const QByteArray & ba) {
|
||||
|
||||
|
||||
void Graphic::setFloatingAxisEnabled(bool on) {
|
||||
ui->checkGuides->setChecked(on);
|
||||
ui->graphic_checkGuides->setChecked(on);
|
||||
}
|
||||
|
||||
|
||||
void Graphic::setButtons(Graphic::Buttons b) {
|
||||
buttons_ = b;
|
||||
ui->buttonAutofit->setVisible(b.testFlag(Autofit));
|
||||
ui->checkGrid->setVisible(b.testFlag(Grid));
|
||||
ui->checkGuides->setVisible(b.testFlag(CursorAxis));
|
||||
ui->buttonFullscreen->setVisible(b.testFlag(Fullscreen));
|
||||
ui->checkBorderInputs->setVisible(b.testFlag(BorderInputs));
|
||||
ui->checkLegend->setVisible(b.testFlag(Legend));
|
||||
ui->buttonClear->setVisible(b.testFlag(Clear));
|
||||
ui->buttonConfigure->setVisible(b.testFlag(Configure));
|
||||
ui->buttonSave->setVisible(b.testFlag(Save));
|
||||
ui->buttonClose->setVisible(b.testFlag(Close));
|
||||
ui->checkPause->setVisible(b.testFlag(Pause));
|
||||
if (ui->buttonAutofit->isVisible() || ui->checkGrid->isVisible() || ui->checkGuides->isVisible() ||
|
||||
ui->buttonConfigure->isVisible() || ui->buttonSave->isVisible() || ui->checkPause->isVisible())
|
||||
ui->graphic_buttonAutofit->setVisible(b.testFlag(Autofit));
|
||||
ui->graphic_checkGrid->setVisible(b.testFlag(Grid));
|
||||
ui->graphic_checkGuides->setVisible(b.testFlag(CursorAxis));
|
||||
ui->graphic_buttonFullscreen->setVisible(b.testFlag(Fullscreen));
|
||||
ui->graphic_checkBorderInputs->setVisible(b.testFlag(BorderInputs));
|
||||
ui->graphic_checkLegend->setVisible(b.testFlag(Legend));
|
||||
ui->graphic_buttonClear->setVisible(b.testFlag(Clear));
|
||||
ui->graphic_buttonConfigure->setVisible(b.testFlag(Configure));
|
||||
ui->graphic_buttonSave->setVisible(b.testFlag(Save));
|
||||
ui->graphic_buttonClose->setVisible(b.testFlag(Close));
|
||||
ui->graphic_checkPause->setVisible(b.testFlag(Pause));
|
||||
if (ui->graphic_buttonAutofit ->isVisible() || ui->graphic_checkGrid ->isVisible() || ui->graphic_checkGuides->isVisible() ||
|
||||
ui->graphic_buttonConfigure->isVisible() || ui->graphic_buttonSave->isVisible() || ui->graphic_checkPause ->isVisible())
|
||||
ui->verticalSpacer->changeSize(0, 30, QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
else
|
||||
ui->verticalSpacer->changeSize(0, 0, QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
@@ -1447,7 +1447,7 @@ void Graphic::tick(int index, bool slide, bool update_) {
|
||||
}
|
||||
|
||||
|
||||
void Graphic::on_buttonAutofit_clicked() {
|
||||
void Graphic::on_graphic_buttonAutofit_clicked() {
|
||||
isFit = true;
|
||||
bool isEmpty = true;
|
||||
foreach (const GraphicType & t, graphics) {
|
||||
@@ -1464,7 +1464,7 @@ void Graphic::on_buttonAutofit_clicked() {
|
||||
}
|
||||
|
||||
|
||||
void Graphic::on_buttonConfigure_clicked() {
|
||||
void Graphic::on_graphic_buttonConfigure_clicked() {
|
||||
conf->graphicItems.clear();
|
||||
for (int i = 0; i < graphics.size(); i++) {
|
||||
GraphicConf::GraphicItem item;
|
||||
@@ -1510,7 +1510,7 @@ void Graphic::on_buttonConfigure_clicked() {
|
||||
}
|
||||
|
||||
|
||||
void Graphic::on_checkGuides_toggled(bool checked) {
|
||||
void Graphic::on_graphic_checkGuides_toggled(bool checked) {
|
||||
guides = checked;
|
||||
setGuidesCursor();
|
||||
update();
|
||||
@@ -1594,8 +1594,8 @@ void Graphic::graphicVisibleChange(bool checked) {
|
||||
QCheckBox * cb = qobject_cast<QCheckBox*>(sender());
|
||||
int i = cb->property("graphic_num").toInt();
|
||||
graphics[i].visible = checked;
|
||||
if (isFit) on_buttonAutofit_clicked();
|
||||
else update();
|
||||
if (isFit) on_graphic_buttonAutofit_clicked();
|
||||
else {update();}
|
||||
emit graphicSettingsChanged();
|
||||
}
|
||||
|
||||
@@ -1607,8 +1607,8 @@ void Graphic::graphicAllVisibleChange(bool checked) {
|
||||
graphics[i].pb->setChecked(checked);
|
||||
}
|
||||
visible_update = false;
|
||||
if (isFit) on_buttonAutofit_clicked();
|
||||
else update();
|
||||
if (isFit) on_graphic_buttonAutofit_clicked();
|
||||
else {update();}
|
||||
emit graphicSettingsChanged();
|
||||
}
|
||||
|
||||
@@ -1759,14 +1759,14 @@ void Graphic::setCaption(const QString & str) {
|
||||
|
||||
|
||||
void Graphic::setGridEnabled(bool enabled) {
|
||||
ui->checkGrid->setChecked(enabled);
|
||||
ui->graphic_checkGrid->setChecked(enabled);
|
||||
}
|
||||
|
||||
|
||||
void Graphic::setBorderInputsVisible(bool visible) {
|
||||
ui->widgetLX->setVisible(visible);
|
||||
ui->widgetLY->setVisible(visible);
|
||||
ui->checkBorderInputs->setChecked(visible);
|
||||
ui->graphic_checkBorderInputs->setChecked(visible);
|
||||
if (visible) setRectToLines();
|
||||
}
|
||||
|
||||
@@ -1778,24 +1778,24 @@ void Graphic::setStatusVisible(bool visible) {
|
||||
|
||||
void Graphic::setLegendVisible(bool visible) {
|
||||
ui->widgetLegend->setVisible(visible);
|
||||
ui->checkLegend->setChecked(visible);
|
||||
ui->graphic_checkLegend->setChecked(visible);
|
||||
updateLegend();
|
||||
}
|
||||
|
||||
|
||||
void Graphic::on_actionExpandX_triggered(bool checked) {
|
||||
void Graphic::on_graphic_actionExpandX_triggered(bool checked) {
|
||||
only_expand_x = checked;
|
||||
ui->actionExpandX->setIcon(checked ? icon_exp_x : icon_exp_sx);
|
||||
ui->graphic_actionExpandX->setIcon(checked ? icon_exp_x : icon_exp_sx);
|
||||
}
|
||||
|
||||
|
||||
void Graphic::on_actionExpandY_triggered(bool checked) {
|
||||
void Graphic::on_graphic_actionExpandY_triggered(bool checked) {
|
||||
only_expand_y = checked;
|
||||
ui->actionExpandY->setIcon(checked ? icon_exp_y : icon_exp_sy);
|
||||
ui->graphic_actionExpandY->setIcon(checked ? icon_exp_y : icon_exp_sy);
|
||||
}
|
||||
|
||||
|
||||
void Graphic::actionGuidesTriggered(QAction * a) {
|
||||
ui->checkGuides->setChecked(true);
|
||||
ui->graphic_checkGuides->setChecked(true);
|
||||
setFloatingAxisType((FloatingAxisType)a->property("_value").toInt());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user