Neal Wilson 12 years ago
parent
commit
f494c962c7
1 changed files with 19 additions and 28 deletions
  1. 19
    28
      src/typica.w

+ 19
- 28
src/typica.w View File

8063
 		bool saveXML(QIODevice *device);
8063
 		bool saveXML(QIODevice *device);
8064
 		bool saveCSV(QIODevice *device);
8064
 		bool saveCSV(QIODevice *device);
8065
 		QString lastTime(int series);
8065
 		QString lastTime(int series);
8066
-		@[Q_INVOKABLE@,@, int displayUnits()@];@t\2\2@>@/
8066
+		@[Q_INVOKABLE@,@, Units::Unit displayUnits()@];@t\2\2@>@/
8067
 	@[public slots@]:@/
8067
 	@[public slots@]:@/
8068
 		void setVisible(bool visibility);
8068
 		void setVisible(bool visibility);
8069
 		void setHeaderData(int section, QString text);
8069
 		void setHeaderData(int section, QString text);
8081
 		void addOutputTemperatureColumn(int column);
8081
 		void addOutputTemperatureColumn(int column);
8082
 		void addOutputAnnotationColumn(int column);
8082
 		void addOutputAnnotationColumn(int column);
8083
 		void clearOutputColumns();
8083
 		void clearOutputColumns();
8084
-		void setDisplayUnits(int scale);
8084
+		void setDisplayUnits(Units::Unit scale);
8085
 		void addToCurrentColumnSet(int column);
8085
 		void addToCurrentColumnSet(int column);
8086
 		void clearCurrentColumnSet();@/
8086
 		void clearCurrentColumnSet();@/
8087
 	protected:@/
8087
 	protected:@/
8380
 @<ZoomLog Implementation@>=
8380
 @<ZoomLog Implementation@>=
8381
 bool ZoomLog::saveXML(QIODevice *device)
8381
 bool ZoomLog::saveXML(QIODevice *device)
8382
 {
8382
 {
8383
-	int prevUnits = model_ms->displayUnits();
8384
-	if(prevUnits != 10144)
8383
+	Units::Unit prevUnits = model_ms->displayUnits();
8384
+	if(prevUnits != Units::Fahrenheit)
8385
 	{
8385
 	{
8386
-		model_ms->setDisplayUnits(10144);
8386
+		model_ms->setDisplayUnits(Units::Fahrenheit);
8387
 	}
8387
 	}
8388
 	XMLOutput writer(model_ms, device, 0);
8388
 	XMLOutput writer(model_ms, device, 0);
8389
 	int c;
8389
 	int c;
8398
 		                                     toString(), c);
8398
 		                                     toString(), c);
8399
 	}
8399
 	}
8400
 	bool retval = writer.output();
8400
 	bool retval = writer.output();
8401
-	if(prevUnits != 10144)
8401
+	if(prevUnits != Units::Fahrenheit)
8402
 	{
8402
 	{
8403
 		model_ms->setDisplayUnits(prevUnits);
8403
 		model_ms->setDisplayUnits(prevUnits);
8404
 	}
8404
 	}
8481
 possible to obtain the currently selected unit.
8481
 possible to obtain the currently selected unit.
8482
 
8482
 
8483
 @<ZoomLog Implementation@>=
8483
 @<ZoomLog Implementation@>=
8484
-void ZoomLog::setDisplayUnits(int scale)
8484
+void ZoomLog::setDisplayUnits(Units::Unit scale)
8485
 {
8485
 {
8486
 	model_ms->setDisplayUnits(scale);
8486
 	model_ms->setDisplayUnits(scale);
8487
 	model_1s->setDisplayUnits(scale);
8487
 	model_1s->setDisplayUnits(scale);
8492
 	model_1m->setDisplayUnits(scale);
8492
 	model_1m->setDisplayUnits(scale);
8493
 }
8493
 }
8494
 
8494
 
8495
-int ZoomLog::displayUnits()
8495
+Units::Unit ZoomLog::displayUnits()
8496
 {
8496
 {
8497
 	return model_ms->displayUnits();
8497
 	return model_ms->displayUnits();
8498
 }
8498
 }
8747
 class MeasurementModel : public QAbstractItemModel@/
8747
 class MeasurementModel : public QAbstractItemModel@/
8748
 {@t\1@>@/
8748
 {@t\1@>@/
8749
 	Q_OBJECT@;
8749
 	Q_OBJECT@;
8750
-	Q_ENUMS(DisplayUnits);
8751
-	int unit;
8750
+	Units::Unit unit;
8752
 	QList<MeasurementList *> *entries;
8751
 	QList<MeasurementList *> *entries;
8753
 	QStringList *hData;
8752
 	QStringList *hData;
8754
 	int colcount;
8753
 	int colcount;
8755
 	QHash<int, int> *lastTemperature;
8754
 	QHash<int, int> *lastTemperature;
8756
 	QList<MeasurementList *>::iterator@, lastInsertion;
8755
 	QList<MeasurementList *>::iterator@, lastInsertion;
8757
 	public:@/
8756
 	public:@/
8758
-		enum DisplayUnits
8759
-		{
8760
-			Auto = -1,
8761
-			Fahrenheit = 10144,
8762
-			Celsius = 10143,
8763
-			Kelvin = 10325,
8764
-			Rankine = 10145
8765
-		};
8766
 		MeasurementModel(QObject *parent = NULL);
8757
 		MeasurementModel(QObject *parent = NULL);
8767
 		~MeasurementModel();
8758
 		~MeasurementModel();
8768
 		int rowCount(const QModelIndex &parent = QModelIndex()) const;
8759
 		int rowCount(const QModelIndex &parent = QModelIndex()) const;
8778
 		QModelIndex index(int row, int column,
8769
 		QModelIndex index(int row, int column,
8779
 							const QModelIndex &parent = QModelIndex()) const;
8770
 							const QModelIndex &parent = QModelIndex()) const;
8780
 		QModelIndex parent(const QModelIndex &index) const;
8771
 		QModelIndex parent(const QModelIndex &index) const;
8781
-		int displayUnits();@/
8772
+		Units::Unit displayUnits();@/
8782
 	@t\4@>public slots@t\kern-3pt@>:@/
8773
 	@t\4@>public slots@t\kern-3pt@>:@/
8783
 		void newMeasurement(Measurement measure, int tempcolumn);
8774
 		void newMeasurement(Measurement measure, int tempcolumn);
8784
 		void newAnnotation(QString annotation, int tempcolumn,
8775
 		void newAnnotation(QString annotation, int tempcolumn,
8785
 							int annotationColumn);
8776
 							int annotationColumn);
8786
 		void clear();
8777
 		void clear();
8787
-		void setDisplayUnits(int scale);
8778
+		void setDisplayUnits(Units::Unit scale);
8788
 	signals:@/
8779
 	signals:@/
8789
 		void rowChanged(int);@t\2@>@/
8780
 		void rowChanged(int);@t\2@>@/
8790
 }@t\kern-3pt@>;
8781
 }@t\kern-3pt@>;
9193
 
9184
 
9194
 @<MeasurementModel Implementation@>=
9185
 @<MeasurementModel Implementation@>=
9195
 MeasurementModel::MeasurementModel(QObject *parent) : QAbstractItemModel(parent),
9186
 MeasurementModel::MeasurementModel(QObject *parent) : QAbstractItemModel(parent),
9196
-	unit(Fahrenheit), hData(new QStringList),
9187
+	unit(Units::Fahrenheit), hData(new QStringList),
9197
 	lastTemperature(new QHash<int, int>)@/
9188
 	lastTemperature(new QHash<int, int>)@/
9198
 {
9189
 {
9199
 	colcount = 1;
9190
 	colcount = 1;
9284
 available to request a number identifyin the currently displayed units.
9275
 available to request a number identifyin the currently displayed units.
9285
 
9276
 
9286
 @<MeasurementModel Implementation@>=
9277
 @<MeasurementModel Implementation@>=
9287
-void MeasurementModel::setDisplayUnits(int scale)
9278
+void MeasurementModel::setDisplayUnits(Units::Unit scale)
9288
 {
9279
 {
9289
 	beginResetModel();
9280
 	beginResetModel();
9290
 	unit = scale;
9281
 	unit = scale;
9291
 	endResetModel();
9282
 	endResetModel();
9292
 }
9283
 }
9293
 
9284
 
9294
-int MeasurementModel::displayUnits()
9285
+Units::Unit MeasurementModel::displayUnits()
9295
 {
9286
 {
9296
 	return unit;
9287
 	return unit;
9297
 }
9288
 }
9336
 				}
9327
 				}
9337
 				switch(unit)
9328
 				switch(unit)
9338
 				{
9329
 				{
9339
-					case Auto:
9340
-					case Fahrenheit:
9330
+					case Units::Fahrenheit:
9341
 						return QVariant(row->at(index.column()).toString());
9331
 						return QVariant(row->at(index.column()).toString());
9342
 						break;
9332
 						break;
9343
-					case Celsius:
9333
+					case Units::Celsius:
9344
 						return QVariant((row->at(index.column()).toDouble() -
9334
 						return QVariant((row->at(index.column()).toDouble() -
9345
 						                32) * 5 / 9);
9335
 						                32) * 5 / 9);
9346
 						break;
9336
 						break;
9347
-					case Kelvin:
9337
+					case Units::Kelvin:
9348
 						return QVariant((row->at(index.column()).toDouble() +
9338
 						return QVariant((row->at(index.column()).toDouble() +
9349
 						                459.67) * 5 / 9);
9339
 						                459.67) * 5 / 9);
9350
 						break;
9340
 						break;
9351
-					case Rankine:
9341
+					case Units::Rankine:
9352
 						return QVariant(row->at(index.column()).toDouble() +
9342
 						return QVariant(row->at(index.column()).toDouble() +
9353
 						                459.67);
9343
 						                459.67);
9354
 						break;
9344
 						break;
9355
 					default:
9345
 					default:
9346
+						return QVariant(row->at(index.column()).toString());
9356
 						break;
9347
 						break;
9357
 				}
9348
 				}
9358
 			}
9349
 			}

Loading…
Cancel
Save