Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-visualization/qtiplot/files: qtiplot-0.9.7.14-system-2dplot.patch
Date: Mon, 05 Jul 2010 17:04:10
Message-Id: 20100705170408.108322CE14@corvid.gentoo.org
1 jlec 10/07/05 17:04:08
2
3 Added: qtiplot-0.9.7.14-system-2dplot.patch
4 Log:
5 Fix for bug 321547, upstream svn rev 1729
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-2dplot.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-2dplot.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.14-system-2dplot.patch?rev=1.1&content-type=text/plain
13
14 Index: qtiplot-0.9.7.14-system-2dplot.patch
15 ===================================================================
16 Index: qtiplot/src/plot2D/dialogs/PlotDialog.cpp
17 ===================================================================
18 --- qtiplot/src/plot2D/dialogs/PlotDialog.cpp (revision 1728)
19 +++ qtiplot/src/plot2D/dialogs/PlotDialog.cpp (revision 1729)
20 @@ -503,15 +503,19 @@
21 gl2->addWidget(new QLabel( tr("width= ")), 0, 0);
22 gl2->addWidget(boxPlotWidth, 0, 1);
23
24 - gl2->addWidget(new QLabel(tr("height= ")), 2, 0);
25 - gl2->addWidget(boxPlotHeight, 2, 1);
26 + gl2->addWidget(new QLabel(tr("height= ")), 1, 0);
27 + gl2->addWidget(boxPlotHeight, 1, 1);
28
29 keepPlotRatioBox = new QCheckBox(tr("Keep aspect ratio"));
30 keepPlotRatioBox->setChecked(app->d_keep_aspect_ration);
31 - gl2->addWidget(keepRatioBox, 3, 1);
32
33 - gl2->setRowStretch(4, 1);
34 + connect(keepPlotRatioBox, SIGNAL(clicked (bool)), keepRatioBox, SLOT(setChecked(bool)));
35 + connect(keepRatioBox, SIGNAL(clicked (bool)), keepPlotRatioBox, SLOT(setChecked(bool)));
36
37 + gl2->addWidget(keepPlotRatioBox, 2, 1);
38 +
39 + gl2->setRowStretch(3, 1);
40 +
41 QHBoxLayout *bl2 = new QHBoxLayout();
42 bl2->addWidget(gb1);
43 bl2->addWidget(gb2);
44 @@ -582,25 +586,25 @@
45 gl2->addWidget(new QLabel( tr("width= ")), 0, 0);
46 gl2->addWidget(boxLayerWidth, 0, 1);
47
48 - gl2->addWidget(new QLabel(tr("height= ")), 2, 0);
49 - gl2->addWidget(boxLayerHeight, 2, 1);
50 + gl2->addWidget(new QLabel(tr("height= ")), 1, 0);
51 + gl2->addWidget(boxLayerHeight, 1, 1);
52
53 keepRatioBox = new QCheckBox(tr("Keep aspect ratio"));
54 keepRatioBox->setChecked(app->d_keep_aspect_ration);
55 - gl2->addWidget(keepRatioBox, 3, 1);
56 + gl2->addWidget(keepRatioBox, 2, 1);
57
58 QLabel *l = new QLabel(tr("Apply &to..."));
59 - gl2->addWidget(l, 4, 0);
60 + gl2->addWidget(l, 3, 0);
61
62 sizeApplyToBox = new QComboBox();
63 sizeApplyToBox->insertItem(tr("Layer"));
64 sizeApplyToBox->insertItem(tr("Window"));
65 sizeApplyToBox->insertItem(tr("All Windows"));
66 - gl2->addWidget(sizeApplyToBox, 4, 1);
67 + gl2->addWidget(sizeApplyToBox, 3, 1);
68
69 l->setBuddy(sizeApplyToBox);
70
71 - gl2->setRowStretch(5, 1);
72 + gl2->setRowStretch(4, 1);
73
74 QBoxLayout *bl2 = new QBoxLayout (QBoxLayout::LeftToRight);
75 bl2->addWidget(gb1);
76 Index: qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp
77 ===================================================================
78 --- qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp (revision 1728)
79 +++ qtiplot/src/plot2D/dialogs/ImageExportDialog.cpp (revision 1729)
80 @@ -240,7 +240,7 @@
81 size_layout->addWidget(scaleFontsBox, 3, 1);
82
83 keepRatioBox = new QCheckBox(tr("&Keep aspect ratio"));
84 - keepRatioBox->setChecked(true);
85 + keepRatioBox->setChecked(app->d_keep_aspect_ration);
86 size_layout->addWidget(keepRatioBox, 4, 1);
87
88 vert_layout->addWidget(d_custom_size_box);
89 @@ -340,6 +340,7 @@
90
91 app->d_3D_export_text_mode = d_3D_text_export_mode->currentIndex();
92 app->d_3D_export_sort = d_3D_export_sort->currentIndex();
93 + app->d_keep_aspect_ration = keepRatioBox->isChecked();
94 }
95
96 e->accept();
97 Index: qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp
98 ===================================================================
99 --- qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp (revision 1728)
100 +++ qtiplot/src/plot2D/dialogs/EnrichmentDialog.cpp (revision 1729)
101 @@ -460,6 +460,7 @@
102 gl2->addWidget(heightBox, 1, 1);
103
104 keepAspectBox = new QCheckBox(tr("&Keep aspect ratio"));
105 + keepAspectBox->setChecked(app->d_keep_aspect_ration);
106 gl2->addWidget(keepAspectBox, 2, 1);
107
108 bestSizeButton = new QPushButton(tr("&Best size"));
109 @@ -646,6 +647,10 @@
110 FrameWidget *fw = qobject_cast<FrameWidget *>(d_widget);
111 if (fw)
112 fw->setAttachPolicy((FrameWidget::AttachPolicy)attachToBox->currentIndex());
113 +
114 + ApplicationWindow *app = (ApplicationWindow *)this->parent();
115 + if (app)
116 + app->d_keep_aspect_ration = keepAspectBox->isChecked();
117 } else if (patternPage && tabWidget->currentPage() == patternPage)
118 patternApplyTo();
119 else if (textPage && tabWidget->currentPage() == textPage){
120 Index: qtiplot/src/core/ConfigDialog.cpp
121 ===================================================================
122 --- qtiplot/src/core/ConfigDialog.cpp (revision 1728)
123 +++ qtiplot/src/core/ConfigDialog.cpp (revision 1729)
124 @@ -1023,7 +1023,7 @@
125 gl->addWidget(boxCanvasHeight, 2, 1);
126
127 keepRatioBox = new QCheckBox(tr("&Keep aspect ratio"));
128 - keepRatioBox->setChecked(true);
129 + keepRatioBox->setChecked(app->d_keep_aspect_ration);
130 gl->addWidget(keepRatioBox, 3, 1);
131
132 gl->setRowStretch(4, 1);
133 @@ -2097,6 +2097,7 @@
134 FrameWidget::Unit unit = (FrameWidget::Unit)unitBox->currentIndex();
135 app->d_layer_canvas_width = convertToPixels(boxCanvasWidth->value(), unit, 0);
136 app->d_layer_canvas_height = convertToPixels(boxCanvasHeight->value(), unit, 1);
137 + app->d_keep_aspect_ration = keepRatioBox->isChecked();
138 }
139
140 // 2D plots page: ticks tab
Report Message
Find on MARC Find on Google Groups