"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/kdefrontend/dockwidgets/XYCurveDock.cpp" between
labplot-2.8.1.tar.gz and labplot-2.8.2.tar.gz

About: LabPlot is an application for plotting and analysis of 2D and 3D functions and data. It is a complete rewrite of LabPlot1 and lacks in the first release a lot of features available in the predecessor. On the other hand, the GUI and the usability is more superior.

XYCurveDock.cpp  (labplot-2.8.1):XYCurveDock.cpp  (labplot-2.8.2)
skipping to change at line 158 skipping to change at line 158
//Values //Values
connect( ui.cbValuesType, SIGNAL(currentIndexChanged(int)), this, SLOT(va luesTypeChanged(int)) ); connect( ui.cbValuesType, SIGNAL(currentIndexChanged(int)), this, SLOT(va luesTypeChanged(int)) );
connect( cbValuesColumn, SIGNAL(currentModelIndexChanged(QModelIndex)), t his, SLOT(valuesColumnChanged(QModelIndex)) ); connect( cbValuesColumn, SIGNAL(currentModelIndexChanged(QModelIndex)), t his, SLOT(valuesColumnChanged(QModelIndex)) );
connect( ui.cbValuesPosition, SIGNAL(currentIndexChanged(int)), this, SLO T(valuesPositionChanged(int)) ); connect( ui.cbValuesPosition, SIGNAL(currentIndexChanged(int)), this, SLO T(valuesPositionChanged(int)) );
connect( ui.sbValuesDistance, SIGNAL(valueChanged(double)), this, SLOT(va luesDistanceChanged(double)) ); connect( ui.sbValuesDistance, SIGNAL(valueChanged(double)), this, SLOT(va luesDistanceChanged(double)) );
connect( ui.sbValuesRotation, SIGNAL(valueChanged(int)), this, SLOT(value sRotationChanged(int)) ); connect( ui.sbValuesRotation, SIGNAL(valueChanged(int)), this, SLOT(value sRotationChanged(int)) );
connect( ui.sbValuesOpacity, SIGNAL(valueChanged(int)), this, SLOT(values OpacityChanged(int)) ); connect( ui.sbValuesOpacity, SIGNAL(valueChanged(int)), this, SLOT(values OpacityChanged(int)) );
connect(ui.cbValuesNumericFormat, QOverload<int>::of(&QComboBox::currentI ndexChanged), this, &XYCurveDock::valuesNumericFormatChanged); connect(ui.cbValuesNumericFormat, QOverload<int>::of(&QComboBox::currentI ndexChanged), this, &XYCurveDock::valuesNumericFormatChanged);
connect(ui.sbValuesPrecision, QOverload<int>::of(&QSpinBox::valueChanged) , this, &XYCurveDock::valuesPrecisionChanged); connect(ui.sbValuesPrecision, QOverload<int>::of(&QSpinBox::valueChanged) , this, &XYCurveDock::valuesPrecisionChanged);
connect(ui.cbValuesDateTimeFormat, &QComboBox::currentTextChanged, this, &XYCurveDock::valuesDateTimeFormatChanged); connect(ui.cbValuesDateTimeFormat, &QComboBox::currentTextChanged, this, &XYCurveDock::valuesDateTimeFormatChanged);
connect( ui.leValuesPrefix, SIGNAL(returnPressed()), this, SLOT(valuesPre connect(ui.leValuesPrefix, &QLineEdit::textChanged, this, &XYCurveDock::v
fixChanged()) ); aluesPrefixChanged);
connect( ui.leValuesSuffix, SIGNAL(returnPressed()), this, SLOT(valuesSuf connect(ui.leValuesSuffix, &QLineEdit::textChanged, this, &XYCurveDock::v
fixChanged()) ); aluesSuffixChanged);
connect( ui.kfrValuesFont, SIGNAL(fontSelected(QFont)), this, SLOT(values FontChanged(QFont)) ); connect( ui.kfrValuesFont, SIGNAL(fontSelected(QFont)), this, SLOT(values FontChanged(QFont)) );
connect( ui.kcbValuesColor, SIGNAL(changed(QColor)), this, SLOT(valuesCol orChanged(QColor)) ); connect( ui.kcbValuesColor, SIGNAL(changed(QColor)), this, SLOT(valuesCol orChanged(QColor)) );
//Filling //Filling
connect( ui.cbFillingPosition, SIGNAL(currentIndexChanged(int)), this, SL OT(fillingPositionChanged(int)) ); connect( ui.cbFillingPosition, SIGNAL(currentIndexChanged(int)), this, SL OT(fillingPositionChanged(int)) );
connect( ui.cbFillingType, SIGNAL(currentIndexChanged(int)), this, SLOT(f illingTypeChanged(int)) ); connect( ui.cbFillingType, SIGNAL(currentIndexChanged(int)), this, SLOT(f illingTypeChanged(int)) );
connect( ui.cbFillingColorStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(fillingColorStyleChanged(int)) ); connect( ui.cbFillingColorStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(fillingColorStyleChanged(int)) );
connect( ui.cbFillingImageStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(fillingImageStyleChanged(int)) ); connect( ui.cbFillingImageStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(fillingImageStyleChanged(int)) );
connect( ui.cbFillingBrushStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(fillingBrushStyleChanged(int)) ); connect( ui.cbFillingBrushStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(fillingBrushStyleChanged(int)) );
connect(ui.bFillingOpen, SIGNAL(clicked(bool)), this, SLOT(selectFile())) ; connect(ui.bFillingOpen, SIGNAL(clicked(bool)), this, SLOT(selectFile())) ;
connect( ui.leFillingFileName, SIGNAL(returnPressed()), this, SLOT(fileNa meChanged()) ); connect(ui.leFillingFileName, &QLineEdit::textChanged, this, &XYCurveDock ::fileNameChanged);
connect( ui.leFillingFileName, SIGNAL(textChanged(QString)), this, SLOT(f ileNameChanged()) ); connect( ui.leFillingFileName, SIGNAL(textChanged(QString)), this, SLOT(f ileNameChanged()) );
connect( ui.kcbFillingFirstColor, SIGNAL(changed(QColor)), this, SLOT(fil lingFirstColorChanged(QColor)) ); connect( ui.kcbFillingFirstColor, SIGNAL(changed(QColor)), this, SLOT(fil lingFirstColorChanged(QColor)) );
connect( ui.kcbFillingSecondColor, SIGNAL(changed(QColor)), this, SLOT(fi llingSecondColorChanged(QColor)) ); connect( ui.kcbFillingSecondColor, SIGNAL(changed(QColor)), this, SLOT(fi llingSecondColorChanged(QColor)) );
connect( ui.sbFillingOpacity, SIGNAL(valueChanged(int)), this, SLOT(filli ngOpacityChanged(int)) ); connect( ui.sbFillingOpacity, SIGNAL(valueChanged(int)), this, SLOT(filli ngOpacityChanged(int)) );
//Error bars //Error bars
connect( ui.cbXErrorType, SIGNAL(currentIndexChanged(int)), this, SLOT(xE rrorTypeChanged(int)) ); connect( ui.cbXErrorType, SIGNAL(currentIndexChanged(int)), this, SLOT(xE rrorTypeChanged(int)) );
connect( cbXErrorPlusColumn, SIGNAL(currentModelIndexChanged(QModelIndex) ), this, SLOT(xErrorPlusColumnChanged(QModelIndex)) ); connect( cbXErrorPlusColumn, SIGNAL(currentModelIndexChanged(QModelIndex) ), this, SLOT(xErrorPlusColumnChanged(QModelIndex)) );
connect( cbXErrorMinusColumn, SIGNAL(currentModelIndexChanged(QModelIndex )), this, SLOT(xErrorMinusColumnChanged(QModelIndex)) ); connect( cbXErrorMinusColumn, SIGNAL(currentModelIndexChanged(QModelIndex )), this, SLOT(xErrorMinusColumnChanged(QModelIndex)) );
connect( ui.cbYErrorType, SIGNAL(currentIndexChanged(int)), this, SLOT(yE rrorTypeChanged(int)) ); connect( ui.cbYErrorType, SIGNAL(currentIndexChanged(int)), this, SLOT(yE rrorTypeChanged(int)) );
skipping to change at line 397 skipping to change at line 397
GuiTools::updatePenStyles(ui.cbDropLineStyle, Qt::black); GuiTools::updatePenStyles(ui.cbDropLineStyle, Qt::black);
//Symbols //Symbols
GuiTools::updatePenStyles(ui.cbSymbolBorderStyle, Qt::black); GuiTools::updatePenStyles(ui.cbSymbolBorderStyle, Qt::black);
ui.cbSymbolStyle->setIconSize(QSize(iconSize, iconSize)); ui.cbSymbolStyle->setIconSize(QSize(iconSize, iconSize));
QTransform trafo; QTransform trafo;
trafo.scale(15, 15); trafo.scale(15, 15);
ui.cbSymbolStyle->addItem(i18n("None")); ui.cbSymbolStyle->addItem(i18n("None"));
for (int i = 1; i < 19; ++i) { //TODO: use enum count for (int i = 1; i < Symbol::stylesCount(); ++i) {
const auto style = (Symbol::Style)i; const auto style = (Symbol::Style)i;
pm.fill(Qt::transparent); pm.fill(Qt::transparent);
pa.begin(&pm); pa.begin(&pm);
pa.setPen(pen); pa.setPen(pen);
pa.setRenderHint(QPainter::Antialiasing); pa.setRenderHint(QPainter::Antialiasing);
pa.translate(iconSize/2,iconSize/2); pa.translate(iconSize/2,iconSize/2);
pa.drawPath(trafo.map(Symbol::pathFromStyle(style))); pa.drawPath(trafo.map(Symbol::pathFromStyle(style)));
pa.end(); pa.end();
ui.cbSymbolStyle->addItem(QIcon(pm), Symbol::nameFromStyle(style) ); ui.cbSymbolStyle->addItem(QIcon(pm), Symbol::nameFromStyle(style) );
} }
skipping to change at line 2301 skipping to change at line 2301
group.writeEntry("LineWidth", Worksheet::convertToSceneUnits(ui.sbLineWid th->value(), Worksheet::Unit::Point) ); group.writeEntry("LineWidth", Worksheet::convertToSceneUnits(ui.sbLineWid th->value(), Worksheet::Unit::Point) );
group.writeEntry("LineOpacity", ui.sbLineOpacity->value()/100.0); group.writeEntry("LineOpacity", ui.sbLineOpacity->value()/100.0);
//Drop Line //Drop Line
group.writeEntry("DropLineType", ui.cbDropLineType->currentIndex()); group.writeEntry("DropLineType", ui.cbDropLineType->currentIndex());
group.writeEntry("DropLineStyle", ui.cbDropLineStyle->currentIndex()); group.writeEntry("DropLineStyle", ui.cbDropLineStyle->currentIndex());
group.writeEntry("DropLineColor", ui.kcbDropLineColor->color()); group.writeEntry("DropLineColor", ui.kcbDropLineColor->color());
group.writeEntry("DropLineWidth", Worksheet::convertToSceneUnits(ui.sbDro pLineWidth->value(), Worksheet::Unit::Point) ); group.writeEntry("DropLineWidth", Worksheet::convertToSceneUnits(ui.sbDro pLineWidth->value(), Worksheet::Unit::Point) );
group.writeEntry("DropLineOpacity", ui.sbDropLineOpacity->value()/100.0); group.writeEntry("DropLineOpacity", ui.sbDropLineOpacity->value()/100.0);
//Symbol (TODO: character) //Symbol
group.writeEntry("SymbolStyle", ui.cbSymbolStyle->currentIndex()); group.writeEntry("SymbolStyle", ui.cbSymbolStyle->currentIndex());
group.writeEntry("SymbolSize", Worksheet::convertToSceneUnits(ui.sbSymbol Size->value(),Worksheet::Unit::Point)); group.writeEntry("SymbolSize", Worksheet::convertToSceneUnits(ui.sbSymbol Size->value(),Worksheet::Unit::Point));
group.writeEntry("SymbolRotation", ui.sbSymbolRotation->value()); group.writeEntry("SymbolRotation", ui.sbSymbolRotation->value());
group.writeEntry("SymbolOpacity", ui.sbSymbolOpacity->value()/100.0); group.writeEntry("SymbolOpacity", ui.sbSymbolOpacity->value()/100.0);
group.writeEntry("SymbolFillingStyle", ui.cbSymbolFillingStyle->currentIn dex()); group.writeEntry("SymbolFillingStyle", ui.cbSymbolFillingStyle->currentIn dex());
group.writeEntry("SymbolFillingColor", ui.kcbSymbolFillingColor->color()) ; group.writeEntry("SymbolFillingColor", ui.kcbSymbolFillingColor->color()) ;
group.writeEntry("SymbolBorderStyle", ui.cbSymbolBorderStyle->currentInde x()); group.writeEntry("SymbolBorderStyle", ui.cbSymbolBorderStyle->currentInde x());
group.writeEntry("SymbolBorderColor", ui.kcbSymbolBorderColor->color()); group.writeEntry("SymbolBorderColor", ui.kcbSymbolBorderColor->color());
group.writeEntry("SymbolBorderWidth", Worksheet::convertToSceneUnits(ui.s bSymbolBorderWidth->value(), Worksheet::Unit::Point)); group.writeEntry("SymbolBorderWidth", Worksheet::convertToSceneUnits(ui.s bSymbolBorderWidth->value(), Worksheet::Unit::Point));
 End of changes. 4 change blocks. 
7 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)