Репозиторий Sisyphus
Последнее обновление: 16 февраля 2019 | Пакетов: 18494 | Посещений: 13026730
en ru br
Репозитории ALT
S:0.9.8.9-alt8.svn20120124
5.1: 0.9.7.10-alt1.svn20091021.1
4.1: 0.9.2-alt1.1
4.0: 0.8.9-alt2
3.0: 0.5.8.3-alt1
www.altlinux.org/Changes

Группа :: Науки/Прочее
Пакет: qtiplot

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: qtiplot-0.9.8.9-alt-gcc6_indents.patch
Скачать


diff --git a/qtiplot/src/analysis/dialogs/FitDialog.cpp b/qtiplot/src/analysis/dialogs/FitDialog.cpp
index bce3223..c6d7e36 100755
--- a/qtiplot/src/analysis/dialogs/FitDialog.cpp
+++ b/qtiplot/src/analysis/dialogs/FitDialog.cpp
@@ -893,8 +893,8 @@ void FitDialog::saveUserFunction()
 	if (lst.contains(name)){
 		int index = lst.indexOf(name);
 		d_current_fit = (NonLinearFit *)d_user_functions[index];
-        if (d_current_fit->setFormula(formula))
-        	d_current_fit->save(d_current_fit->fileName());
+		if (d_current_fit->setFormula(formula))
+			d_current_fit->save(d_current_fit->fileName());
 
 		if (funcBox->currentItem()->text() == name)
 			showExpression(index);
@@ -939,13 +939,13 @@ void FitDialog::saveUserFunction()
 
 void FitDialog::removeUserFunction()
 {
-    QStringList lst = userFunctionNames();
-    if (lst.isEmpty())
-        return;
+	QStringList lst = userFunctionNames();
+	if (lst.isEmpty())
+		return;
 
-    QString s = tr("Are you sure you want to remove fit model file:\n %1 ?").arg(d_current_fit->fileName());
-    if (QMessageBox::Yes != QMessageBox::question (this, tr("QtiPlot") + " - " + tr("Remove Fit Model"), s, QMessageBox::Yes, QMessageBox::Cancel))
-        return;
+	QString s = tr("Are you sure you want to remove fit model file:\n %1 ?").arg(d_current_fit->fileName());
+	if (QMessageBox::Yes != QMessageBox::question (this, tr("QtiPlot") + " - " + tr("Remove Fit Model"), s, QMessageBox::Yes, QMessageBox::Cancel))
+		return;
 
 	QString name = funcBox->currentItem()->text();
 	if (lst.contains(name)){
@@ -1058,8 +1058,8 @@ void FitDialog::showFitPage()
 		boxParams->setItem(i, 5, it);
 	}
 
-    for (int i = 0; i<parameters; i++)
-        boxParams->item (i, 0)->setText(paramList[i]);
+	for (int i = 0; i<parameters; i++)
+		boxParams->item (i, 0)->setText(paramList[i]);
 
 	if (d_current_fit->type() == Fit::User){
         boxParams->showColumn(4);
@@ -1281,8 +1281,8 @@ void FitDialog::setCurrentFit(int function)
 
 void FitDialog::showExpression(int function)
 {
-    if (function < 0)
-        return;
+	if (function < 0)
+		return;
 
 	setCurrentFit(function);
 	if (!d_current_fit)
@@ -1725,8 +1725,8 @@ QStringList FitDialog::userFunctionNames()
 
 void FitDialog::saveInitialGuesses()
 {
-    if (!d_current_fit)
-        return;
+	if (!d_current_fit)
+		return;
 
 	ApplicationWindow *app = (ApplicationWindow *)this->parent();
 	QFileInfo fi(app->fitModelsPath);
@@ -1734,22 +1734,22 @@ void FitDialog::saveInitialGuesses()
 		chooseFitModelsFolder();
 
 	int rows = boxParams->rowCount();
-    for (int i=0; i<rows; i++)
-        d_current_fit->setInitialGuess(i, ((DoubleSpinBox*)boxParams->cellWidget(i, 2))->value());
+	for (int i=0; i<rows; i++)
+		d_current_fit->setInitialGuess(i, ((DoubleSpinBox*)boxParams->cellWidget(i, 2))->value());
 
-    QString fileName = d_current_fit->fileName();
-    if (!fileName.isEmpty())
-        d_current_fit->save(fileName);
-    else {
+	QString fileName = d_current_fit->fileName();
+	if (!fileName.isEmpty())
+		d_current_fit->save(fileName);
+	else {
 		QString filter = tr("QtiPlot fit model") + " (*.fit);;";
 		filter += tr("All files") + " (*.*)";
 		QString fn = ApplicationWindow::getFileName(app, tr("QtiPlot") + " - " + tr("Save Fit Model As"),
 								app->fitModelsPath + "/" + d_current_fit->objectName(), filter, 0, true, app->d_confirm_overwrite);
 		if (!fn.isEmpty()){
-            QFileInfo fi(fn);
-            QString baseName = fi.fileName();
-            if (!baseName.contains("."))
-                fn.append(".fit");
+			QFileInfo fi(fn);
+			QString baseName = fi.fileName();
+			if (!baseName.contains("."))
+				fn.append(".fit");
 
 			QString name = boxName->text();
 			bool rename = (qobject_cast<NonLinearFit*>(d_current_fit) && !name.isEmpty() && d_current_fit->objectName() != name);
diff --git a/qtiplot/src/core/ConfigDialog.cpp b/qtiplot/src/core/ConfigDialog.cpp
index d9db254..307f338 100755
--- a/qtiplot/src/core/ConfigDialog.cpp
+++ b/qtiplot/src/core/ConfigDialog.cpp
@@ -2115,13 +2115,13 @@ void ConfigDialog::languageChange()
 	boxThousandsSeparator->setText(tr("Omit &Thousands Separator"));
 	boxMuParserCLocale->setText(tr("mu&Parser uses C locale settings"));
 
-    QLocale locale = app->locale();
-    if (locale.name() == QLocale::c().name())
-        boxDecimalSeparator->setCurrentIndex(1);
-    else if (locale.name() == QLocale(QLocale::German).name())
-        boxDecimalSeparator->setCurrentIndex(2);
-    else if (locale.name() == QLocale(QLocale::French).name())
-        boxDecimalSeparator->setCurrentIndex(3);
+	QLocale locale = app->locale();
+	if (locale.name() == QLocale::c().name())
+		boxDecimalSeparator->setCurrentIndex(1);
+	else if (locale.name() == QLocale(QLocale::German).name())
+		boxDecimalSeparator->setCurrentIndex(2);
+	else if (locale.name() == QLocale(QLocale::French).name())
+		boxDecimalSeparator->setCurrentIndex(3);
 
 	lblClipboardSeparator->setText(tr("Clipboard Decimal Separators"));
 	boxClipboardLocale->clear();
@@ -2130,12 +2130,12 @@ void ConfigDialog::languageChange()
 	boxClipboardLocale->addItem("1.000,0");
 	boxClipboardLocale->addItem("1 000,0");
 
-    if (app->clipboardLocale().name() == QLocale::c().name())
-        boxClipboardLocale->setCurrentIndex(1);
-    else if (app->clipboardLocale().name() == QLocale(QLocale::German).name())
-        boxClipboardLocale->setCurrentIndex(2);
-    else if (app->clipboardLocale().name() == QLocale(QLocale::French).name())
-        boxClipboardLocale->setCurrentIndex(3);
+	if (app->clipboardLocale().name() == QLocale::c().name())
+		boxClipboardLocale->setCurrentIndex(1);
+	else if (app->clipboardLocale().name() == QLocale(QLocale::German).name())
+		boxClipboardLocale->setCurrentIndex(2);
+	else if (app->clipboardLocale().name() == QLocale(QLocale::French).name())
+		boxClipboardLocale->setCurrentIndex(3);
 
 	lblTranslationsPath->setText("<a href=\"http://soft.proindependent.com/translations.html\">" + tr("Translations") + "</a>");
 	lblHelpPath->setText("<a href=\"http://soft.proindependent.com/manuals.html\">" + tr("Help") + "</a>");
diff --git a/qtiplot/src/plot2D/dialogs/PlotDialog.cpp b/qtiplot/src/plot2D/dialogs/PlotDialog.cpp
index 45e58d0..73bca25 100755
--- a/qtiplot/src/plot2D/dialogs/PlotDialog.cpp
+++ b/qtiplot/src/plot2D/dialogs/PlotDialog.cpp
@@ -213,8 +213,8 @@ void PlotDialog::showAll(bool all)
 		listBox->setFocus();
 
 		QTreeWidgetItem *item = listBox->currentItem();
-    	if (item->type() == CurveTreeItem::PlotCurveTreeItem)
-        	curvePlotTypeBox->show();
+		if (item->type() == CurveTreeItem::PlotCurveTreeItem)
+			curvePlotTypeBox->show();
 
 		btnMore->setText("&>>");
 	} else {
@@ -251,10 +251,10 @@ void PlotDialog::editCurve()
 	ApplicationWindow *app = (ApplicationWindow *)this->parent();
 
 	CurveTreeItem *item = (CurveTreeItem *)listBox->currentItem();
-    if (!item)
-        return;
-    if (item->type() != CurveTreeItem::PlotCurveTreeItem)
-        return;
+	if (!item)
+		return;
+	if (item->type() != CurveTreeItem::PlotCurveTreeItem)
+		return;
 
 	int index = item->plotItemIndex();
 	int curveType = ((PlotCurve *)item->plotItem())->type();
@@ -300,17 +300,17 @@ void PlotDialog::plotAssociationsDialogClosed()
 
 void PlotDialog::changePlotType(int plotType)
 {
-    if (boxPlotType->count() == 1)
+	if (boxPlotType->count() == 1)
 		return;
 
-    CurveTreeItem *item = (CurveTreeItem *)listBox->currentItem();
-    if (!item)
-        return;
-    if (item->type() != CurveTreeItem::PlotCurveTreeItem)
-        return;
-    Graph *graph = item->graph();
-    if (!graph)
-        return;
+	CurveTreeItem *item = (CurveTreeItem *)listBox->currentItem();
+	if (!item)
+		return;
+	if (item->type() != CurveTreeItem::PlotCurveTreeItem)
+		return;
+	Graph *graph = item->graph();
+	if (!graph)
+		return;
 
 	int curveType = item->plotItemStyle();
 	if (curveType == Graph::ColorMap || curveType == Graph::Contour || curveType == Graph::GrayScale)
@@ -2206,8 +2206,8 @@ void PlotDialog::selectCurve(int index)
 	LayerItem *layerItem = (LayerItem *)listBox->currentItem();
 	if (!layerItem)
         return;
-    if (layerItem->type() != LayerItem::LayerTreeItem)
-        return;
+	if (layerItem->type() != LayerItem::LayerTreeItem)
+		return;
 	QTreeWidgetItem *item = layerItem->child(index);
 	if (item){
 		listBox->scrollToItem(item);
@@ -2261,9 +2261,9 @@ void PlotDialog::showStatistics()
     if (!plotItem)
         return;
 
-	QwtHistogram *h = (QwtHistogram *)plotItem;
-	if (!h)
-		return;
+    QwtHistogram *h = (QwtHistogram *)plotItem;
+    if (!h)
+        return;
 
     QString tableName = app->generateUniqueName(tr("Bins"));
     Table *t = app->newTable(h->dataSize(), 4, tableName, tr("Histogram and Probabilities for") + " " + h->title().text());
@@ -2484,7 +2484,7 @@ void PlotDialog::pickErrorBarsColor()
     if (!graph)
         return;
 
-	graph->updateErrorBars((ErrorBarsCurve *)item->plotItem(), xBox->isChecked(), widthBox->value(),
+    graph->updateErrorBars((ErrorBarsCurve *)item->plotItem(), xBox->isChecked(), widthBox->value(),
 			capBox->currentText().toInt(), colorBox->color(), plusBox->isChecked(), minusBox->isChecked(),
 			throughBox->isChecked());
 }
@@ -2645,8 +2645,8 @@ void PlotDialog::insertTabs(int plot_type)
   	}
 
   	QTreeWidgetItem *item = listBox->currentItem();
-    if (!item || item->type() != CurveTreeItem::PlotCurveTreeItem)
-        return;
+	if (!item || item->type() != CurveTreeItem::PlotCurveTreeItem)
+		return;
 
 	PlotCurve *fc = (PlotCurve *)((CurveTreeItem *)item)->plotItem();
 	if (fc->type() == Graph::Function){
@@ -2717,11 +2717,11 @@ void PlotDialog::showWorksheet()
 	if (!app)
 		return;
 
-    CurveTreeItem *item = (CurveTreeItem *)listBox->currentItem();
-    if (!item)
-        return;
-    if (item->type() != CurveTreeItem::PlotCurveTreeItem)
-        return;
+	CurveTreeItem *item = (CurveTreeItem *)listBox->currentItem();
+	if (!item)
+		return;
+	if (item->type() != CurveTreeItem::PlotCurveTreeItem)
+		return;
 
 	app->showCurveWorksheet(item->graph(), item->plotItemIndex());
 	close();
@@ -2787,7 +2787,7 @@ void PlotDialog::setActiveLayer(LayerItem *item)
     if (!g)
         return;
 
-	curvePlotTypeBox->hide();
+    curvePlotTypeBox->hide();
     btnWorksheet->hide();
     btnEditCurve->hide();
 	btnEditCurveRange->hide();
@@ -3739,18 +3739,18 @@ bool PlotDialog::acceptParams()
 		return true;
 	}
 
-    QTreeWidgetItem *it = listBox->currentItem();
-    if (!it)
-        return false;
+	QTreeWidgetItem *it = listBox->currentItem();
+	if (!it)
+		return false;
 
-    CurveTreeItem *item = (CurveTreeItem *)it;
-    QwtPlotItem *plotItem = (QwtPlotItem *)item->plotItem();
-    if (!plotItem)
-        return false;
+	CurveTreeItem *item = (CurveTreeItem *)it;
+	QwtPlotItem *plotItem = (QwtPlotItem *)item->plotItem();
+	if (!plotItem)
+		return false;
 
-    Graph *graph = item->graph();
-    if (!graph)
-        return false;
+	Graph *graph = item->graph();
+	if (!graph)
+		return false;
 
 	if (privateTabWidget->currentPage() == axesPage){
 		plotItem->setAxis(boxXAxis->currentIndex() + 2, boxYAxis->currentIndex());
@@ -3760,8 +3760,8 @@ bool PlotDialog::acceptParams()
 		return true;
 	} else if (privateTabWidget->currentPage() == spectroValuesPage){
   		Spectrogram *sp = (Spectrogram *)plotItem;
-  	    if (!sp || sp->rtti() != QwtPlotItem::Rtti_PlotSpectrogram)
-  	    	return false;
+		if (!sp || sp->rtti() != QwtPlotItem::Rtti_PlotSpectrogram)
+			return false;
 
 		ApplicationWindow *app = (ApplicationWindow *)this->parent();
 		Matrix *m = app->matrix(boxSpectroMatrix->currentText());
@@ -3771,9 +3771,9 @@ bool PlotDialog::acceptParams()
 			boxUseMatrixFormula->setChecked(false);
 		updateContourLevelsDisplay(sp);
   	} else if (privateTabWidget->currentPage() == spectrogramPage){
-  		Spectrogram *sp = (Spectrogram *)plotItem;
-  	    if (!sp || sp->rtti() != QwtPlotItem::Rtti_PlotSpectrogram)
-  	    	return false;
+           Spectrogram *sp = (Spectrogram *)plotItem;
+           if (!sp || sp->rtti() != QwtPlotItem::Rtti_PlotSpectrogram)
+               return false;
 
   	   sp->setDisplayMode(QwtPlotSpectrogram::ImageMode, imageGroupBox->isChecked());
 
@@ -3793,7 +3793,7 @@ bool PlotDialog::acceptParams()
 	   boxXAxis->setCurrentIndex(sp->xAxis() - 2);
 	   boxYAxis->setCurrentIndex(sp->yAxis());
   	} else if (privateTabWidget->currentPage() == contourLinesPage){
-  		Spectrogram *sp = (Spectrogram *)plotItem;
+            Spectrogram *sp = (Spectrogram *)plotItem;
   	    if (!sp || sp->rtti() != QwtPlotItem::Rtti_PlotSpectrogram)
   	    	return false;
 
@@ -4489,13 +4489,13 @@ void PlotDialog::showAllLabelControls(bool show, int curveType)
 void PlotDialog::setEquidistantLevels()
 {
 	QTreeWidgetItem *it = listBox->currentItem();
-    if (!it)
-        return;
+	if (!it)
+		return;
 
 	CurveTreeItem *item = (CurveTreeItem *)it;
-    QwtPlotItem *plotItem = (QwtPlotItem *)item->plotItem();
-    if (!plotItem)
-        return;
+	QwtPlotItem *plotItem = (QwtPlotItem *)item->plotItem();
+	if (!plotItem)
+		return;
 
 	Spectrogram *sp = (Spectrogram *)plotItem;
 	if (!sp || sp->rtti() != QwtPlotItem::Rtti_PlotSpectrogram)
@@ -5012,8 +5012,8 @@ QRect PlotDialog::layerCanvasRect(QWidget *widget, double x, double y, double w,
     if (!widget)
         return QRect(qRound(x), qRound(y), qRound(w), qRound(h));
 
-	int dpiX = widget->logicalDpiX();
-	int dpiY = widget->logicalDpiY();
+    int dpiX = widget->logicalDpiX();
+    int dpiY = widget->logicalDpiY();
 
     switch(unit){
 		case FrameWidget::Pixel:
@@ -5033,7 +5033,7 @@ QRect PlotDialog::layerCanvasRect(QWidget *widget, double x, double y, double w,
 			return QRect(qRound(x*dpiX/72.0), qRound(y*dpiY/72.0), qRound(w*dpiX/72.0), qRound(h*dpiY/72.0));
 		break;
 	}
-	return QRect(qRound(x), qRound(y), qRound(w), qRound(h));
+    return QRect(qRound(x), qRound(y), qRound(w), qRound(h));
 }
 
 void PlotDialog::raiseCurve()
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin