hskymon-2.9.2-20170517

chimari · May 18, 2017 · acc3d53 · acc3d53
1 parent ad953bc
commit acc3d53
Show file tree

Hide file tree

Showing 9 changed files with 573 additions and 56 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2017.05.17 ver2.9.2 - Added "Add" button in FCDB/Standard treeview panels
+	              to add a selected object into the object tree.
+	            - Added "File/Export to/OPE Def." and "Text List" in
+	              main menu to save the current object list into an OPE
+	              definition or a CSV text file.
+
 2017.05.16 ver2.9.1 - Added GSC 2.3/PanSTARRS-1/SDSS/USNO-B for database
 	              query in FC.
 	              These can be used for IRCS Tip-Tilt GS selection.

diff --git a/README b/README
@@ -3,7 +3,7 @@
 #                         Document file
 #
 #
-#                                  ver 2.9.1    2017/05/16
+#                                  ver 2.9.2    2017/05/17
 #                               Copyright (C) 2003-17 Akito Tajitsu
 #                                               tajitsu_at_naoj.org
 #########################################################################

diff --git a/README.jp b/README.jp
@@ -3,7 +3,7 @@
 #                         Document file
 #
 #
-#                                  ver 2.9.1     2017/05/16
+#                                  ver 2.9.2     2017/05/17
 #                               Copyright (C) 2003-17 Akito Tajitsu
 #                                               tajitsu_at_naoj.org
 #########################################################################

diff --git a/configure b/configure
@@ -2318,9 +2318,9 @@ PACKAGE=hskymon
 
 MAJOR_VERSION=2
 MINOR_VERSION=9
-MICRO_VERSION=1
+MICRO_VERSION=2
 BUILD_REVISION=0
-EXTRA_VERSION=-20170516
+EXTRA_VERSION=-20170517
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 ac_aux_dir=

diff --git a/configure.ac b/configure.ac
@@ -5,9 +5,9 @@ PACKAGE=hskymon
 dnl version number
 MAJOR_VERSION=2
 MINOR_VERSION=9
-MICRO_VERSION=1
+MICRO_VERSION=2
 BUILD_REVISION=0
-EXTRA_VERSION=-20170516
+EXTRA_VERSION=-20170517
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/fc.c b/fc.c
@@ -1907,11 +1907,22 @@ gboolean draw_fc_cairo(GtkWidget *widget, typHOE *hg){
       if(hg->dss_invert) cairo_set_source_rgba(cr, 0.6, 0.0, 0.0, 0.6);
       else cairo_set_source_rgba(cr, 1.0, 0.4, 0.4, 0.6);
 
-      cairo_set_line_width (cr, 1.5*scale);
-      cairo_arc(cr,0,0,
-		((gdouble)width_file*r)/(gdouble)hg->dss_arcmin_ip/2.*IRCS_TTGS_ARCMIN,
-		0,M_PI*2);
-      cairo_stroke(cr);
+      if(hg->dss_draw_slit){
+	cairo_set_line_width (cr, 1.5*scale);
+	cairo_arc(cr,0,0,
+		  ((gdouble)width_file*r)/(gdouble)hg->dss_arcmin_ip/2.*IRCS_TTGS_ARCMIN,
+		  0,M_PI*2);
+	cairo_stroke(cr);
+
+	cairo_set_font_size (cr, 9.0*scale);
+
+	sprintf(tmp,"Tip-Tilt Guide Star w/LGS (%darcmin)",IRCS_TTGS_ARCMIN/2);
+	cairo_text_extents (cr,tmp, &extents);
+	cairo_move_to(cr,
+		      -extents.width/2,
+		      -IRCS_TTGS_ARCMIN/2.*((gdouble)width_file*r/(gdouble)hg->dss_arcmin_ip)-5*scale);
+	cairo_show_text(cr, tmp);
+      }
 
       cairo_set_line_width (cr, 3.0*scale);
 
@@ -1934,15 +1945,6 @@ gboolean draw_fc_cairo(GtkWidget *widget, typHOE *hg){
 		    -((gdouble)height_file*r/(gdouble)hg->dss_arcmin_ip*IRCS_Y_ARCSEC/60.)/2.-5*scale);
       cairo_show_text(cr, tmp);
 
-      cairo_set_font_size (cr, 9.0*scale);
-
-      sprintf(tmp,"Tip-Tilt Guide Star w/LGS (%darcmin)",IRCS_TTGS_ARCMIN/2);
-      cairo_text_extents (cr,tmp, &extents);
-      cairo_move_to(cr,
-		    -extents.width/2,
-		    -IRCS_TTGS_ARCMIN/2.*((gdouble)width_file*r/(gdouble)hg->dss_arcmin_ip)-5*scale);
-      cairo_show_text(cr, tmp);
-
       break;