betere mtzfix...

git-svn-id: svn+ssh://gitlab/srv/svn-repos/pdb-redo/trunk@239 a1961a4f-ab94-4bcc-80e8-33b5a54de466

include/cif++/MapMaker.h

@@ -16,6 +16,7 @@ class MapMaker
 	typedef typename clipper::Xmap<ftype>				Xmap;
 	typedef typename clipper::Xmap<ftype>				Xmap;
 	typedef clipper::HKL_data<clipper::data32::F_phi>	FPdata;
 	typedef clipper::HKL_data<clipper::data32::F_phi>	FPdata;
 	typedef clipper::HKL_data<clipper::data32::F_sigF>	FOdata;
 	typedef clipper::HKL_data<clipper::data32::F_sigF>	FOdata;
+	typedef clipper::HKL_data<clipper::data32::Phi_fom>	WData;
 	
 	
 	
 	
 	typedef clipper::Spacegroup							Spacegroup;
 	typedef clipper::Spacegroup							Spacegroup;
@@ -58,7 +59,7 @@ class MapMaker
 
 
   private:
   private:
 
 
-	void fixMTZ(FPdata& fb, FPdata& fd, FOdata& fo, FPdata& fc);
+	void fixMTZ(FPdata& fb, FPdata& fd, FOdata& fo, FPdata& fc, WData& fom);
 
 
 	Xmap&		mFb;
 	Xmap&		mFb;
 	Xmap&		mFd;
 	Xmap&		mFd;

src/CifUtils.cpp

@@ -445,6 +445,18 @@ void ProgressImpl::Run()
 
 
 void ProgressImpl::PrintProgress()
 void ProgressImpl::PrintProgress()
 {
 {
+	const char* kBlocks[] = {
+		" ",				// 0
+		u8"\u258F",			// 1
+		u8"\u258E",			// 2
+		u8"\u258D",			// 3
+		u8"\u258C",			// 4
+		u8"\u258B",			// 5
+		u8"\u258A",			// 6
+		u8"\u2589",			// 7
+		u8"\u2588",			// 8
+	};
+
 	uint32 width = get_terminal_width();
 	uint32 width = get_terminal_width();
 	
 	
 	string msg;
 	string msg;
@@ -458,14 +470,27 @@ void ProgressImpl::PrintProgress()
 	else
 	else
 		msg = mMessage.substr(0, 17) + "...";
 		msg = mMessage.substr(0, 17) + "...";
 	
 	
-	msg += " [";
+	msg += " |";
 	
 	
 	float progress = static_cast<float>(mConsumed) / mMax;
 	float progress = static_cast<float>(mConsumed) / mMax;
-	int tw = width - 28;
-	int twd = static_cast<int>(tw * progress + 0.5f);
-	msg.append(twd, '=');
-	msg.append(tw - twd, ' ');
-	msg.append("] ");
+	int pi = static_cast<int>(ceil(progress * 33 * 8));
+//	int tw = width - 28;
+//	int twd = static_cast<int>(tw * progress + 0.5f);
+//	msg.append(twd, '=');
+//	msg.append(tw - twd, ' ');
+
+	for (int i = 0; i < 33; ++i)
+	{
+		if (pi <= 0)
+			msg += kBlocks[0];
+		else if (pi >= 8)
+			msg += kBlocks[8];
+		else
+			msg += kBlocks[pi];
+		pi -= 8;
+	}
+
+	msg.append("| ");
 	
 	
 	int perc = static_cast<int>(100 * progress);
 	int perc = static_cast<int>(100 * progress);
 	if (perc < 100)
 	if (perc < 100)