1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
|
diff -urN lprof-1.09.orig/ICCtoIT8/Makefile lprof-1.09/ICCtoIT8/Makefile
--- lprof-1.09.orig/ICCtoIT8/Makefile 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/ICCtoIT8/Makefile 2003-12-08 18:27:21.000000000 -0500
@@ -1,6 +1,6 @@
SHELL = /bin/sh
-CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include -I/usr/include -I/usr/local/include
+CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include -I../../lcms-1.09/include -I/usr/include -I/usr/local/include
BASEDIR = $(DESTDIR)/usr
BINDIR = ..
diff -urN lprof-1.09.orig/Makefile lprof-1.09/Makefile
--- lprof-1.09.orig/Makefile 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/Makefile 2003-12-08 18:27:21.000000000 -0500
@@ -1,17 +1,17 @@
SHELL = /bin/sh
init: FORCE
- @$(MAKE) -s all
+ @$(MAKE) all
all install clean test::
@echo "little cms profiler construction set 1.09 being made $@."
@echo "please wait ..."
- cd src ; $(MAKE) $@ ; cd ..
- cd ICCtoIT8 ; $(MAKE) $@ ; cd ..
- cd qt/qtMeasurementTool; $(MAKE) $@ ; cd ../..
- cd qt/qtMonitorProfiler; $(MAKE) $@ ; cd ../..
- cd qt/qtScannerProfiler; $(MAKE) $@ ; cd ../..
- cd qt/qtProfileChecker; $(MAKE) $@ ; cd ../..
+ ( cd src ; $(MAKE) )
+ ( cd ICCtoIT8 ; $(MAKE) )
+ ( cd qt/qtMeasurementTool; $(MAKE) $@ )
+ ( cd qt/qtMonitorProfiler; $(MAKE) $@ )
+ ( cd qt/qtScannerProfiler; $(MAKE) $@ )
+ ( cd qt/qtProfileChecker; $(MAKE) $@ )
FORCE:
diff -urN lprof-1.09.orig/qt/qtMeasurementTool/makefile lprof-1.09/qt/qtMeasurementTool/makefile
--- lprof-1.09.orig/qt/qtMeasurementTool/makefile 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/qt/qtMeasurementTool/makefile 2003-12-08 18:27:21.000000000 -0500
@@ -17,8 +17,8 @@
endif
# some settings
-INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
-LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)
+INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
+LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
CFLAGS = -O4 -Wall $(KDEFLAGS)
POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
diff -urN lprof-1.09.orig/qt/qtMeasurementTool/qtmeasurementtooldialog.cpp lprof-1.09/qt/qtMeasurementTool/qtmeasurementtooldialog.cpp
--- lprof-1.09.orig/qt/qtMeasurementTool/qtmeasurementtooldialog.cpp 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/qt/qtMeasurementTool/qtmeasurementtooldialog.cpp 2003-12-08 18:27:21.000000000 -0500
@@ -39,6 +39,7 @@
#include "qtlcmswidgets.h"
#include "qtmeasurementtooldialog.h"
+
#ifdef USE_KDE
#include <kfiledialog.h>
#endif
@@ -402,6 +403,7 @@
{
QCanvasView::resizeEvent( e );
canvas()->resize(width()-4,height()-4);
+ MeasurementDialog.Reload();
}
void FigureEditor::contentsMousePressEvent(QMouseEvent* e)
@@ -429,14 +431,16 @@
}
else
+#if 0
if (e -> button() & Qt::RightButton) {
-
+#else
+ if (e -> state() & Qt::ShiftButton) {
+#endif
sizing = (GridItem*) *it;
contentsMouseMoveEvent(e);
}
else
if (e -> button() & Qt::LeftButton) {
-
moving = (GridItem*) *it;
moving_start = e->pos();
}
@@ -450,6 +454,7 @@
void FigureEditor::contentsMouseMoveEvent(QMouseEvent* e)
{
+
if ( moving ) {
moving->moveBy(e->pos().x() - moving_start.x(),
@@ -529,7 +534,7 @@
Canvas = new QCanvas(w-4, h-4);
Canvas -> setAdvancePeriod(30);
- FigEditor = new FigureEditor(*Canvas, CanvasFrame);
+ FigEditor = new FigureEditor(*this, *Canvas, CanvasFrame);
FigEditor -> clear();
// FigEditor-> resize(w, h);
CanvasFrameLayout->addWidget(FigEditor);
@@ -839,6 +844,14 @@
}
+void qtMeasurementToolDialog::Reload()
+{
+ TheImage -> Reload(fn, MonitorProfileSelector ->getFilename(),
+ InputProfileSelector->getFilename(),
+ Canvas);
+}
+
+
// ------------------------------------------------------------------------------ Slots
@@ -910,7 +923,7 @@
} else
{
- Status->setText("Click & drag mouse to place the grid: Left - Move, Right - Size, Ctrl - UnShear. PICK when finished.");
+ Status->setText("Click & drag mouse to place the grid: Left - Move, Shift - Size, Ctrl - UnShear. PICK when finished.");
PickBtn->show();
ProofToggle -> show();
}
diff -urN lprof-1.09.orig/qt/qtMeasurementTool/qtmeasurementtooldialog.h lprof-1.09/qt/qtMeasurementTool/qtmeasurementtooldialog.h
--- lprof-1.09.orig/qt/qtMeasurementTool/qtmeasurementtooldialog.h 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/qt/qtMeasurementTool/qtmeasurementtooldialog.h 2003-12-08 18:27:21.000000000 -0500
@@ -148,6 +148,7 @@
};
+class qtMeasurementToolDialog;
// This class implements a visual dragger for pick templates
@@ -157,7 +158,7 @@
public:
- FigureEditor(QCanvas& c, QWidget* parent=0, const char* name=0, WFlags f=0) : QCanvasView(&c,parent,name,f) {}
+ FigureEditor(qtMeasurementToolDialog &measurement_dialog, QCanvas& c, QWidget* parent=0, const char* name=0, WFlags f=0) : QCanvasView(&c,parent,name,f), MeasurementDialog(measurement_dialog) {}
void clear();
void resizeEvent( QResizeEvent* e );
protected:
@@ -174,7 +175,7 @@
GridItem* sizing;
GridItem* unshearing;
QPoint moving_start;
-
+ qtMeasurementToolDialog &MeasurementDialog;
};
@@ -201,8 +202,7 @@
BOOL LoadConfig();
void SaveConfig();
-
-
+ void Reload();
public slots:
diff -urN lprof-1.09.orig/qt/qtMeasurementTool/qtmeasurementtooldialogbase.ui lprof-1.09/qt/qtMeasurementTool/qtmeasurementtooldialogbase.ui
--- lprof-1.09.orig/qt/qtMeasurementTool/qtmeasurementtooldialogbase.ui 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/qt/qtMeasurementTool/qtmeasurementtooldialogbase.ui 2003-12-08 18:27:21.000000000 -0500
@@ -1674,7 +1674,7 @@
</property>
<property>
<name>FileMask</name>
- <string>*.itx</string>
+ <string>*.itx;*.ITX</string>
</property>
<property>
<name>Prompt</name>
@@ -1861,7 +1861,7 @@
</property>
<property>
<name>FileMask</name>
- <string>*.icc; *.icm</string>
+ <string>*.icc; *.icm; *.ICC; *.ICM</string>
</property>
<property>
<name>Prompt</name>
@@ -1925,7 +1925,7 @@
</property>
<property>
<name>FileMask</name>
- <string>*.icc;*.icm</string>
+ <string>*.icc;*.icm;*.ICC;*.ICM</string>
</property>
<property>
<name>Prompt</name>
diff -urN lprof-1.09.orig/qt/qtMonitorProfiler/Makefile lprof-1.09/qt/qtMonitorProfiler/Makefile
--- lprof-1.09.orig/qt/qtMonitorProfiler/Makefile 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/qt/qtMonitorProfiler/Makefile 2003-12-08 18:27:21.000000000 -0500
@@ -18,8 +18,8 @@
# some settings
-INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
-LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)
+INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
+LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
CFLAGS = -O4 -Wall $(KDEFLAGS)
POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
BINDIR = ../../
diff -urN lprof-1.09.orig/qt/qtMonitorProfiler/qtmonitorprofilerdialogbase.ui lprof-1.09/qt/qtMonitorProfiler/qtmonitorprofilerdialogbase.ui
--- lprof-1.09.orig/qt/qtMonitorProfiler/qtmonitorprofilerdialogbase.ui 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/qt/qtMonitorProfiler/qtmonitorprofilerdialogbase.ui 2003-12-08 18:27:21.000000000 -0500
@@ -1261,7 +1261,7 @@
</property>
<property>
<name>FileMask</name>
- <string>IT8/CGATS.5 files (*.it? *.cgs);;All files (*.*)</string>
+ <string>IT8/CGATS.5 files (*.it? *.cgs *.IT? *.CGS);;All files (*.*)</string>
</property>
<property>
<name>Prompt</name>
@@ -1353,7 +1353,7 @@
</property>
<property>
<name>FileMask</name>
- <string>icc profiles (*.icc *.icm);;All files (*.*)</string>
+ <string>icc profiles (*.icc *.icm *.ICC *.ICM);;All files (*.*)</string>
</property>
<property>
<name>Prompt</name>
diff -urN lprof-1.09.orig/qt/qtProfileChecker/makefile lprof-1.09/qt/qtProfileChecker/makefile
--- lprof-1.09.orig/qt/qtProfileChecker/makefile 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/qt/qtProfileChecker/makefile 2003-12-08 18:27:21.000000000 -0500
@@ -18,8 +18,9 @@
# some settings
-INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
-LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)
+INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
+LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
+
CFLAGS = -O4 -Wall $(KDEFLAGS)
POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
BINDIR = ../../
diff -urN lprof-1.09.orig/qt/qtProfileChecker/qtprofilecheckerdialogbase.ui lprof-1.09/qt/qtProfileChecker/qtprofilecheckerdialogbase.ui
--- lprof-1.09.orig/qt/qtProfileChecker/qtprofilecheckerdialogbase.ui 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/qt/qtProfileChecker/qtprofilecheckerdialogbase.ui 2003-12-08 18:27:21.000000000 -0500
@@ -1432,7 +1432,7 @@
</property>
<property>
<name>FileMask</name>
- <string>*.icm;*.icc;*.pf</string>
+ <string>*.icm;*.icc;*.pf;*.ICM;*.ICC;*.PF</string>
</property>
<property>
<name>Prompt</name>
diff -urN lprof-1.09.orig/qt/qtScannerProfiler/Makefile lprof-1.09/qt/qtScannerProfiler/Makefile
--- lprof-1.09.orig/qt/qtScannerProfiler/Makefile 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/qt/qtScannerProfiler/Makefile 2003-12-08 18:27:21.000000000 -0500
@@ -18,8 +18,8 @@
# some settings
-INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
-LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)
+INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
+LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
CFLAGS = -O4 -Wall $(KDEFLAGS)
POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
BINDIR = ../../
diff -urN lprof-1.09.orig/src/makefile lprof-1.09/src/makefile
--- lprof-1.09.orig/src/makefile 2003-12-08 18:25:03.000000000 -0500
+++ lprof-1.09/src/makefile 2003-12-08 18:27:21.000000000 -0500
@@ -1,6 +1,6 @@
SHELL = /bin/sh
-CFLAGS = -g -O4 -I../include -fomit-frame-pointer -Wall
+CFLAGS = -g -O4 -I../include -I../../lcms-1.09/include -fomit-frame-pointer -Wall
BASEDIR = $(DESTDIR)/usr
BINDIR = $(BASEDIR)/bin
LIBDIR = $(BASEDIR)/lib
|
GitWeb