diff --git a/hp4194/cv.py b/hp4194/cv.py index 1ee68e67edfd72b65081bf8574a336e278dfaeed..6faec70a52eba27f18156411ae3499992e3ad88e 100644 --- a/hp4194/cv.py +++ b/hp4194/cv.py @@ -1,3 +1,6 @@ +import matplotlib +matplotlib.use('TkAgg',force = True) + from interface import * import control from help import * @@ -114,7 +117,7 @@ def on_measure_clicked(b): f_index = messparameter_dict['f_point'].value-1 # create the figure - fig = plt.figure(figsize=(15,9),layout = "constrained") + fig = plt.figure(figsize=(12,10),layout = "constrained") spec = fig.add_gridspec(ncols=3, nrows=2) ax1 = fig.add_subplot(spec[0,0]) @@ -157,9 +160,13 @@ def on_measure_clicked(b): ax6.set_ylabel("Cp (F)") ax6_twin.set_ylabel("D") - + """figManager = plt.get_current_fig_manager() + figManager.window.state('zoomed') + win = plt.gcf().canvas.manager.window + win.overrideredirect(1)""" + + view["v-point"].value =str(biases[messparameter_dict["v_point"].value-1]) for i,bias in enumerate(biases): - clear_output(wait = True) view["v-value"].value = str(bias) # voltage index @@ -180,7 +187,7 @@ def on_measure_clicked(b): B = np.array(device.read_register('reg_B')) B_values.extend(B) - + view["f-point"].value = str(freq[messparameter_dict["f_point"].value-1]) time.sleep(messparameter_dict["sleep"].value) #do the calculations @@ -226,7 +233,7 @@ def on_measure_clicked(b): # do the plots # first the live ones - if i>1: + if i>0: curve1.pop(0).remove() curve1_twin.pop(0).remove() curve2.pop(0).remove() @@ -280,8 +287,14 @@ def on_measure_clicked(b): ax6_twin.scatter(freq,D, color = 'y') ax6_twin.tick_params(axis='y',labelcolor = 'y') - display(fig) + wm = plt.get_current_fig_manager() + wm.window.state('zoomed') + win = plt.gcf().canvas.manager.window + win.overrideredirect(1) # draws a completely frameless window + + plt.pause(0.1) + if messparameter_dict["hysterisis"].value == True: reversed_biases = reversed_array(biases) for bias in reversed_biases: @@ -397,12 +410,20 @@ def on_measure_clicked(b): # This if for all the frequencies for the calculated voltage if biases[v_index]== bias: - ax6.scatter(freq,Cp,color = 'g') - ax6.tick_params(axis = 'y',labelcolor = 'g') + ax6.scatter(freq,Cp,color = 'b') + ax6.tick_params(axis = 'y',labelcolor = 'b') - ax6_twin.scatter(freq,D, color = 'r') - ax6_twin.tick_params(axis='y',labelcolor = 'r') - display(fig) + ax6_twin.scatter(freq,D, color = 'y') + ax6_twin.tick_params(axis='y',labelcolor = 'y') + wm = plt.get_current_fig_manager() + wm.window.state('zoomed') + + win = plt.gcf().canvas.manager.window + win.overrideredirect(1) # draws a completely frameless window + + plt.pause(0.1) + + win.overrideredirect(0) device.write('bias_off') diff --git a/hp4194/cv_interace.ipynb b/hp4194/cv_interace.ipynb index 3e260ca7dd4736deb372abf9b9f7172d0b43a0dd..4e7fbf553095cc4ea117003e9d2ef12b95c422a9 100644 --- a/hp4194/cv_interace.ipynb +++ b/hp4194/cv_interace.ipynb @@ -9,7 +9,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "0c5bba2a5cce41b1b8513e407f69feb7", + "model_id": "5922ed122c8b4e82b4eae9959038b4bd", "version_major": 2, "version_minor": 0 }, @@ -23,7 +23,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "195674067b164d529b9645afaafa3021", + "model_id": "f803f463cf434773bfb596677188d79e", "version_major": 2, "version_minor": 0 }, @@ -37,7 +37,7 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "a327e9646bee4cbdbfe82b7fbf83d0be", + "model_id": "9b25051b2f1a454ca1d7bdb39df52266", "version_major": 2, "version_minor": 0 }, @@ -56,7 +56,7 @@ { "cell_type": "code", "execution_count": null, - "id": "4f6be5c3-0ab8-4f18-88f6-02ce464a99f7", + "id": "ff6b31d5-6708-452e-b919-56bd104365e1", "metadata": {}, "outputs": [], "source": [] @@ -78,7 +78,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.0" + "version": "3.13.0" } }, "nbformat": 4,